summaryrefslogtreecommitdiff
path: root/doc/po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2015-08-21 11:42:50 +0200
committerMichael Vogt <mvo@debian.org>2015-08-24 06:41:03 -0400
commit864fe99c3628585ba2081650e441ab15e4ee7bae (patch)
treee470b68e9ec52fbeb79794d9096f7ad84d12de44 /doc/po
parentc8ec5ab764e90565b58ba5f55f4d9d6939b44c69 (diff)
releasing package apt version 1.1~exp101.1.exp10
Diffstat (limited to 'doc/po')
-rw-r--r--doc/po/apt-doc.pot1443
-rw-r--r--doc/po/de.po1995
-rw-r--r--doc/po/es.po1932
-rw-r--r--doc/po/fr.po1993
-rw-r--r--doc/po/it.po1989
-rw-r--r--doc/po/ja.po1962
-rw-r--r--doc/po/pl.po1862
-rw-r--r--doc/po/pt.po1980
-rw-r--r--doc/po/pt_BR.po1478
9 files changed, 11314 insertions, 5320 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 35db9571d..ff7cbdfcf 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 1.0.9.7\n"
+"Project-Id-Version: apt-doc 1.1~exp10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-03-10 09:48+0100\n"
+"POT-Creation-Date: 2015-08-24 04:18-0400\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"
@@ -536,28 +536,28 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml:55
msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml:61
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml:68
msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml:72 apt-get.8.xml:112
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -568,7 +568,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml:82 apt-get.8.xml:147
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note that removing a package "
@@ -577,22 +577,40 @@ msgid ""
"installed instead of removed."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "alias since 1.1)"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml:90 apt-get.8.xml:228
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:95
msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml:101
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml:107
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -601,7 +619,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml:116
msgid ""
"<literal>full-upgrade</literal> performs the function of upgrade but may "
"also remove installed packages if that is required in order to resolve a "
@@ -609,17 +627,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104 apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44 apt-ftparchive.1.xml:500
+#: apt.8.xml:126 apt-get.8.xml:262 apt-cache.8.xml:246 apt-mark.8.xml:104 apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44 apt-ftparchive.1.xml:500
msgid "options"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
+#: apt.8.xml:136
msgid "Script usage"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml:138
msgid ""
"The &apt; commandline is designed as a end-user tool and it may change the "
"output between versions. While it tries to not break backward compatibility "
@@ -629,12 +647,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
+#: apt.8.xml:146
msgid "Differences to &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
+#: apt.8.xml:147
msgid ""
"The <command>apt</command> command is meant to be pleasant for end users and "
"does not need to be backward compatible like &apt-get;. Therefore some "
@@ -642,48 +660,48 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
+#: apt.8.xml:153
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:157
msgid "The option <literal>APT::Color</literal> is enabled."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:161
msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml:166
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
"enabled by default."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191 apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148 apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701 sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59 apt-ftparchive.1.xml:603
+#: apt.8.xml:176 apt-get.8.xml:597 apt-cache.8.xml:359 apt-key.8.xml:191 apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148 apt-config.8.xml:105 apt.conf.5.xml:1319 apt_preferences.5.xml:716 sources.list.5.xml:453 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59 apt-ftparchive.1.xml:603
msgid "See Also"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml:177
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131 apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
+#: apt.8.xml:182 apt-get.8.xml:603 apt-cache.8.xml:364 apt-mark.8.xml:131 apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "Diagnostics"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml:183
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -926,51 +944,52 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:233
msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>. By default it "
+"displays the changelog for the version that is installed. However, you can "
+"specify the same options as for the <option>install</option> command."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:243
msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink "
-"url=\"http://packages.debian.org/changelogs\">packages.debian.org/changelogs</ulink> "
-"for Debian or <ulink "
-"url=\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
-"for Ubuntu). By default it displays the changelog for the version that is "
-"installed. However, you can specify the same options as for the "
-"<option>install</option> command."
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would "
+"download. Supports a <option>--format</option> option to modify the output "
+"format as well as accepts lines of the default output to filter the records "
+"by. The command is mainly used as an interface for external tools working "
+"with APT to get information as well as filenames for downloaded files so "
+"they can use them as well instead of downloading them again on their "
+"own. Detailed documentation is omitted here and can instead be found in the "
+"source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml:267
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml:272
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:277
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:282
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -986,7 +1005,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml:297
msgid ""
"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -998,7 +1017,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid ""
"Disables downloading of packages. This is best used with "
"<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -1007,7 +1026,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:315
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1019,27 +1038,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:330
msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system. Configuration Item: "
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>) so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation. A notice expressing this warning "
+"is also shown by default for non-root users "
+"(<option>APT::Get::Show-User-Simulation-Note</option>). Configuration Item: "
"<literal>APT::Get::Simulate</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
-msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option "
-"<literal>APT::Get::Show-User-Simulation-Note</literal> is set (as it is by "
-"default) a notice will also be displayed indicating that this is only a "
-"simulation. Runs performed as root do not trigger either NoLocking or the "
-"notice - superusers should know what they are doing without further warnings "
-"from <literal>apt-get</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:340
msgid ""
"Simulated runs print out a series of lines, each representing a "
"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1049,7 +1062,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:348
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -1059,28 +1072,28 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:356
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: "
"<literal>APT::Get::Assume-No</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:361
msgid ""
"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:367
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:373
msgid ""
"This option controls the architecture packages are built for by "
"<command>apt-get source --compile</command> and how cross-builddependencies "
@@ -1091,7 +1104,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml:383
msgid ""
"This option controls the activated build profiles for which a source package "
"is built by <command>apt-get source --compile</command> and how build "
@@ -1101,14 +1114,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:394
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml:399
msgid ""
"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -1117,7 +1130,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml:406
msgid ""
"Allow installing new packages when used in conjunction with "
"<literal>upgrade</literal>. This is useful if the update of a installed "
@@ -1129,7 +1142,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:418
msgid ""
"Do not upgrade packages; when used in conjunction with "
"<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -1138,7 +1151,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:425
msgid ""
"Do not install new packages; when used in conjunction with "
"<literal>install</literal>, <literal>only-upgrade</literal> will install "
@@ -1148,17 +1161,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml:433
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: "
+"<literal>APT::Get::allow-remove-essential</literal>. Introduced in APT 1.1."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: "
+"<literal>APT::Get::allow-change-held-packages</literal>. Introduced in APT "
+"1.1."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:457
msgid ""
"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using "
"<literal>force-yes</literal> can potentially destroy your system! "
-"Configuration Item: <literal>APT::Get::force-yes</literal>."
+"Configuration Item: <literal>APT::Get::force-yes</literal>. This is "
+"deprecated and replaced by <option>--allow-downgrades</option>, "
+"<option>--allow-remove-essential</option>, "
+"<option>--allow-change-held-packages</option> in 1.1."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:465
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected MD5 "
@@ -1171,7 +1217,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:476
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be "
@@ -1181,14 +1227,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:484
msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:489
msgid ""
"This option is on by default; use <literal>--no-list-cleanup</literal> to "
"turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1199,7 +1245,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:499
msgid ""
"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -1214,7 +1260,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:514
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>; where "
@@ -1224,14 +1270,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml:521
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:527
msgid ""
"If the command is either <literal>install</literal> or "
"<literal>remove</literal>, then this option acts like running the "
@@ -1240,7 +1286,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml:534
msgid ""
"Only has meaning for the <literal>source</literal> and "
"<literal>build-dep</literal> commands. Indicates that the given source "
@@ -1252,7 +1298,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:545
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -1261,22 +1307,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:551
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:556
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
-"is useful for tools like pbuilder. Configuration Item: "
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself. "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override. Configuration Item: "
"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:566
msgid ""
"Forbid the update command to acquire unverifiable data from configured "
"sources. Apt will fail at the update command for repositories without valid "
@@ -1285,7 +1334,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1295,12 +1344,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121 apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml:587 apt-cache.8.xml:352 apt-key.8.xml:170 apt-mark.8.xml:121 apt.conf.5.xml:1313 apt_preferences.5.xml:709
msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1308,7 +1357,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml:604
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1336,7 +1385,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159 apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202 apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml:49 apt-cache.8.xml:137 apt-cache.8.xml:161 apt-cache.8.xml:183 apt-cache.8.xml:188 apt-cache.8.xml:204 apt-cache.8.xml:222 apt-cache.8.xml:234
msgid "&synopsis-pkg;"
msgstr ""
@@ -1448,50 +1497,50 @@ msgstr ""
#: apt-cache.8.xml:124
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
"instance, \"stable\" and \"unstable\"), this value can be considerably "
"larger than the number of total package names."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:130
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:138
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use "
+"<option>--only-source</option> to display only source package names."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:147
msgid ""
"<literal>dump</literal> shows a short listing of every package in the "
"cache. It is primarily for debugging."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml:152
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml:157
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml:162
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg "
"--print-avail</command>; it displays the package records for the named "
@@ -1499,12 +1548,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:167
msgid "&synopsis-regex;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:168
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see &regex;. It searches "
@@ -1513,37 +1562,38 @@ msgid ""
"including virtual package names. If <option>--full</option> is given then "
"output identical to <literal>show</literal> is produced for each matched "
"package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages "
+"are."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:179
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:184
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:189
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:193
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:194
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -1553,7 +1603,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:199
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -1561,7 +1611,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:205
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink "
@@ -1574,7 +1624,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml:214
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -1583,12 +1633,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:219
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:223
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@ -1596,12 +1646,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:227
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:228
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1610,7 +1660,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml:235
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1622,7 +1672,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:251
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: "
@@ -1630,7 +1680,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:257
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1640,7 +1690,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:265
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1649,7 +1699,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:272
msgid ""
"Print only important dependencies; for use with <literal>unmet</literal> and "
"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -1657,9 +1707,9 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml:286
msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: "
"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
@@ -1667,14 +1717,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:294
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data. A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture. Configuration Item: "
+"<literal>APT::Cache::ShowImplicit</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:304
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:309
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If "
@@ -1685,7 +1747,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml:318
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use "
@@ -1694,14 +1756,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:324
msgid ""
-"Only search on the package names, not the long descriptions. Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:329
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: "
@@ -1709,7 +1771,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1717,7 +1779,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:342
msgid ""
"Limit the output of <literal>depends</literal> and "
"<literal>rdepends</literal> to packages which are currently installed. "
@@ -1725,12 +1787,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:360
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:365
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -2785,11 +2847,13 @@ msgid ""
"user system. Archive maintainers are encouraged to create Release files with "
"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
"value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used. The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:308
+#: apt.conf.5.xml:310
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2797,11 +2861,13 @@ msgid ""
"<literal>Valid-Until</literal> header the earlier date of the two is used as "
"the expiration date. The default value is <literal>0</literal> which stands "
"for \"valid forever\". Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the "
+"<option>Valid-Until-Max</option> option there."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml:323
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2809,11 +2875,13 @@ msgid ""
"(local) mirror of a more frequently updated archive with a "
"<literal>Valid-Until</literal> header instead of completely disabling the "
"expiration date checking. Archive specific settings can and should be used "
-"by appending the label of the archive to the option name."
+"by appending the label of the archive to the option name. Preferably, the "
+"same can be achieved for specific &sources-list; entries by using the "
+"<option>Valid-Until-Min</option> option there."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:336
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2821,7 +2889,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:339
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 "
@@ -2833,7 +2901,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:349
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -2843,21 +2911,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:357
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:358
+#: apt.conf.5.xml:362
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:363
+#: apt.conf.5.xml:367
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
"URIs. It is in the standard form of "
@@ -2870,7 +2938,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:375
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 "
@@ -2882,14 +2950,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381 apt.conf.5.xml:469
+#: apt.conf.5.xml:385 apt.conf.5.xml:473
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:384
+#: apt.conf.5.xml:388
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 "
@@ -2901,14 +2969,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:395
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:394
+#: apt.conf.5.xml:398
msgid ""
"The used bandwidth can be limited with "
"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -2918,7 +2986,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:405
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 "
@@ -2926,7 +2994,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:409
msgid ""
"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
"an external command to discover the http proxy to use. Apt expects the "
@@ -2940,7 +3008,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:427
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2951,7 +3019,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:435
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2975,7 +3043,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:456
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of "
@@ -2996,7 +3064,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: apt.conf.5.xml:476
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, "
@@ -3006,7 +3074,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:483
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
@@ -3016,7 +3084,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:488
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3026,13 +3094,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:502
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:497
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3045,7 +3113,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:510
msgid ""
"For GPGV URIs the only configurable option is "
"<literal>gpgv::Options</literal>, which passes additional parameters to "
@@ -3053,7 +3121,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:521
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -3061,7 +3129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:516
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -3073,19 +3141,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:526
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:525
+#: apt.conf.5.xml:529
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:522
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 "
@@ -3103,13 +3171,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:536
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:527
+#: apt.conf.5.xml:531
msgid ""
"Note that the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -3125,7 +3193,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:541
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -3133,7 +3201,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:548
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -3142,7 +3210,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:556
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the "
@@ -3154,13 +3222,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:573
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:561
msgid ""
"The default list includes \"environment\" and "
"\"en\". \"<literal>environment</literal>\" has a special meaning here: it "
@@ -3182,7 +3250,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:574
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -3192,24 +3260,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:583
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:589
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:595
msgid ""
"The maximum file size of Release/Release.gpg/InRelease files. The default "
"is 10MB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:602
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to. The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:611
msgid ""
"Allow the update operation to load data files from a repository without a "
"trusted signature. If enabled this option no data files will be loaded and "
@@ -3218,7 +3294,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:622
msgid ""
"Allow that a repository that was previously gpg signed to become unsigned "
"durign a update operation. When there is no valid signature of a perviously "
@@ -3228,13 +3304,49 @@ msgid ""
"this source untrusted and warn about them if you try to install them."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:634
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:636
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them. Preferable the Release file indicates this in a 'Changelogs' "
+"field. If this isn't available the Label/Origin field of the Release file is "
+"used to check if a "
+"<literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</replaceable></literal> "
+"or "
+"<literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+"option exists and if so this value is taken. The value in the Release file "
+"can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</replaceable></literal> "
+"or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>. "
+"The value should be a normal URI to a text file, expect that package "
+"specific data is replaced with the placeholder "
+"<literal>CHANGEPATH</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>) this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, expect "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package "
+"name. 4. the complete name again and 5. the source version. The first (if "
+"present), second, third and fourth part are separated by a slash "
+"('<literal>/</literal>') and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>'). The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source can't be used to acquire changelog files from. Another source will be "
+"tried if available in this case."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:664
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:666
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -3246,7 +3358,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:673
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3260,7 +3372,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:683
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3270,7 +3382,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:689
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 "
@@ -3278,7 +3390,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:693
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3290,20 +3402,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:701
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and "
-"<literal>Dir::State::status</literal> is set to "
-"<filename>/var/lib/dpkg/status</filename>, then the status file will be "
-"looked up in <filename>/tmp/staging/var/lib/dpkg/status</filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>. So, for "
+"instance, if <literal>RootDir</literal> is set to "
+"<filename>/tmp/staging</filename> and <literal>Dir::State::status</literal> "
+"is set to <filename>/var/lib/dpkg/status</filename>, then the status file "
+"will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</filename>. "
+"If you want to prefix only relative paths, set <literal>Dir</literal> "
+"instead."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:715
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 "
@@ -3314,12 +3427,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:724
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:726
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3327,7 +3440,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:731
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, "
@@ -3341,40 +3454,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:745
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:709
+#: apt.conf.5.xml:750
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:714
+#: apt.conf.5.xml:755
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:720
+#: apt.conf.5.xml:761
msgid "How APT calls &dpkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:762
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:726
+#: apt.conf.5.xml:767
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 "
@@ -3382,7 +3495,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:773
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 "
@@ -3391,7 +3504,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:780
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 "
@@ -3402,16 +3515,51 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:787
msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and "
-"<literal>MultiArch</literal> flag to each version being dumped."
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:792
+msgid ""
+"Each configuration directive line has the form "
+"<literal>key=value</literal>. Special characters (equal signs, newlines, "
+"nonprintable characters, quotation marks, and percent signs in "
+"<literal>key</literal> and newlines, nonprintable characters, and percent "
+"signs in <literal>value</literal>) are %-encoded. Lists are represented by "
+"multiple <literal>key::=value</literal> lines with the same key. The "
+"configuration section ends with a blank line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:800
+msgid ""
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:810
+msgid ""
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that "
+"\"none\" is an incorrect typename which is just kept to remain compatible, "
+"it should be read as \"no\" and users are encouraged to support both."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:816
msgid ""
"The version of the protocol to be used for the command "
"<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3422,7 +3570,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:823
msgid ""
"The file descriptor to be used to send the information can be requested with "
"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</literal> "
@@ -3433,26 +3581,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:833
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:773
+#: apt.conf.5.xml:838
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:778
+#: apt.conf.5.xml:843
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:779
+#: apt.conf.5.xml:844
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 "
@@ -3467,7 +3615,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:859
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -3477,7 +3625,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:853
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 "
@@ -3491,7 +3639,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:866
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 "
@@ -3504,7 +3652,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:874
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is "
@@ -3522,7 +3670,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:889
msgid ""
"If this option is set APT will call <command>dpkg --configure "
"--pending</command> to let &dpkg; handle all required configurations and "
@@ -3534,7 +3682,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:896
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -3545,7 +3693,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:909
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -3557,7 +3705,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:902
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 "
@@ -3571,12 +3719,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:922
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:923
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -3585,12 +3733,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:931
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:933
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -3601,7 +3749,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:944
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -3609,7 +3757,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:952
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -3617,7 +3765,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:961
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -3627,65 +3775,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:904
+#: apt.conf.5.xml:969
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:914
+#: apt.conf.5.xml:979
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:923
+#: apt.conf.5.xml:988
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:999
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:1010
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1021
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:967
+#: apt.conf.5.xml:1032
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:978
+#: apt.conf.5.xml:1043
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:988
+#: apt.conf.5.xml:1053
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:998
+#: apt.conf.5.xml:1063
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:1008
+#: apt.conf.5.xml:1073
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 "
@@ -3693,52 +3841,52 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1084
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:1031
+#: apt.conf.5.xml:1096
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:1041
+#: apt.conf.5.xml:1106
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:1051
+#: apt.conf.5.xml:1116
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:1063
+#: apt.conf.5.xml:1128
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:1074
+#: apt.conf.5.xml:1139
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:1085
+#: apt.conf.5.xml:1150
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:1095
+#: apt.conf.5.xml:1160
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -3748,7 +3896,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml:1174
msgid ""
"Generate debug messages describing which packages are marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -3766,45 +3914,45 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1130
+#: apt.conf.5.xml:1195
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:1141
+#: apt.conf.5.xml:1206
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:1152
+#: apt.conf.5.xml:1217
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:1164
+#: apt.conf.5.xml:1229
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:1175
+#: apt.conf.5.xml:1240
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1185
+#: apt.conf.5.xml:1250
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:1196
+#: apt.conf.5.xml:1261
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 "
@@ -3812,14 +3960,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1208
+#: apt.conf.5.xml:1273
msgid ""
"Print information about the vendors read from "
"<filename>/etc/apt/vendors.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml:1283
msgid ""
"Display the external commands that are called by apt hooks. This includes "
"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -3827,12 +3975,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233 apt-ftparchive.1.xml:592
+#: apt.conf.5.xml:1307 apt_preferences.5.xml:556 sources.list.5.xml:358 apt-ftparchive.1.xml:592
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml:1308
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -3840,7 +3988,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml:1320
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -3986,9 +4134,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:118
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
+msgid "to the versions that do not belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -3998,11 +4144,18 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:123
-msgid "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:127
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:131
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -4013,14 +4166,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml:138
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml:141
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -4030,19 +4183,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:148
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml:151
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the "
@@ -4050,7 +4203,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:157
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -4061,7 +4214,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:164
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -4071,7 +4224,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -4083,12 +4236,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:178
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:180
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -4097,7 +4250,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:186
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages with a specified version or version range. For example, "
@@ -4108,7 +4261,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: perl\n"
@@ -4117,7 +4270,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:199
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -4127,7 +4280,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:205
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -4135,7 +4288,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:210
#, no-wrap
msgid ""
"Package: *\n"
@@ -4144,7 +4297,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml:215
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
"which can be used to match a hostname. The following record will assign a "
@@ -4153,7 +4306,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:219
#, no-wrap
msgid ""
"Package: *\n"
@@ -4162,7 +4315,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:223
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -4172,7 +4325,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml:228
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is "
@@ -4180,7 +4333,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:232
#, no-wrap
msgid ""
"Package: *\n"
@@ -4189,7 +4342,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:237
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is "
@@ -4197,7 +4350,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
#, no-wrap
msgid ""
"Package: *\n"
@@ -4206,7 +4359,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -4214,7 +4367,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, no-wrap
msgid ""
"Package: *\n"
@@ -4222,13 +4375,22 @@ msgid ""
"Pin-Priority: 500\n"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:258
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:266
msgid "Regular expressions and &glob; syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:268
msgid ""
"APT also supports pinning by &glob; expressions, and regular expressions "
"surrounded by slashes. For example, the following example assigns the "
@@ -4238,7 +4400,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
@@ -4247,7 +4409,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -4255,7 +4417,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
#, no-wrap
msgid ""
"Package: *\n"
@@ -4264,7 +4426,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
@@ -4275,105 +4437,116 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:314
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking):"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:319
msgid "P &gt;= 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml:324
msgid "990 &lt;= P &lt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:330
msgid "500 &lt;= P &lt; 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:331
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "100 &lt;= P &lt; 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:337
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:342
msgid "0 &lt; P &lt; 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:343
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:347
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:348
msgid "prevents the version from being installed"
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:351
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:352
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:358
msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version. Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+"The first specific-form record matching an available package version "
+"determines the priority of the package version. Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version. Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:366
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:370
#, no-wrap
msgid ""
"Package: perl\n"
@@ -4390,12 +4563,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:383
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -4406,7 +4579,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:390
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -4414,7 +4587,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:394
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an "
@@ -4423,12 +4596,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml:404
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:406
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -4436,7 +4609,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:410
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@ -4448,27 +4621,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:418
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml:419
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml:422 apt_preferences.5.xml:472
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:423
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:428
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -4481,12 +4654,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:439
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:440
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -4497,18 +4670,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:450
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:456
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml:457
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -4519,13 +4692,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:466
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:473
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian release version &stable-version;. Note that there is "
@@ -4536,7 +4709,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
#, no-wrap
msgid ""
"Pin: release v=&stable-version;\n"
@@ -4545,12 +4718,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:491
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml:492
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -4562,18 +4735,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:507
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:508
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -4582,18 +4755,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:514
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:520
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:521
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -4602,13 +4775,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:527
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:534
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -4623,12 +4796,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml:547
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:549
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -4636,12 +4809,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:558
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:566
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -4656,7 +4829,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:560
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -4666,7 +4839,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614 apt_preferences.5.xml:672
+#: apt_preferences.5.xml:583 apt_preferences.5.xml:629 apt_preferences.5.xml:687
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -4675,7 +4848,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml:578
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -4684,13 +4857,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:595
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:589
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -4699,12 +4872,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:601
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Package: *\n"
@@ -4721,7 +4894,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:603
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -4732,7 +4905,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:624
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -4741,13 +4914,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:644
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:635
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -4759,12 +4932,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml:651
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml:665
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -4786,7 +4959,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:653
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -4801,7 +4974,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml:682
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -4810,13 +4983,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml:702
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:693
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -4828,7 +5001,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml:717
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
@@ -4840,53 +5013,126 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:45
+msgid "sources.list.d"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:46
+msgid ""
+"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
+"add sources.list entries in separate files. Two different file formats are "
+"allowed as described in the next two sections. Filenames need to have "
+"either the extension <filename>.list</filename> or "
+"<filename>.sources</filename> depending on the contained format. The "
+"filenames may only contain letters (a-z and A-Z), digits (0-9), underscore "
+"(_), hyphen (-) and period (.) characters. Otherwise APT will print a "
+"notice that it has ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:58
+msgid "one line style format"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
+#: sources.list.5.xml:60
msgid ""
-"Each line specifying a source starts with type "
+"Files in this format have the extension <filename>.list</filename>. Each "
+"line specifying a source starts with a type "
"(e.g. <literal>deb-src</literal>) followed by options and arguments for "
"this type. Individual entries cannot be continued onto a following "
"line. Empty lines are ignored, and a <literal>#</literal> character anywhere "
-"on a line marks the remainder of that line as a comment."
+"on a line marks the remainder of that line as a comment. Consequently an "
+"entry can be disabled by commenting out the entire line. If options should "
+"be provided they are separated by spaces and all of them together are "
+"enclosed by square brackets (<literal>[]</literal>) included in the line "
+"after the type separated from it with a space. If an option allows multiple "
+"values these are separated from each other with a comma "
+"(<literal>,</literal>). An option name is separated from its value(s) by a "
+"equal sign (<literal>=</literal>). Multivalue options have also "
+"<literal>-=</literal> and <literal>+=</literal> as separator which instead "
+"of replacing the default with the given value(s) modify the default value(s) "
+"to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:79
+msgid ""
+"This is the traditional format and supported by all apt versions. Note that "
+"not all options as described below are supported by all apt versions. Note "
+"also that some older applications parsing this format on its own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
-msgid "sources.list.d"
+#: sources.list.5.xml:87
+msgid "deb822 style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:89
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>. The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, like the metadata itself apt will download from the configured "
+"sources or the <filename>debian/control</filename> file in a Debian source "
+"package. Individual entries are separated by an empty line, additional "
+"empty lines are ignored, and a <literal>#</literal> character at the start "
+"of the line marks the entire line as a comment. An entry can hence be "
+"disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it. Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s). Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and "
+"<literal>Architectures-Remove</literal> to modify the default value rather "
+"than replacing it."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:108
msgid ""
-"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files. The format is the same as for "
-"the regular <filename>sources.list</filename> file. File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier. It "
+"is intended to make this format gradually the default format and deprecating "
+"the previously described one line style format as it is easier to create, "
+"extend and modify by humans and machines alike especially if a lot of "
+"sources and/or options are involved. Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but could encounter problems with software not "
+"supporting the format yet."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml:123
+msgid "The deb and deb-src types: General Format"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml:124
msgid ""
"The <literal>deb</literal> type references a typical two-level Debian "
"archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
"<literal>stable</literal> or <literal>testing</literal> or a codename like "
"<literal>&stable-codename;</literal> or "
"<literal>&testing-codename;</literal> while component is one of "
@@ -4898,63 +5144,57 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:135
msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one line style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
+#: sources.list.5.xml:138
#, no-wrap
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] "
+"[...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] "
+"[component2] [...]"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:143
#, no-wrap
msgid ""
" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
+" URIs: uri\n"
+" Suites: suite\n"
+" Components: [component1] [component2] [...]\n"
+" option1: value1\n"
+" option2: value2\n"
" "
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:141
msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder "
-"type=\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml:152
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>suite</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>suite</literal> must end with a "
"slash (<literal>/</literal>). This is useful for the case when only a "
-"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest. "
+"If <literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml:161
msgid ""
"<literal>suite</literal> may also contain a variable, "
"<literal>$(ARCH)</literal> which expands to the Debian architecture (such as "
@@ -4966,99 +5206,166 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
+#: sources.list.5.xml:169
msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+"Especially in the one line style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "
"location is desired. APT will sort the URI list after it has generated a "
"complete set internally, and will collapse multiple references to the same "
"Internet host, for instance, into a single connection, so that it does not "
-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:181
+msgid ""
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:188
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:190
+#, no-wrap
+msgid "&sourceslist-sources-format;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:186
msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</replaceable></literal>. "
-"Multiple settings are separated by spaces. The following settings are "
-"supported by APT (note however that unsupported settings will be ignored "
-"silently):"
+"As an example, the sources for your distribution could look like this in one "
+"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:193
+msgid "The deb and deb-src types: Options"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:194
+msgid ""
+"Each source entry can have options specified modifying which and how the "
+"source is accessed and data acquired from it. Format, syntax and names of "
+"the options varies between the two formats one line and deb822 style as "
+"described, but they have both the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one line name in brackets. "
+"Remember that beside setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:205
msgid ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
-"can be used to specify for which architectures information should be "
-"downloaded. If this option is not set all architectures defined by the "
-"<literal>APT::Architectures</literal> option will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:212
msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
-"and "
-"<literal>arch-=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
-"which can be used to add/remove architectures from the set which will be "
-"downloaded."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information like translated package "
+"descriptions should be downloaded. If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:220
msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the "
-"<filename>Release</filename> file is not signed or the signature can't be "
-"checked. This disables parts of &apt-secure; and should therefore only be "
-"used in a local and trusted context. <literal>trusted=no</literal> is the "
-"opposite which handles even correctly authenticated sources as not "
-"authenticated."
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:228
msgid ""
-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-msgid "Some examples:"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:235
+msgid ""
+"<option>Signed-By</option> (<option>signed-by</option>) is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key in either the "
+"<filename>trusted.gpg</filename> keyring or in one of the keyrings in the "
+"<filename>trusted.gpg.d/</filename> directory (see <command>apt-key "
+"fingerprint</command>). If the option is set only the key(s) in this keyring "
+"or only the key with this fingerprint is used for the &apt-secure; "
+"verification of this repository. Otherwise all keys in the trusted keyrings "
+"are considered valid signers for this repository."
msgstr ""
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:249
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib "
-"non-free\n"
-" "
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare until then the data provided in the "
+"repository should be considered valid and if this time is reached, but no "
+"new data is provided the data is considered expired and an error is raised. "
+"Beside increasing security as a malicious attacker can't sent old data "
+"forever denying a user to be able to upgrade to a new version, this also "
+"helps users identify mirrors which are no longer updated. Some repositories "
+"like historic archives aren't updated anymore by design through, so this "
+"check can be disabled by setting this option to <literal>no</literal>. "
+"Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:266
+msgid ""
+"<option>Valid-Until-Min</option> (<option>check-valid-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldomly updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely. Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and "
+"<option>Acquire::Max-ValidTime</option> which are both unset by default."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:288
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml:290
msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:294
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -5066,7 +5373,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml:301
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media "
"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -5074,7 +5381,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:308
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format "
@@ -5085,7 +5392,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:319
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual "
@@ -5098,7 +5405,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:331
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -5107,7 +5414,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:338
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5116,12 +5423,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:345
msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:347
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme "
@@ -5133,42 +5440,72 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:359
msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:361
+#, no-wrap
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:362
#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:367
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:368
#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:369
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:374
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:375
+#, no-wrap
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:376
#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:382
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5176,41 +5513,78 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:384
#, no-wrap
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian "
+"&stable-codename; main"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:386
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml:398
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:400
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:401
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml:406
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:408
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:409
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:414
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -5219,19 +5593,38 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:418
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:419
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml:431
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:432
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:424
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under "
@@ -5239,12 +5632,42 @@ msgid ""
"<filename>unstable/binary-amd64</filename> on amd64, and so forth for other "
"supported architectures. [Note this example only illustrates how to use the "
"substitution variable; official debian archives are not structured like "
-"this] <placeholder type=\"literallayout\" id=\"0\"/>"
+"this] <placeholder type=\"literallayout\" id=\"0\"/> <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:437
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:439
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:445
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml:454
+msgid "&apt-get;, &apt-conf;"
msgstr ""
#. type: Content of: <refentry><refmeta><manvolnum>
diff --git a/doc/po/de.po b/doc/po/de.po
index 4f001b85e..668c94798 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.8\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-08-21 06:12-0400\n"
"PO-Revision-Date: 2014-09-14 14:46+0200\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -616,17 +616,15 @@ msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
#. type: Content of: <refentry><refmeta><manvolnum>
#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
-#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
-#: apt-config.8.xml:22
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21 apt-config.8.xml:22
msgid "8"
msgstr "8"
#. type: Content of: <refentry><refmeta><refmiscinfo>
#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
-#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
-#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
-#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
-#: apt-ftparchive.1.xml:23
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22 apt-config.8.xml:23
+#: apt.conf.5.xml:28 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23 apt-ftparchive.1.xml:23
msgid "APT"
msgstr "APT"
@@ -637,10 +635,9 @@ msgstr "Befehlszeilenschnittstelle"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
-#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
-#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
-#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
-#: apt-ftparchive.1.xml:34
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33 apt-config.8.xml:34
+#: apt.conf.5.xml:37 apt_preferences.5.xml:32 sources.list.5.xml:32
+#: apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34 apt-ftparchive.1.xml:34
msgid "Description"
msgstr "Beschreibung"
@@ -662,16 +659,17 @@ msgstr ""
msgid ""
"<literal>list</literal> is used to display a list of packages. It supports "
"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option> are supported."
+"<option>--installed</option>, <option>--upgradable</option>, <option>--"
+"upgradeable</option>, <option>--all-versions</option> are supported."
msgstr ""
"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
"folgenden Optionen werden unterstützt: <option>--installed</option>, "
-"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-versions</option>."
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
+"versions</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml:55
msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
@@ -680,7 +678,7 @@ msgstr ""
"passende Pakete an."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml:61
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
@@ -689,7 +687,7 @@ msgstr ""
"Pakete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml:68
msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
@@ -698,7 +696,7 @@ msgstr ""
"von denen eine Installation oder ein Upgrade gewünscht wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml:72 apt-get.8.xml:112
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -716,7 +714,7 @@ msgstr ""
"ausgewählt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml:82 apt-get.8.xml:147
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note that removing a package "
@@ -730,8 +728,29 @@ msgstr ""
"belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "alias since 1.1)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:90 apt-get.8.xml:228
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> wird benutzt, um Pakete zu entfernen, die "
+"automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu "
+"erfüllen und die nicht mehr benötigt werden."
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml:95
msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
@@ -740,7 +759,7 @@ msgstr ""
"list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml:101
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
@@ -749,7 +768,7 @@ msgstr ""
"ihren Quellen in Einklang zu bringen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml:107
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -762,7 +781,7 @@ msgstr ""
"neue Pakete installiert, existierende jedoch nicht entfernt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml:116
msgid ""
"<literal>full-upgrade</literal> performs the function of upgrade but may "
"also remove installed packages if that is required in order to resolve a "
@@ -773,19 +792,19 @@ msgstr ""
"Paketkonflikts nötig ist."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt.8.xml:126 apt-get.8.xml:262 apt-cache.8.xml:246 apt-mark.8.xml:104
#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
#: apt-ftparchive.1.xml:500
msgid "options"
msgstr "Optionen"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
+#: apt.8.xml:136
msgid "Script usage"
msgstr "Skriptaufruf"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml:138
msgid ""
"The &apt; commandline is designed as a end-user tool and it may change the "
"output between versions. While it tries to not break backward compatibility "
@@ -801,12 +820,12 @@ msgstr ""
"Skripten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
+#: apt.8.xml:146
msgid "Differences to &apt-get;"
msgstr "Unterschiede zu &apt-get;"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
+#: apt.8.xml:147
msgid ""
"The <command>apt</command> command is meant to be pleasant for end users and "
"does not need to be backward compatible like &apt-get;. Therefore some "
@@ -817,17 +836,17 @@ msgstr ""
"get;. Daher unterscheiden sich einige Optionen:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
+#: apt.8.xml:153
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:157
msgid "The option <literal>APT::Color</literal> is enabled."
msgstr "Die Option <literal>APT::Color</literal> ist aktiviert."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:161
msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
@@ -836,7 +855,7 @@ msgstr ""
"--list</literal> ähnlich."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml:166
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
"enabled by default."
@@ -845,16 +864,16 @@ msgstr ""
"new-pkgs</literal> aktiviert."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt.8.xml:176 apt-get.8.xml:597 apt-cache.8.xml:359 apt-key.8.xml:191
#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
-#: apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701
-#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-config.8.xml:105 apt.conf.5.xml:1319 apt_preferences.5.xml:716
+#: sources.list.5.xml:453 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
#: apt-ftparchive.1.xml:603
msgid "See Also"
msgstr "Siehe auch"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml:177
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
@@ -863,14 +882,14 @@ msgstr ""
"Benutzeranleitung in &guidesdir;, &apt-preferences;, das APT-Howto."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt.8.xml:182 apt-get.8.xml:603 apt-cache.8.xml:364 apt-mark.8.xml:131
#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "Diagnostics"
msgstr "Diagnose"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml:183
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1245,28 +1264,23 @@ msgstr ""
"sie auf »off« gesetzt ist."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
-msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
-msgstr ""
-"<literal>autoremove</literal> wird benutzt, um Pakete zu entfernen, die "
-"automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu "
-"erfüllen und die nicht mehr benötigt werden."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:233
-msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu). By default it displays the changelog for the version that is "
-"installed. However, you can specify the same options as for the "
-"<option>install</option> command."
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
+#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
+#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "changelogs</ulink> for Ubuntu). By default it displays the changelog for "
+#| "the version that is installed. However, you can specify the same options "
+#| "as for the <option>install</option> command."
+msgid ""
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>. By default it "
+"displays the changelog for the version that is installed. However, you can "
+"specify the same options as for the <option>install</option> command."
msgstr ""
"<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und "
"zeigt es mit <command>sensible-pager</command> an. Der Servername und das "
@@ -1279,7 +1293,21 @@ msgstr ""
"Befehl <option>install</option> angeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml:243
+msgid ""
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:267
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1288,7 +1316,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml:272
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -1297,7 +1325,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Install-Suggests</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:277
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1307,7 +1335,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:282
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -1336,7 +1364,7 @@ msgstr ""
"<literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml:297
msgid ""
"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -1357,7 +1385,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -1369,7 +1397,7 @@ msgstr ""
"<literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:315
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1389,38 +1417,21 @@ msgstr ""
"Konfigurationselement: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
-msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system. Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-"keine Aktion; führt eine Simulation von Ereignissen aus, die eintreten "
-"würden, aber das aktuelle System nicht verändern. Konfigurationselement: "
-"<literal>APT::Get::Simulate</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:330
msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>) so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation. A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>). Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."
msgstr ""
-"Simulierte Durchläufe als Benutzer werden automatisch das Sperren "
-"deaktivieren (<literal>Debug::NoLocking</literal>) und falls die Option "
-"<literal>APT::Get::Show-User-Simulation-Note</literal> gesetzt ist (was "
-"standardmäßig der Fall ist), wird außerdem eine Benachrichtigung angezeigt, "
-"die angibt, dass es sich hierbei nur um eine Simulation handelt. Simulierte "
-"Durchläufe als Root lösen weder NoLocking noch die Benachrichtigung aus – "
-"Superuser sollten ohne vorherige Warnung von <literal>apt-get</literal> "
-"wissen, was sie tun."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:340
msgid ""
"Simulated runs print out a series of lines, each representing a "
"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1435,7 +1446,7 @@ msgstr ""
"eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:348
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -1451,7 +1462,7 @@ msgstr ""
"Get::Assume-Yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:356
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
"Assume-No</literal>."
@@ -1460,7 +1471,7 @@ msgstr ""
"Get::Assume-No</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:361
msgid ""
"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1470,7 +1481,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:367
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -1480,7 +1491,7 @@ msgstr ""
"Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:373
msgid ""
"This option controls the architecture packages are built for by <command>apt-"
"get source --compile</command> and how cross-builddependencies are "
@@ -1497,7 +1508,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml:383
msgid ""
"This option controls the activated build profiles for which a source package "
"is built by <command>apt-get source --compile</command> and how build "
@@ -1513,7 +1524,7 @@ msgstr ""
"Build-Profiles</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:394
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -1522,7 +1533,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml:399
msgid ""
"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -1536,7 +1547,7 @@ msgstr ""
"<literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml:406
msgid ""
"Allow installing new packages when used in conjunction with "
"<literal>upgrade</literal>. This is useful if the update of a installed "
@@ -1556,7 +1567,7 @@ msgstr ""
"wird.Konfigurationselement: <literal>APT::Get::Upgrade-Allow-New</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:418
msgid ""
"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1570,7 +1581,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:425
msgid ""
"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1584,13 +1595,87 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml:433
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+"erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
+"Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
+"sollte nicht benutzt werden, außer in ganz besonderen Situationen. "
+"<literal>force-yes</literal> zu benutzen, kann möglicherweise ihr System "
+"zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+"erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
+"Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
+"sollte nicht benutzt werden, außer in ganz besonderen Situationen. "
+"<literal>force-yes</literal> zu benutzen, kann möglicherweise ihr System "
+"zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+"erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
+"Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
+"sollte nicht benutzt werden, außer in ganz besonderen Situationen. "
+"<literal>force-yes</literal> zu benutzen, kann möglicherweise ihr System "
+"zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:457
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
msgid ""
"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
-"<literal>APT::Get::force-yes</literal>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."
msgstr ""
"erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
"Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
@@ -1599,7 +1684,7 @@ msgstr ""
"zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:465
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected MD5 "
@@ -1621,7 +1706,7 @@ msgstr ""
"Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:476
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1634,7 +1719,7 @@ msgstr ""
"option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:484
msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1643,7 +1728,7 @@ msgstr ""
"Version haben. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:489
msgid ""
"This option is on by default; use <literal>--no-list-cleanup</literal> to "
"turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1661,7 +1746,7 @@ msgstr ""
"Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:499
msgid ""
"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -1686,7 +1771,7 @@ msgstr ""
"auch die &apt-preferences;-Handbuchseite."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:514
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1700,7 +1785,7 @@ msgstr ""
"Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml:521
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1709,7 +1794,7 @@ msgstr ""
"Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:527
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running the <literal>autoremove</"
@@ -1723,7 +1808,7 @@ msgstr ""
"AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml:534
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -1742,7 +1827,7 @@ msgstr ""
"Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:545
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1754,7 +1839,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:551
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -1763,18 +1848,18 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:556
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
-"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
-msgstr ""
-"Ignoriert, wenn Pakete nicht authentifiziert werden können und nicht danach "
-"fragen. Dies ist für Werkzeuge wie pbuilder nützlich. Konfigurationselement: "
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself. "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override. Configuration Item: "
"<literal>APT::Get::AllowUnauthenticated</literal>."
+msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:566
msgid ""
"Forbid the update command to acquire unverifiable data from configured "
"sources. Apt will fail at the update command for repositories without valid "
@@ -1784,7 +1869,7 @@ msgstr ""
# FIXME s/Item/Items/
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1800,13 +1885,13 @@ msgstr ""
"Progress-Fancy</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
-#: apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml:587 apt-cache.8.xml:352 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1313 apt_preferences.5.xml:709
msgid "Files"
msgstr "Dateien"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1817,7 +1902,7 @@ msgstr ""
"das APT-Howto."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml:604
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1854,9 +1939,9 @@ msgstr ""
"benötigen, falls er fehlt oder veraltet ist."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
-#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
-#: apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml:49 apt-cache.8.xml:137 apt-cache.8.xml:161
+#: apt-cache.8.xml:183 apt-cache.8.xml:188 apt-cache.8.xml:204
+#: apt-cache.8.xml:222 apt-cache.8.xml:234
msgid "&synopsis-pkg;"
msgstr "&synopsis-pkg;"
@@ -2021,10 +2106,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:124
+#, fuzzy
+#| msgid ""
+#| "<literal>Total distinct</literal> versions is the number of package "
+#| "versions found in the cache; this value is therefore at least equal to "
+#| "the number of total package names. If more than one distribution is being "
+#| "accessed (for instance, \"stable\" and \"unstable\"), this value can be "
+#| "considerably larger than the number of total package names."
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
"instance, \"stable\" and \"unstable\"), this value can be considerably "
"larger than the number of total package names."
msgstr ""
@@ -2036,7 +2127,7 @@ msgstr ""
"Paketnamen sein."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:130
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
@@ -2045,18 +2136,24 @@ msgstr ""
"Abhängigkeitsbeziehungen, den alle Pakete im Zwischenspeicher beanspruchen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:138
+#, fuzzy
+#| msgid ""
+#| "<literal>showsrc</literal> displays all the source package records that "
+#| "match the given package names. All versions are shown, as well as all "
+#| "records that declare the name to be a binary package."
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."
msgstr ""
"<literal>showsrc</literal> zeigt alle Quellpaketdatensätze, die den "
"angegebenen Paketnamen entsprechen. Alle Versionen werden ebenso angezeigt, "
"wie alle Datensätze, die den Namen für ein Binärpaket deklarieren."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:147
msgid ""
"<literal>dump</literal> shows a short listing of every package in the cache. "
"It is primarily for debugging."
@@ -2065,7 +2162,7 @@ msgstr ""
"im Zwischenspeicher. Es dient in erster Linie der Fehlersuche."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml:152
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2075,7 +2172,7 @@ msgstr ""
"benutzt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml:157
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
@@ -2084,7 +2181,7 @@ msgstr ""
"Abhängigkeiten im Paketzwischenspeicher."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml:162
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg --print-"
"avail</command>; it displays the package records for the named packages."
@@ -2094,12 +2191,22 @@ msgstr ""
"Pakete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:167
msgid "&synopsis-regex;"
msgstr "&synopsis-regex;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:168
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see &regex;. It "
+#| "searches the package names and the descriptions for an occurrence of the "
+#| "regular expression and prints out the package name and the short "
+#| "description, including virtual package names. If <option>--full</option> "
+#| "is given then output identical to <literal>show</literal> is produced for "
+#| "each matched package, and if <option>--names-only</option> is given then "
+#| "the long description is not searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see &regex;. It searches "
@@ -2108,7 +2215,7 @@ msgid ""
"including virtual package names. If <option>--full</option> is given then "
"output identical to <literal>show</literal> is produced for each matched "
"package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."
msgstr ""
"<literal>search</literal> führt eine Volltextsuche in der Liste aller "
"verfügbaren Pakete für das gegebene POSIX-regex-Muster durch, siehe &regex;. "
@@ -2120,7 +2227,7 @@ msgstr ""
"wird die lange Beschreibung nicht durchsucht, sondern nur der Paketname."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:179
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -2129,7 +2236,7 @@ msgstr ""
"die »und«-verknüpft werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:184
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -2139,7 +2246,7 @@ msgstr ""
"können."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:189
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -2148,12 +2255,12 @@ msgstr ""
"Rückwärtsabhängigkeit, die ein Paket hat."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:193
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:194
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -2168,7 +2275,7 @@ msgstr ""
"besten mit der <option>--generate</option>-Option benutzt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:199
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -2179,7 +2286,7 @@ msgstr ""
"Pakete sind z.B. auch in der generierten Liste aufgeführt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:205
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2201,7 +2308,7 @@ msgstr ""
"GivenOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml:214
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2215,14 +2322,14 @@ msgstr ""
"depends, grüne Linien sind Konflikte."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:219
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
"Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch "
"darstellen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:223
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2232,12 +2339,12 @@ msgstr ""
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:227
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:228
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -2250,7 +2357,7 @@ msgstr ""
"Informationen über die Prioritätenauswahl der genannten Pakete aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml:235
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -2269,7 +2376,7 @@ msgstr ""
"(<literal>APT::Architecture</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:251
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -2281,7 +2388,7 @@ msgstr ""
"pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:257
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2298,7 +2405,7 @@ msgstr ""
"srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:265
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2312,7 +2419,7 @@ msgstr ""
"Konfigurationselement: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:272
msgid ""
"Print only important dependencies; for use with <literal>unmet</literal> and "
"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2324,9 +2431,16 @@ msgstr ""
"<literal>APT::Cache::Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml:286
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be tweaked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
@@ -2340,7 +2454,19 @@ msgstr ""
"Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:294
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data. A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture. Configuration Item: <literal>APT::Cache::ShowImplicit</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:304
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -2349,7 +2475,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:309
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -2366,7 +2492,7 @@ msgstr ""
"anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml:318
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2378,16 +2504,20 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:324
+#, fuzzy
+#| msgid ""
+#| "Only search on the package names, not the long descriptions. "
+#| "Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgid ""
-"Only search on the package names, not the long descriptions. Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
"durchsucht nur die Paketnamen, nicht die Langbeschreibungen. "
"Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:329
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -2398,7 +2528,7 @@ msgstr ""
"<literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -2409,7 +2539,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:342
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -2420,12 +2550,12 @@ msgstr ""
"<literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:360
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:365
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3918,6 +4048,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:295
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true, as giving a Release file's "
+#| "validation an expiration date prevents replay attacks over a long "
+#| "timescale, and can also for example help users to identify mirrors that "
+#| "are no longer updated - but the feature depends on the correctness of the "
+#| "clock on the user system. Archive maintainers are encouraged to create "
+#| "Release files with the <literal>Valid-Until</literal> header, but if they "
+#| "don't or a stricter value is desired the <literal>Max-ValidTime</literal> "
+#| "option below can be used."
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3926,7 +4066,9 @@ msgid ""
"user system. Archive maintainers are encouraged to create Release files with "
"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
"value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used. The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
msgstr ""
"Die sicherheitsbezogene Option wird als »true« vorgegeben, da es "
"Wiederholungsangriffe über einen langen Zeitraum verhindert, einer "
@@ -3939,7 +4081,16 @@ msgstr ""
"ValidTime</literal> unten benutzt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:308
+#: apt.conf.5.xml:310
+#, fuzzy
+#| msgid ""
+#| "Maximum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. If the Release file itself includes a "
+#| "<literal>Valid-Until</literal> header the earlier date of the two is used "
+#| "as the expiration date. The default value is <literal>0</literal> which "
+#| "stands for \"valid forever\". Archive specific settings can be made by "
+#| "appending the label of the archive to the option name."
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3947,7 +4098,9 @@ msgid ""
"<literal>Valid-Until</literal> header the earlier date of the two is used as "
"the expiration date. The default value is <literal>0</literal> which stands "
"for \"valid forever\". Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."
msgstr ""
"maximale Zeit (in Sekunden) nach der Erzeugung (die in der Kopfzeile "
"<literal>Date</literal> angegeben ist), die die Datei <filename>Release</"
@@ -3958,7 +4111,16 @@ msgstr ""
"Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml:323
+#, fuzzy
+#| msgid ""
+#| "Minimum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. Use this if you need to use a seldom "
+#| "updated (local) mirror of a more frequently updated archive with a "
+#| "<literal>Valid-Until</literal> header instead of completely disabling the "
+#| "expiration date checking. Archive specific settings can and should be "
+#| "used by appending the label of the archive to the option name."
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3966,7 +4128,9 @@ msgid ""
"(local) mirror of a more frequently updated archive with a <literal>Valid-"
"Until</literal> header instead of completely disabling the expiration date "
"checking. Archive specific settings can and should be used by appending the "
-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."
msgstr ""
"minimale Zeit (in Sekunden), nach der Erzeugung (die in der Kopfzeile "
"<literal>Date</literal> angegeben ist), die die Datei <filename>Release</"
@@ -3978,7 +4142,7 @@ msgstr ""
"Optionsnamen vorgenommen werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:336
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3989,7 +4153,7 @@ msgstr ""
"der kompletten Dateien. Vorgabe ist True."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:339
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 "
@@ -4007,7 +4171,7 @@ msgstr ""
"komplette Datei anstelle der Patche heruntergeladen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:349
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4023,7 +4187,7 @@ msgstr ""
"URI-Art geöffnet wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:357
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -4032,7 +4196,7 @@ msgstr ""
"APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:358
+#: apt.conf.5.xml:362
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."
@@ -4042,7 +4206,7 @@ msgstr ""
"kopiert zu werden. True ist die Vorgabe."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:367
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]/</"
@@ -4061,7 +4225,7 @@ msgstr ""
"wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:375
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 "
@@ -4082,7 +4246,7 @@ msgstr ""
"Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381 apt.conf.5.xml:469
+#: apt.conf.5.xml:385 apt.conf.5.xml:473
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."
@@ -4092,7 +4256,7 @@ msgstr ""
"Datenzeitüberschreitungen angewandt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:384
+#: apt.conf.5.xml:388
#, fuzzy
#| msgid ""
#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
@@ -4121,7 +4285,7 @@ msgstr ""
"HTTP/1.1-Spezifikation entsprechen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:395
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -4130,7 +4294,7 @@ msgstr ""
"folgen wird, was standardmäßig aktiviert ist."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml:398
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes per second. The default "
@@ -4146,7 +4310,7 @@ msgstr ""
"Zeit deaktiviert."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:405
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 "
@@ -4158,7 +4322,7 @@ msgstr ""
"bekannten Bezeichner verwendet."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:409
msgid ""
"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
"an external command to discover the http proxy to use. Apt expects the "
@@ -4181,7 +4345,7 @@ msgstr ""
"dem veralteten Optionsnamen <literal>ProxyAutoDetect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:427
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4198,7 +4362,7 @@ msgstr ""
"<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:435
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4239,7 +4403,7 @@ msgstr ""
"Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:456
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]/</"
@@ -4274,7 +4438,7 @@ msgstr ""
"literal> und <literal>$(SITE_PORT)</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: apt.conf.5.xml:476
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, "
@@ -4291,7 +4455,7 @@ msgstr ""
"Musterkonfigurationsdatei)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:483
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 "
@@ -4305,7 +4469,7 @@ msgstr ""
"Effizienz nicht empfohlen FTP über HTTP zu benutzen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:488
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4321,13 +4485,13 @@ msgstr ""
"Server RFC2428 unterstützen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:502
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:497
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4349,7 +4513,7 @@ msgstr ""
"Aushängebefehle können per UMount angegeben werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:510
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4358,13 +4522,13 @@ msgstr ""
"literal>, um zusätzliche Parameter an Gpgv weiterzuleiten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:521
#, 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:512
+#: apt.conf.5.xml:516
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4384,19 +4548,19 @@ msgstr ""
"\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:526
#, 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:525
+#: apt.conf.5.xml:529
#, 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:518
+#: apt.conf.5.xml:522
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 "
@@ -4428,13 +4592,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:532
+#: apt.conf.5.xml:536
#, 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:527
+#: apt.conf.5.xml:531
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4460,7 +4624,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:537
+#: apt.conf.5.xml:541
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4472,7 +4636,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:544
+#: apt.conf.5.xml:548
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4486,7 +4650,7 @@ msgstr ""
"False."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:556
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4506,13 +4670,13 @@ msgstr ""
"langen Sprachcodes selten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:573
#, 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:557
+#: apt.conf.5.xml:561
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4553,7 +4717,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:574
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4567,24 +4731,32 @@ msgstr ""
"Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:583
msgid "When downloading, force to use only the IPv4 protocol."
msgstr "Beim Herunterladen wird die Verwendung des IPv4-Protokolls erzwungen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:589
msgid "When downloading, force to use only the IPv6 protocol."
msgstr "Beim Herunterladen wird die Verwendung des IPv6-Protokolls erzwungen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:595
msgid ""
"The maximum file size of Release/Release.gpg/InRelease files. The default "
"is 10MB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:602
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to. The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:611
msgid ""
"Allow the update operation to load data files from a repository without a "
"trusted signature. If enabled this option no data files will be loaded and "
@@ -4593,7 +4765,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:622
msgid ""
"Allow that a repository that was previously gpg signed to become unsigned "
"durign a update operation. When there is no valid signature of a perviously "
@@ -4603,13 +4775,46 @@ msgid ""
"source untrusted and warn about them if you try to install them."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:634
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:636
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them. Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>. The value should be a "
+"normal URI to a text file, expect that package specific data is replaced "
+"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"if the package is from a component (e.g. <literal>main</literal>) this is "
+"the first part otherwise it is omitted, 2. the first letter of source "
+"package name, expect if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version. "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>') and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>'). The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:664
msgid "Directories"
msgstr "Verzeichnisse"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:666
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4629,7 +4834,7 @@ msgstr ""
"nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:673
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4654,7 +4859,7 @@ msgstr ""
"in <literal>Dir::Cache</literal> enthalten."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:683
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4669,7 +4874,7 @@ msgstr ""
"Konfigurationsdatei erfolgt)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:689
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 "
@@ -4681,7 +4886,7 @@ msgstr ""
"geladen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:693
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4699,16 +4904,26 @@ msgstr ""
"Programms an."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:701
+#, fuzzy
+#| msgid ""
+#| "The configuration item <literal>RootDir</literal> has a special meaning. "
+#| "If set, all paths in <literal>Dir::</literal> will be relative to "
+#| "<literal>RootDir</literal>, <emphasis>even paths that are specified "
+#| "absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> "
+#| "is set to <filename>/tmp/staging</filename> and <literal>Dir::State::"
+#| "status</literal> is set to <filename>/var/lib/dpkg/status</filename>, "
+#| "then the status file will be looked up in <filename>/tmp/staging/var/lib/"
+#| "dpkg/status</filename>."
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>. So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>. If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."
msgstr ""
"Das Konfigurationselement <literal>RootDir</literal> hat eine besondere "
"Bedeutung. Falls es gesetzt ist, sind alle Pfad relativ zu <literal>RootDir</"
@@ -4719,7 +4934,7 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:715
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 "
@@ -4737,12 +4952,12 @@ msgstr ""
"diese Muster verwandt werden."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:724
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:726
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4753,7 +4968,7 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:731
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4776,7 +4991,7 @@ msgstr ""
"vor dem Herunterladen neuer Pakete durch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:745
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4785,7 +5000,7 @@ msgstr ""
"übermittelt, wenn es für die Installationsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:750
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4794,7 +5009,7 @@ msgstr ""
"übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:755
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4803,12 +5018,12 @@ msgstr ""
"nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:761
msgid "How APT calls &dpkg;"
msgstr "Wie APT &dpkg; aufruft"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:762
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4817,7 +5032,7 @@ msgstr ""
"stehen im Abschnitt <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:767
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 "
@@ -4828,7 +5043,7 @@ msgstr ""
"jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:773
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 "
@@ -4842,7 +5057,7 @@ msgstr ""
"APT abgebrochen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:780
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 "
@@ -4861,20 +5076,51 @@ msgstr ""
"übergeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:787
+msgid ""
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:792
+msgid ""
+"Each configuration directive line has the form <literal>key=value</"
+"literal>. Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:800
msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
msgstr ""
-"Version 2 dieses Protokolls gibt mehr Informationen aus, einschließlich der "
-"Protokollversion, dem APT-Konfigurationsraum und den Paketen, Dateien und "
-"den Versionen, die geändert werden. Version 3 fügt jeder ausgegebenen "
-"Version die Architektur und den <literal>MultiArch</literal>-Schalter hinzu."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:810
+msgid ""
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
+"\" is an incorrect typename which is just kept to remain compatible, it "
+"should be read as \"no\" and users are encouraged to support both."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:816
msgid ""
"The version of the protocol to be used for the command "
"<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4892,7 +5138,7 @@ msgstr ""
"bietet."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:823
msgid ""
"The file descriptor to be used to send the information can be requested with "
"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4910,7 +5156,7 @@ msgstr ""
"verwendeten Dateideskriptors als eine Bestätigung."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:833
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4919,7 +5165,7 @@ msgstr ""
"die Vorgabe ist <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:838
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4929,12 +5175,12 @@ msgstr ""
"Programme werden erstellt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:843
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:779
+#: apt.conf.5.xml:844
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 "
@@ -4961,7 +5207,7 @@ msgstr ""
"Pakete konfiguriert werden."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:859
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4975,7 +5221,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:853
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 "
@@ -5000,7 +5246,7 @@ msgstr ""
"Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:866
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 "
@@ -5023,7 +5269,7 @@ msgstr ""
"anhängen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:874
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -5053,7 +5299,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:824
+#: apt.conf.5.xml:889
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5072,7 +5318,7 @@ msgstr ""
"deaktivieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:896
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -5088,7 +5334,7 @@ msgstr ""
"benötigt werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:909
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5106,7 +5352,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:902
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 "
@@ -5130,12 +5376,12 @@ msgstr ""
"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:922
msgid "Periodic and Archives options"
msgstr "Periodische- und Archivoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:923
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -5149,12 +5395,12 @@ msgstr ""
"Dokumentation dieser Optionen zu erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:931
msgid "Debug options"
msgstr "Fehlersuchoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:933
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5172,7 +5418,7 @@ msgstr ""
"könnten es sein:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:944
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5183,7 +5429,7 @@ msgstr ""
"getroffenen Entscheidungen ein."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:952
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5194,7 +5440,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:896
+#: apt.conf.5.xml:961
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5206,7 +5452,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:904
+#: apt.conf.5.xml:969
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -5215,12 +5461,12 @@ msgstr ""
"Daten in CD-ROM-IDs aus."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:914
+#: apt.conf.5.xml:979
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:923
+#: apt.conf.5.xml:988
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -5228,28 +5474,28 @@ msgstr ""
"literal>-Quellen beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:999
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:945
+#: apt.conf.5.xml:1010
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:956
+#: apt.conf.5.xml:1021
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:967
+#: apt.conf.5.xml:1032
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -5258,7 +5504,7 @@ msgstr ""
"mittels <literal>gpg</literal> beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:978
+#: apt.conf.5.xml:1043
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -5267,13 +5513,13 @@ msgstr ""
"CD-ROMs gespeichert sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:988
+#: apt.conf.5.xml:1053
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:998
+#: apt.conf.5.xml:1063
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -5282,7 +5528,7 @@ msgstr ""
"Bibliotheken generiert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1008
+#: apt.conf.5.xml:1073
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 "
@@ -5293,7 +5539,7 @@ msgstr ""
"ID für eine CD-ROM generiert wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1084
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."
@@ -5303,14 +5549,14 @@ msgstr ""
"gleichen Zeit laufen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1031
+#: apt.conf.5.xml:1096
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:1041
+#: apt.conf.5.xml:1106
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -5319,7 +5565,7 @@ msgstr ""
"und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1116
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -5328,7 +5574,7 @@ msgstr ""
"Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1063
+#: apt.conf.5.xml:1128
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -5338,7 +5584,7 @@ msgstr ""
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1074
+#: apt.conf.5.xml:1139
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -5346,7 +5592,7 @@ msgstr ""
"durchführen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1085
+#: apt.conf.5.xml:1150
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5356,7 +5602,7 @@ msgstr ""
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1160
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5372,7 +5618,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml:1174
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5405,7 +5651,7 @@ msgstr ""
"dem das Paket erscheint."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1130
+#: apt.conf.5.xml:1195
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5415,7 +5661,7 @@ msgstr ""
"sind, aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1141
+#: apt.conf.5.xml:1206
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5424,7 +5670,7 @@ msgstr ""
"und alle während deren Auswertung gefundenen Fehler aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1152
+#: apt.conf.5.xml:1217
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5434,7 +5680,7 @@ msgstr ""
"soll."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1164
+#: apt.conf.5.xml:1229
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5442,12 +5688,12 @@ msgstr ""
"von &dpkg; ausgeführt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1240
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:1185
+#: apt.conf.5.xml:1250
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5457,7 +5703,7 @@ msgstr ""
"aufgetreten ist)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1196
+#: apt.conf.5.xml:1261
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 "
@@ -5469,7 +5715,7 @@ msgstr ""
"Marker</literal> beschrieben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1208
+#: apt.conf.5.xml:1273
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5478,7 +5724,7 @@ msgstr ""
"filename> gelesenen Anbieter aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml:1283
msgid ""
"Display the external commands that are called by apt hooks. This includes e."
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5489,13 +5735,13 @@ msgstr ""
"literal> oder <literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt.conf.5.xml:1307 apt_preferences.5.xml:556 sources.list.5.xml:358
#: apt-ftparchive.1.xml:592
msgid "Examples"
msgstr "Beispiele"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml:1308
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5505,7 +5751,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml:1320
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5710,12 +5956,12 @@ msgstr "Priorität 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:118
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that do not belong to the target release."
msgstr ""
-"zu den Versionen, die nicht installiert sind und die nicht zum Ziel-Release "
-"gehören."
+"zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:122
@@ -5724,13 +5970,22 @@ msgstr "Priorität 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:123
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
msgstr ""
"zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:127
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:131
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5748,7 +6003,7 @@ msgstr ""
"markiert sind."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml:138
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -5758,7 +6013,7 @@ msgstr ""
"ist."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml:141
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5774,12 +6029,12 @@ msgstr ""
"Downgrading eines Paketes riskant sein kann.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid "Install the highest priority version."
msgstr "installiert die Version mit der höchsten Priorität."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:148
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -5788,7 +6043,7 @@ msgstr ""
"aktuellste installiert (das ist die mit der höheren Versionsnummer)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml:151
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5800,7 +6055,7 @@ msgstr ""
"installierte installiert."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:157
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5816,7 +6071,7 @@ msgstr ""
"upgrade</command> ausgeführt wird."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:164
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5830,7 +6085,7 @@ msgstr ""
"upgrade</command> ausgeführt wird."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5850,12 +6105,12 @@ msgstr ""
"hat."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:178
msgid "The Effect of APT Preferences"
msgstr "Die Auswirkungen von APT-Einstellungen"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:180
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5869,7 +6124,7 @@ msgstr ""
"allgemeine Gestalt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:186
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages with a specified version or version range. For example, "
@@ -5886,7 +6141,7 @@ msgstr ""
"Pakete können durch Leerzeichen getrennt werden."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5898,7 +6153,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:199
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5913,7 +6168,7 @@ msgstr ""
"ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:205
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5924,7 +6179,7 @@ msgstr ""
"Paketversionen eine hohe Priorität zu, die lokal liegen."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:210
#, no-wrap
msgid ""
"Package: *\n"
@@ -5936,7 +6191,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml:215
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
"which can be used to match a hostname. The following record will assign a "
@@ -5950,7 +6205,7 @@ msgstr ""
"de.debian.org« identifiziert wird."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:219
#, no-wrap
msgid ""
"Package: *\n"
@@ -5962,7 +6217,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:223
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -5977,7 +6232,7 @@ msgstr ""
"oder »Ximian«."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml:228
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5988,7 +6243,7 @@ msgstr ""
"Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:232
#, no-wrap
msgid ""
"Package: *\n"
@@ -6000,7 +6255,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:237
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -6011,7 +6266,7 @@ msgstr ""
"hohe Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
#, no-wrap
msgid ""
"Package: *\n"
@@ -6023,7 +6278,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6034,7 +6289,7 @@ msgstr ""
"Nummer »<literal>&stable-version;</literal>« ist, eine hohe Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, no-wrap
msgid ""
"Package: *\n"
@@ -6045,13 +6300,22 @@ msgstr ""
"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:258
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:266
msgid "Regular expressions and &glob; syntax"
msgstr "Reguläre Ausdrücke und &glob;-Syntax"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:268
msgid ""
"APT also supports pinning by &glob; expressions, and regular expressions "
"surrounded by slashes. For example, the following example assigns the "
@@ -6067,7 +6331,7 @@ msgstr ""
"von Schrägstrichen umschlossen wird)."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
@@ -6079,7 +6343,7 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6090,7 +6354,7 @@ msgstr ""
"Paketen von einem Release seit Karmic die Priorität 900 zu."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
#, no-wrap
msgid ""
"Package: *\n"
@@ -6102,7 +6366,7 @@ msgstr ""
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
@@ -6120,12 +6384,12 @@ msgstr ""
"»Package«-Feld wird selbst nicht als ein &glob;-Ausdruck angesehen."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid "How APT Interprets Priorities"
msgstr "Wie APT Prioritäten interpretiert"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:314
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking):"
@@ -6135,12 +6399,12 @@ msgstr ""
"(grob gesagt):"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:319
msgid "P &gt;= 1000"
msgstr "P &gt;= 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -6149,12 +6413,12 @@ msgstr ""
"des Pakets durchführt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml:324
msgid "990 &lt;= P &lt; 1000"
msgstr "990 &lt;= P &lt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -6163,12 +6427,12 @@ msgstr ""
"Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:330
msgid "500 &lt;= P &lt; 990"
msgstr "500 &lt;= P &lt; 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:331
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -6178,12 +6442,12 @@ msgstr ""
"neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "100 &lt;= P &lt; 500"
msgstr "100 &lt;= P &lt; 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:337
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -6193,12 +6457,12 @@ msgstr ""
"installierte Version neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:342
msgid "0 &lt; P &lt; 100"
msgstr "0 &lt; P &lt; 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:343
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -6207,22 +6471,40 @@ msgstr ""
"installierte Version des Pakets gibt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:347
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:348
msgid "prevents the version from being installed"
msgstr "verhindert das Installieren der Version"
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:351
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:352
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
-msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version. Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+#: apt_preferences.5.xml:358
+#, fuzzy
+#| msgid ""
+#| "If any specific-form records match an available package version then the "
+#| "first such record determines the priority of the package version. "
+#| "Failing that, if any general-form records match an available package "
+#| "version then the first such record determines the priority of the package "
+#| "version."
+msgid ""
+"The first specific-form record matching an available package version "
+"determines the priority of the package version. Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version. Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
msgstr ""
"Wenn irgendwelche Datensätze mit speziellem Format zu einer verfügbaren "
"Paketversion passen, dann legt der erste dieser Datensätze die Priorität der "
@@ -6231,7 +6513,7 @@ msgstr ""
"erste dieser Datensätze die Priorität der Paketversion fest."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:366
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -6240,7 +6522,7 @@ msgstr ""
"bereits gezeigten Datensätze:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:370
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6268,12 +6550,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:383
msgid "Then:"
msgstr "Dann:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6288,7 +6570,7 @@ msgstr ""
"perl;* ist, dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:390
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6299,7 +6581,7 @@ msgstr ""
"sogar wenn diese Versionen zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:394
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6313,12 +6595,12 @@ msgstr ""
"Pakets installiert ist."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml:404
msgid "Determination of Package Version and Distribution Properties"
msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:406
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6329,7 +6611,7 @@ msgstr ""
"bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:410
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6348,27 +6630,27 @@ msgstr ""
"Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:418
msgid "the <literal>Package:</literal> line"
msgstr "die <literal>Package:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml:419
msgid "gives the package name"
msgstr "gibt den Paketnamen an"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml:422 apt_preferences.5.xml:472
msgid "the <literal>Version:</literal> line"
msgstr "die <literal>Version:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:423
msgid "gives the version number for the named package"
msgstr "gibt die Versionsnummer für das genannte Paket an"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:428
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6390,12 +6672,12 @@ msgstr ""
"APT-Prioritäten relevant:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:439
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:440
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6412,18 +6694,18 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:450
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:456
msgid "the <literal>Codename:</literal> line"
msgstr "die <literal>Codename:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml:457
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6440,13 +6722,13 @@ msgstr ""
"anzugeben würde die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:466
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:473
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian release version &stable-version;. Note that there is "
@@ -6463,7 +6745,7 @@ msgstr ""
"eine der folgenden Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
#, no-wrap
msgid ""
"Pin: release v=&stable-version;\n"
@@ -6475,12 +6757,12 @@ msgstr ""
"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:491
msgid "the <literal>Component:</literal> line"
msgstr "die <literal>Component:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml:492
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6498,18 +6780,18 @@ msgstr ""
"Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:507
msgid "the <literal>Origin:</literal> line"
msgstr "die <literal>Origin:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:508
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6521,18 +6803,18 @@ msgstr ""
"in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:514
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:520
msgid "the <literal>Label:</literal> line"
msgstr "die <literal>Label:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:521
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6545,13 +6827,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:527
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:534
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6577,12 +6859,12 @@ msgstr ""
"Distribution heruntergeladen wurde."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml:547
msgid "Optional Lines in an APT Preferences Record"
msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:549
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6593,12 +6875,12 @@ msgstr ""
"anfangen. Dieses stellt einen Platz für Kommentare bereit."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:558
msgid "Tracking Stable"
msgstr "Stable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:566
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6622,7 +6904,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:560
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6637,8 +6919,8 @@ msgstr ""
"Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
-#: apt_preferences.5.xml:672
+#: apt_preferences.5.xml:583 apt_preferences.5.xml:629
+#: apt_preferences.5.xml:687
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6650,7 +6932,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml:578
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6663,13 +6945,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:595
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:589
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6683,12 +6965,12 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:601
msgid "Tracking Testing or Unstable"
msgstr "Testing oder Unstable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Package: *\n"
@@ -6716,7 +6998,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:603
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6733,7 +7015,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:624
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6746,13 +7028,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:644
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:635
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6772,12 +7054,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml:651
msgid "Tracking the evolution of a codename release"
msgstr "Die Entwicklung eines Codename-Releases verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml:665
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6812,7 +7094,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:653
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6838,7 +7120,7 @@ msgstr ""
"benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml:682
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6851,13 +7133,13 @@ msgstr ""
"literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml:702
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:693
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6877,7 +7159,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml:717
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6888,13 +7170,24 @@ msgstr "Liste konfigurierter APT-Datenquellen"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+#, fuzzy
+#| msgid ""
+#| "The source list <filename>/etc/apt/sources.list</filename> is designed to "
+#| "support any number of active sources and a variety of source media. The "
+#| "file lists one source per line, with the most preferred source listed "
+#| "first. The information available from the configured sources is acquired "
+#| "by <command>apt-get update</command> (or by an equivalent command from "
+#| "another APT front-end)."
+msgid ""
+"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
msgstr ""
"Die Quellenliste <filename>/etc/apt/sources.list</filename> wurde entworfen, "
"um jede Zahl aktiver Quellen und unterschiedlicher Quellmedien zu "
@@ -6903,37 +7196,35 @@ msgstr ""
"durch <command>apt-get update</command> (oder einen vergleichbaren Befehl "
"einer anderen APT-Oberfläche) beschafft."
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
-msgid ""
-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
-"literal>) followed by options and arguments for this type. Individual "
-"entries cannot be continued onto a following line. Empty lines are ignored, "
-"and a <literal>#</literal> character anywhere on a line marks the remainder "
-"of that line as a comment."
-msgstr ""
-"Jede Zeile, die eine Quelle angibt, beginnt mit den Typ (z.B. <literal>deb-"
-"src</literal>) gefolgt von Optionen und Argumenten für diesen Typ. Einzelne "
-"Einträge können nicht auf einer folgenden Zeile fortgesetzt werden. Leere "
-"Zeilen werden ignoriert und ein <literal>#</literal>-Zeichen irgendwo in "
-"einer Zeile kennzeichnet den Rest dieser Zeile als Kommentar."
-
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml:45
msgid "sources.list.d"
msgstr "sources.list.d"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:46
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files. The format is the same as "
+#| "for the regular <filename>sources.list</filename> file. File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters. Otherwise APT will print a notice that it has ignored a "
+#| "file, unless that file matches a pattern in the <literal>Dir::Ignore-"
+#| "Files-Silently</literal> configuration list - in which case it will be "
+#| "silently ignored."
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files. The format is the same as for "
-"the regular <filename>sources.list</filename> file. File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"add sources.list entries in separate files. Two different file formats are "
+"allowed as described in the next two sections. Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format. The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters. Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."
msgstr ""
"Das Verzeichnis <filename>/etc/apt/sources.list.d</filename> stellt eine "
"Möglichkeit bereit, sources.list-Einträge in separaten Dateien hinzuzufügen. "
@@ -6946,16 +7237,106 @@ msgstr ""
"Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert."
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml:58
+msgid "one line style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:60
+msgid ""
+"Files in this format have the extension <filename>.list</filename>. Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"
+"literal>) followed by options and arguments for this type. Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line. If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>) included in the line after the type separated from "
+"it with a space. If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by a equal sign (<literal>=</literal>). "
+"Multivalue options have also <literal>-=</literal> and <literal>+=</literal> "
+"as separator which instead of replacing the default with the given value(s) "
+"modify the default value(s) to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:79
+msgid ""
+"This is the traditional format and supported by all apt versions. Note that "
+"not all options as described below are supported by all apt versions. Note "
+"also that some older applications parsing this format on its own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:87
+msgid "deb822 style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:89
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>. The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, like the metadata itself apt will download from the configured "
+"sources or the <filename>debian/control</filename> file in a Debian source "
+"package. Individual entries are separated by an empty line, additional "
+"empty lines are ignored, and a <literal>#</literal> character at the start "
+"of the line marks the entire line as a comment. An entry can hence be "
+"disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it. Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s). Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:108
+msgid ""
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier. It "
+"is intended to make this format gradually the default format and deprecating "
+"the previously described one line style format as it is easier to create, "
+"extend and modify by humans and machines alike especially if a lot of "
+"sources and/or options are involved. Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but could encounter problems with software not "
+"supporting the format yet."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:123
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: General Format"
msgstr "Die Typen deb und deb-src"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml:124
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type references a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. The "
+#| "<literal>distribution</literal> is generally an archive name like "
+#| "<literal>stable</literal> or <literal>testing</literal> or a codename "
+#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</"
+#| "literal> while component is one of <literal>main</literal>, "
+#| "<literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "<literal>deb-src</literal> type references a Debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type references a typical two-level Debian "
"archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
"<literal>stable</literal> or <literal>testing</literal> or a codename like "
"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
"literal> while component is one of <literal>main</literal>, "
@@ -6976,79 +7357,72 @@ msgstr ""
"benötigt, um Quellindizes herunterzuladen."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:135
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one line style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
msgstr ""
"Das Format für einen <filename>sources.list</filename>-Eintrag, der die "
"<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
+#: sources.list.5.xml:138
#, no-wrap
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ Optionen ] URI Suite [Komponente1] [Komponente2] […]"
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
+msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:143
#, no-wrap
msgid ""
" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
+" URIs: uri\n"
+" Suites: suite\n"
+" Components: [component1] [component2] [...]\n"
+" option1: value1\n"
+" option2: value2\n"
" "
msgstr ""
-" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: Komponente1 Komponente2\n"
-" Description: short\n"
-" long long long\n"
-" [Option1]: [Option1-Wert]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: Komponente1 Komponente2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [Option1]: [Option1-Wert]\n"
-" "
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:141
+#, fuzzy
+#| msgid ""
+#| "Alternatively a rfc822 style format is also supported: <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
"Alternativ wird auch ein Format im Stil von RFC822 unterstützt: <placeholder "
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml:152
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>suite</literal> can specify an exact path, in which case the "
+#| "components must be omitted and <literal>suite</literal> must end with a "
+#| "slash (<literal>/</literal>). This is useful for the case when only a "
+#| "particular sub-section of the archive denoted by the URI is of interest. "
+#| "If <literal>suite</literal> does not specify an exact path, at least one "
+#| "<literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>suite</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>suite</literal> must end with a "
"slash (<literal>/</literal>). This is useful for the case when only a "
-"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest. "
+"If <literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"Die URI für den <literal>deb</literal>-Typ muss die Basis der Debian-"
@@ -7061,7 +7435,7 @@ msgstr ""
"muss mindestens eine <literal>Komponente</literal> angegeben sein."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml:161
msgid ""
"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
"literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7081,19 +7455,32 @@ msgstr ""
"generieren."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
-msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+#: sources.list.5.xml:169
+#, fuzzy
+#| msgid ""
+#| "In the traditional style sources.list format since only one distribution "
+#| "can be specified per line it may be necessary to have multiple lines for "
+#| "the same URI, if a subset of all available distributions or components at "
+#| "that location is desired. APT will sort the URI list after it has "
+#| "generated a complete set internally, and will collapse multiple "
+#| "references to the same Internet host, for instance, into a single "
+#| "connection, so that it does not inefficiently establish an FTP "
+#| "connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"Especially in the one line style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "
"location is desired. APT will sort the URI list after it has generated a "
"complete set internally, and will collapse multiple references to the same "
"Internet host, for instance, into a single connection, so that it does not "
-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
msgstr ""
"In der Sources.list im herkömmlichen Formatstil könnte es nötig sein, da pro "
"Zeile nur eine Distribution angegeben werden kann, mehrere Zeilen für die "
@@ -7110,31 +7497,74 @@ msgstr ""
"hauszuhalten."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
-msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>. Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
-msgstr ""
-"<literal>options</literal> ist immer optional und muss in eckige Klammern "
-"eingeschlossen werden. Es kann aus mehreren Einstellungen in der Form "
-"<literal><replaceable>Einstellung</replaceable>=<replaceable>Wert</"
-"replaceable></literal> bestehen. Mehrere Einstellungen werden durch "
-"Leerzeichen getrennt. Die folgenden Einstellungen werden von APT "
-"unterstützt. Beachten Sie allerdings, dass nicht unterstützte Einstellungen "
-"stillschweigend ignoriert werden."
+#: sources.list.5.xml:181
+msgid ""
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+"Es ist wichtig, die Quellen in der Reihenfolge ihrer Wichtigkeit "
+"aufzulisten, die bevorzugte Quelle zuerst. Typischerweise resultiert dies in "
+"einer Sortierung nach Geschwindigkeit, vom schnellsten zum langsamsten (CD-"
+"ROM, gefolgt von Rechnern im lokalen Netzwerk, gefolgt von Internet-"
+"Rechnern, zum Beispiel)."
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:188
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:190
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:186
+msgid ""
+"As an example, the sources for your distribution could look like this in one "
+"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:193
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: Options"
+msgstr "Die Typen deb und deb-src"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:194
+msgid ""
+"Each source entry can have options specified modifying which and how the "
+"source is accessed and data acquired from it. Format, syntax and names of "
+"the options varies between the two formats one line and deb822 style as "
+"described, but they have both the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one line name in brackets. "
+"Remember that beside setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
+msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:205
+#, fuzzy
+#| msgid ""
+#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#| "replaceable>,…</literal> can be used to specify for which architectures "
+#| "information should be downloaded. If this option is not set all "
+#| "architectures defined by the <literal>APT::Architectures</literal> option "
+#| "will be downloaded."
msgid ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
msgstr ""
"<literal>arch=<replaceable>Architektur1</replaceable>,"
"<replaceable>Architektur2</replaceable>, …</literal> kann benutzt werden, um "
@@ -7144,81 +7574,93 @@ msgstr ""
"heruntergeladen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:212
msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information like translated package "
+"descriptions should be downloaded. If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
msgstr ""
-"<literal>arch+=<replaceable>Architektur1</replaceable>,"
-"<replaceable>Architektur2</replaceable>, …</literal> und <literal>arch-"
-"=<replaceable>Architektur1</replaceable>,<replaceable>Architektur2</"
-"replaceable>, …</literal>, die benutzt werden können, um der "
-"Zusammenstellung, die heruntergeladen werden soll, Architekturen "
-"hinzuzufügen oder zu entfernen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:220
msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
-msgstr ""
-"<literal>trusted=yes</literal> kann gesetzt werden, um anzuzeigen, dass "
-"Pakete aus dieser Quelle immer authentifiziert sind, sogar, falls die Datei "
-"<filename>Release</filename> nicht signiert ist oder die Signatur nicht "
-"geprüft werden kann. Dies deaktiviert Teile von &apt-secure; und sollte "
-"daher nur in lokalem und vertrauenswürdigem Kontext benutzt werden. "
-"<literal>trusted=no</literal> ist das Gegenteil davon. Es handhabt sogar "
-"korrekt authentifizierte Quellen als nicht authentifiziert."
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope."
+msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:228
msgid ""
-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
msgstr ""
-"Es ist wichtig, die Quellen in der Reihenfolge ihrer Wichtigkeit "
-"aufzulisten, die bevorzugte Quelle zuerst. Typischerweise resultiert dies in "
-"einer Sortierung nach Geschwindigkeit, vom schnellsten zum langsamsten (CD-"
-"ROM, gefolgt von Rechnern im lokalen Netzwerk, gefolgt von Internet-"
-"Rechnern, zum Beispiel)."
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-msgid "Some examples:"
-msgstr "Einige Beispiele:"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:235
+msgid ""
+"<option>Signed-By</option> (<option>signed-by</option>) is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key in either the <filename>trusted.gpg</"
+"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set only the key(s) in this keyring or only the key with this "
+"fingerprint is used for the &apt-secure; verification of this repository. "
+"Otherwise all keys in the trusted keyrings are considered valid signers for "
+"this repository."
+msgstr ""
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:249
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare until then the data provided in the "
+"repository should be considered valid and if this time is reached, but no "
+"new data is provided the data is considered expired and an error is raised. "
+"Beside increasing security as a malicious attacker can't sent old data "
+"forever denying a user to be able to upgrade to a new version, this also "
+"helps users identify mirrors which are no longer updated. Some repositories "
+"like historic archives aren't updated anymore by design through, so this "
+"check can be disabled by setting this option to <literal>no</literal>. "
+"Defaults to the value of configuration option <option>Acquire::Check-Valid-"
+"Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:266
+msgid ""
+"<option>Valid-Until-Min</option> (<option>check-valid-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldomly updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely. Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:288
msgid "URI specification"
msgstr "URI-Beschreibung"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml:290
msgid "The currently recognized URI types are:"
msgstr "Die derzeit zulässigen URI-Typen sind:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:294
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7229,7 +7671,7 @@ msgstr ""
"lokale Spiegel oder Archive."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml:301
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7239,7 +7681,7 @@ msgstr ""
"der Quellenliste zu erstellen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:308
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7256,7 +7698,7 @@ msgstr ""
"Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:319
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7278,7 +7720,7 @@ msgstr ""
"benutzen, werden ignoriert."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:331
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -7291,7 +7733,7 @@ msgstr ""
"Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:338
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7305,12 +7747,12 @@ msgstr ""
"<command>find</command> und <command>dd</command> verwandt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:345
msgid "adding more recognizable URI types"
msgstr "weitere zulässige URI-Typen hinzufügen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:347
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7329,46 +7771,86 @@ msgstr ""
"Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian "
+#| "for stable/main, stable/contrib, and stable/non-free."
msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
"Benutzt die lokal gespeicherten (oder per NFS eingehängten) Archive in /home/"
"jason/debian für stable/main, stable/contrib und stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
-#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+#: sources.list.5.xml:361
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr "deb file:/home/jason/debian stable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:362
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:367
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
"benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
-#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:368
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:369
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:374
msgid "Source line for the above"
msgstr "Quellzeile für obiges"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
-#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:375
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:376
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:382
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7379,17 +7861,41 @@ msgstr ""
"<literal>amd64</literal> und <literal>armel</literal> holt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
-#, no-wrap
+#: sources.list.5.xml:384
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgid ""
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:386
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml:398
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7398,13 +7904,24 @@ msgstr ""
"den hamm/main-Bereich zu benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:400
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "deb http://archive.debian.org/debian-archive hamm main"
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr "deb http://archive.debian.org/debian-archive hamm main"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml:406
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7414,13 +7931,24 @@ msgstr ""
"benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:408
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:409
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:414
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7434,19 +7962,49 @@ msgstr ""
"für beide Quellzeilen benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:418
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:419
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml:431
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:432
+#, fuzzy, no-wrap
+#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:424
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
+#| "directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</"
+#| "filename> on amd64, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; "
+#| "official debian archives are not structured like this] <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7454,7 +8012,7 @@ msgid ""
"amd64, and so forth for other supported architectures. [Note this example "
"only illustrates how to use the substitution variable; official debian "
"archives are not structured like this] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
msgstr ""
"benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-"
"Verzeichnis zuzugreifen und benutzt nur Dateien, die unter "
@@ -7466,8 +8024,39 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml:437
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:439
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:445
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:454
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;, &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
#. type: Content of: <refentry><refmeta><manvolnum>
@@ -10187,3 +10776,169 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade\n"
#: offline.dbk:242
msgid "Which will use the already fetched archives on the disc."
msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
+
+#~ msgid ""
+#~ "No action; perform a simulation of events that would occur but do not "
+#~ "actually change the system. Configuration Item: <literal>APT::Get::"
+#~ "Simulate</literal>."
+#~ msgstr ""
+#~ "keine Aktion; führt eine Simulation von Ereignissen aus, die eintreten "
+#~ "würden, aber das aktuelle System nicht verändern. Konfigurationselement: "
+#~ "<literal>APT::Get::Simulate</literal>."
+
+#~ msgid ""
+#~ "Simulated runs performed as a user will automatically deactivate locking "
+#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
+#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
+#~ "notice will also be displayed indicating that this is only a simulation. "
+#~ "Runs performed as root do not trigger either NoLocking or the notice - "
+#~ "superusers should know what they are doing without further warnings from "
+#~ "<literal>apt-get</literal>."
+#~ msgstr ""
+#~ "Simulierte Durchläufe als Benutzer werden automatisch das Sperren "
+#~ "deaktivieren (<literal>Debug::NoLocking</literal>) und falls die Option "
+#~ "<literal>APT::Get::Show-User-Simulation-Note</literal> gesetzt ist (was "
+#~ "standardmäßig der Fall ist), wird außerdem eine Benachrichtigung "
+#~ "angezeigt, die angibt, dass es sich hierbei nur um eine Simulation "
+#~ "handelt. Simulierte Durchläufe als Root lösen weder NoLocking noch die "
+#~ "Benachrichtigung aus – Superuser sollten ohne vorherige Warnung von "
+#~ "<literal>apt-get</literal> wissen, was sie tun."
+
+#~ msgid ""
+#~ "Ignore if packages can't be authenticated and don't prompt about it. "
+#~ "This is useful for tools like pbuilder. Configuration Item: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+#~ msgstr ""
+#~ "Ignoriert, wenn Pakete nicht authentifiziert werden können und nicht "
+#~ "danach fragen. Dies ist für Werkzeuge wie pbuilder nützlich. "
+#~ "Konfigurationselement: <literal>APT::Get::AllowUnauthenticated</literal>."
+
+#~ msgid ""
+#~ "Version 2 of this protocol dumps more information, including the protocol "
+#~ "version, the APT configuration space and the packages, files and versions "
+#~ "being changed. Version 3 adds the architecture and <literal>MultiArch</"
+#~ "literal> flag to each version being dumped."
+#~ msgstr ""
+#~ "Version 2 dieses Protokolls gibt mehr Informationen aus, einschließlich "
+#~ "der Protokollversion, dem APT-Konfigurationsraum und den Paketen, Dateien "
+#~ "und den Versionen, die geändert werden. Version 3 fügt jeder ausgegebenen "
+#~ "Version die Architektur und den <literal>MultiArch</literal>-Schalter "
+#~ "hinzu."
+
+#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr ""
+#~ "zu den Versionen, die nicht installiert sind und die nicht zum Ziel-"
+#~ "Release gehören."
+
+#~ msgid ""
+#~ "Each line specifying a source starts with type (e.g. <literal>deb-src</"
+#~ "literal>) followed by options and arguments for this type. Individual "
+#~ "entries cannot be continued onto a following line. Empty lines are "
+#~ "ignored, and a <literal>#</literal> character anywhere on a line marks "
+#~ "the remainder of that line as a comment."
+#~ msgstr ""
+#~ "Jede Zeile, die eine Quelle angibt, beginnt mit den Typ (z.B. "
+#~ "<literal>deb-src</literal>) gefolgt von Optionen und Argumenten für "
+#~ "diesen Typ. Einzelne Einträge können nicht auf einer folgenden Zeile "
+#~ "fortgesetzt werden. Leere Zeilen werden ignoriert und ein <literal>#</"
+#~ "literal>-Zeichen irgendwo in einer Zeile kennzeichnet den Rest dieser "
+#~ "Zeile als Kommentar."
+
+#~ msgid "deb [ options ] uri suite [component1] [component2] [...]"
+#~ msgstr "deb [ Optionen ] URI Suite [Komponente1] [Komponente2] […]"
+
+#~ msgid ""
+#~ " Types: deb deb-src\n"
+#~ " URIs: http://example.com\n"
+#~ " Suites: stable testing\n"
+#~ " Sections: component1 component2\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ "\n"
+#~ " Types: deb\n"
+#~ " URIs: http://another.example.com\n"
+#~ " Suites: experimental\n"
+#~ " Sections: component1 component2\n"
+#~ " Enabled: no\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ " "
+#~ msgstr ""
+#~ " Types: deb deb-src\n"
+#~ " URIs: http://example.com\n"
+#~ " Suites: stable testing\n"
+#~ " Sections: Komponente1 Komponente2\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [Option1]: [Option1-Wert]\n"
+#~ "\n"
+#~ " Types: deb\n"
+#~ " URIs: http://another.example.com\n"
+#~ " Suites: experimental\n"
+#~ " Sections: Komponente1 Komponente2\n"
+#~ " Enabled: no\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [Option1]: [Option1-Wert]\n"
+#~ " "
+
+#~ msgid ""
+#~ "<literal>options</literal> is always optional and needs to be surrounded "
+#~ "by square brackets. It can consist of multiple settings in the form "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>. Multiple settings are separated by spaces. The "
+#~ "following settings are supported by APT (note however that unsupported "
+#~ "settings will be ignored silently):"
+#~ msgstr ""
+#~ "<literal>options</literal> ist immer optional und muss in eckige Klammern "
+#~ "eingeschlossen werden. Es kann aus mehreren Einstellungen in der Form "
+#~ "<literal><replaceable>Einstellung</replaceable>=<replaceable>Wert</"
+#~ "replaceable></literal> bestehen. Mehrere Einstellungen werden durch "
+#~ "Leerzeichen getrennt. Die folgenden Einstellungen werden von APT "
+#~ "unterstützt. Beachten Sie allerdings, dass nicht unterstützte "
+#~ "Einstellungen stillschweigend ignoriert werden."
+
+#~ msgid ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> which can be "
+#~ "used to add/remove architectures from the set which will be downloaded."
+#~ msgstr ""
+#~ "<literal>arch+=<replaceable>Architektur1</replaceable>,"
+#~ "<replaceable>Architektur2</replaceable>, …</literal> und <literal>arch-"
+#~ "=<replaceable>Architektur1</replaceable>,<replaceable>Architektur2</"
+#~ "replaceable>, …</literal>, die benutzt werden können, um der "
+#~ "Zusammenstellung, die heruntergeladen werden soll, Architekturen "
+#~ "hinzuzufügen oder zu entfernen."
+
+#~ msgid ""
+#~ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+#~ "this source are always authenticated even if the <filename>Release</"
+#~ "filename> file is not signed or the signature can't be checked. This "
+#~ "disables parts of &apt-secure; and should therefore only be used in a "
+#~ "local and trusted context. <literal>trusted=no</literal> is the opposite "
+#~ "which handles even correctly authenticated sources as not authenticated."
+#~ msgstr ""
+#~ "<literal>trusted=yes</literal> kann gesetzt werden, um anzuzeigen, dass "
+#~ "Pakete aus dieser Quelle immer authentifiziert sind, sogar, falls die "
+#~ "Datei <filename>Release</filename> nicht signiert ist oder die Signatur "
+#~ "nicht geprüft werden kann. Dies deaktiviert Teile von &apt-secure; und "
+#~ "sollte daher nur in lokalem und vertrauenswürdigem Kontext benutzt "
+#~ "werden. <literal>trusted=no</literal> ist das Gegenteil davon. Es "
+#~ "handhabt sogar korrekt authentifizierte Quellen als nicht authentifiziert."
+
+#~ msgid "Some examples:"
+#~ msgstr "Einige Beispiele:"
+
+#~ msgid ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+#~ msgstr ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
diff --git a/doc/po/es.po b/doc/po/es.po
index 84dd3a127..e38067174 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-08-21 06:12-0400\n"
"PO-Revision-Date: 2014-07-04 01:31+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -700,17 +700,15 @@ msgstr ""
#. type: Content of: <refentry><refmeta><manvolnum>
#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
-#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
-#: apt-config.8.xml:22
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21 apt-config.8.xml:22
msgid "8"
msgstr "8"
#. type: Content of: <refentry><refmeta><refmiscinfo>
#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
-#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
-#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
-#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
-#: apt-ftparchive.1.xml:23
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22 apt-config.8.xml:23
+#: apt.conf.5.xml:28 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23 apt-ftparchive.1.xml:23
msgid "APT"
msgstr "APT"
@@ -721,10 +719,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
-#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
-#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
-#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
-#: apt-ftparchive.1.xml:34
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33 apt-config.8.xml:34
+#: apt.conf.5.xml:37 apt_preferences.5.xml:32 sources.list.5.xml:32
+#: apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34 apt-ftparchive.1.xml:34
msgid "Description"
msgstr "Descripción"
@@ -742,19 +739,19 @@ msgstr ""
msgid ""
"<literal>list</literal> is used to display a list of packages. It supports "
"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option> are supported."
+"<option>--installed</option>, <option>--upgradable</option>, <option>--"
+"upgradeable</option>, <option>--all-versions</option> are supported."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml:55
msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml:61
#, fuzzy
#| msgid ""
#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
@@ -766,14 +763,14 @@ msgstr ""
"<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml:68
msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml:72 apt-get.8.xml:112
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -791,7 +788,7 @@ msgstr ""
"(stable, testing, unstable)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml:82 apt-get.8.xml:147
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note that removing a package "
@@ -806,15 +803,36 @@ msgstr ""
"nombre del paquete (sin ningún espacio en blanco entre los dos), el paquete "
"en cuestión será instalado en vez de eliminado."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "alias since 1.1)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:90 apt-get.8.xml:228
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> desinstala paquetes que se instalaron "
+"automáticamente para satisfacer las dependencias de otros paquetes pero que "
+"ya no son necesarios."
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml:95
msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml:101
#, fuzzy
#| msgid ""
#| "<literal>showhold</literal> is used to print a list of packages on hold "
@@ -827,7 +845,7 @@ msgstr ""
"de la misma forma que las otras órdenes «show»."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml:107
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -836,7 +854,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml:116
msgid ""
"<literal>full-upgrade</literal> performs the function of upgrade but may "
"also remove installed packages if that is required in order to resolve a "
@@ -844,19 +862,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt.8.xml:126 apt-get.8.xml:262 apt-cache.8.xml:246 apt-mark.8.xml:104
#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
#: apt-ftparchive.1.xml:500
msgid "options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
+#: apt.8.xml:136
msgid "Script usage"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml:138
msgid ""
"The &apt; commandline is designed as a end-user tool and it may change the "
"output between versions. While it tries to not break backward compatibility "
@@ -866,12 +884,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
+#: apt.8.xml:146
msgid "Differences to &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
+#: apt.8.xml:147
msgid ""
"The <command>apt</command> command is meant to be pleasant for end users and "
"does not need to be backward compatible like &apt-get;. Therefore some "
@@ -879,28 +897,28 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
+#: apt.8.xml:153
#, fuzzy
#| msgid "the <literal>Package:</literal> line"
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
msgstr "La línea <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:157
#, fuzzy
#| msgid "the <literal>Component:</literal> line"
msgid "The option <literal>APT::Color</literal> is enabled."
msgstr "La línea <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:161
msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml:166
#, fuzzy
#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgid ""
@@ -909,16 +927,16 @@ msgid ""
msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt.8.xml:176 apt-get.8.xml:597 apt-cache.8.xml:359 apt-key.8.xml:191
#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
-#: apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701
-#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-config.8.xml:105 apt.conf.5.xml:1319 apt_preferences.5.xml:716
+#: sources.list.5.xml:453 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
#: apt-ftparchive.1.xml:603
msgid "See Also"
msgstr "Véase también"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml:177
#, fuzzy
#| msgid ""
#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -933,14 +951,14 @@ msgstr ""
"preferences;, el Cómo de APT."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt.8.xml:182 apt-get.8.xml:603 apt-cache.8.xml:364 apt-mark.8.xml:131
#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "Diagnostics"
msgstr "Diagnósticos"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml:183
#, fuzzy
#| msgid ""
#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
@@ -1332,28 +1350,23 @@ msgstr ""
"desactivada impedirá que se borren los paquetes instalados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
-msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
-msgstr ""
-"<literal>autoremove</literal> desinstala paquetes que se instalaron "
-"automáticamente para satisfacer las dependencias de otros paquetes pero que "
-"ya no son necesarios."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:233
-msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu). By default it displays the changelog for the version that is "
-"installed. However, you can specify the same options as for the "
-"<option>install</option> command."
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
+#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
+#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "changelogs</ulink> for Ubuntu). By default it displays the changelog for "
+#| "the version that is installed. However, you can specify the same options "
+#| "as for the <option>install</option> command."
+msgid ""
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>. By default it "
+"displays the changelog for the version that is installed. However, you can "
+"specify the same options as for the <option>install</option> command."
msgstr ""
"<literal>changelog</literal> descarga un fichero de registro de cambios "
"«changelog» de un paquete dado y lo muestra a través de <command>sensible-"
@@ -1367,7 +1380,21 @@ msgstr ""
"option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml:243
+msgid ""
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:267
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1376,7 +1403,7 @@ msgstr ""
"de configuración: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml:272
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -1385,7 +1412,7 @@ msgstr ""
"instalar. Opción de configuración: <literal>APT::Install-Suggests</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:277
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1394,7 +1421,7 @@ msgstr ""
"instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:282
#, fuzzy
#| msgid ""
#| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -1435,7 +1462,7 @@ msgstr ""
"<literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml:297
msgid ""
"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -1455,7 +1482,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -1467,7 +1494,7 @@ msgstr ""
"<literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:315
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1487,37 +1514,21 @@ msgstr ""
"no espera. Opción de configuración: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:330
msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system. Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-"No realiza ninguna acción, simula lo que hubiese ocurrido pero sin hacer "
-"cambios reales en el sistema. Opción de configuración: <literal>APT::Get::"
-"Simulate</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
-msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>) so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation. A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>). Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."
msgstr ""
-"Las simulaciones de ejecución realizadas por un usuario desactivan el "
-"bloqueo de forma automática (<literal>Debug::NoLocking</literal>), y si se "
-"define la opción <literal>APT::Get::Show-User-Simulation-Note</literal> "
-"(activa de forma predefinida) se muestra un aviso que indica que solo es una "
-"simulación. Las ejecuciones realizadas como usuario «root» no activan "
-"«NoLocking» o el aviso. Los administradores deben ser conscientes de sus "
-"acciones sin avisos de <literal>apt-get</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:340
msgid ""
"Simulated runs print out a series of lines, each representing a "
"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1533,7 +1544,7 @@ msgstr ""
"(poco frecuente)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:348
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -1549,7 +1560,7 @@ msgstr ""
"<literal>APT::Get::Assume-Yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:356
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
"Assume-No</literal>."
@@ -1558,7 +1569,7 @@ msgstr ""
"Get::Assume-No</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:361
msgid ""
"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1567,7 +1578,7 @@ msgstr ""
"<literal>APT::Get::Show-Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:367
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -1576,7 +1587,7 @@ msgstr ""
"Opción de configuración: <literal>APT::Get::Show-Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:373
#, fuzzy
#| msgid ""
#| "This option controls the architecture packages are built for by "
@@ -1601,7 +1612,7 @@ msgstr ""
"configuración: <literal>APT::Get::Host-Architecture</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml:383
#, fuzzy
#| msgid ""
#| "This option controls the architecture packages are built for by "
@@ -1625,7 +1636,7 @@ msgstr ""
"configuración: <literal>APT::Get::Host-Architecture</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:394
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -1634,7 +1645,7 @@ msgstr ""
"<literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml:399
msgid ""
"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -1648,7 +1659,7 @@ msgstr ""
"Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml:406
msgid ""
"Allow installing new packages when used in conjunction with "
"<literal>upgrade</literal>. This is useful if the update of a installed "
@@ -1660,7 +1671,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:418
msgid ""
"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1673,7 +1684,7 @@ msgstr ""
"configuración: <literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:425
msgid ""
"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1687,13 +1698,90 @@ msgstr ""
"<literal>APT::Get::Only-Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml:433
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+"Supone una respuesta afirmativa a todas las preguntas. Ésta es una opción "
+"peligrosa que hará que apt continúe sin preguntar incluso si se va a "
+"realizar algo potencialmente peligroso. No se debe usar excepto en "
+"situaciones muy especiales. ¡Utilizar <literal>force-yes</literal> puede "
+"destruir su sistema! Opción de configuración: <literal>APT::Get::force-yes</"
+"literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+"Supone una respuesta afirmativa a todas las preguntas. Ésta es una opción "
+"peligrosa que hará que apt continúe sin preguntar incluso si se va a "
+"realizar algo potencialmente peligroso. No se debe usar excepto en "
+"situaciones muy especiales. ¡Utilizar <literal>force-yes</literal> puede "
+"destruir su sistema! Opción de configuración: <literal>APT::Get::force-yes</"
+"literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+"Supone una respuesta afirmativa a todas las preguntas. Ésta es una opción "
+"peligrosa que hará que apt continúe sin preguntar incluso si se va a "
+"realizar algo potencialmente peligroso. No se debe usar excepto en "
+"situaciones muy especiales. ¡Utilizar <literal>force-yes</literal> puede "
+"destruir su sistema! Opción de configuración: <literal>APT::Get::force-yes</"
+"literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:457
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
msgid ""
"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
-"<literal>APT::Get::force-yes</literal>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."
msgstr ""
"Supone una respuesta afirmativa a todas las preguntas. Ésta es una opción "
"peligrosa que hará que apt continúe sin preguntar incluso si se va a "
@@ -1703,7 +1791,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:465
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected MD5 "
@@ -1725,7 +1813,7 @@ msgstr ""
"<literal>APT::Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:476
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1739,7 +1827,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:484
msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1749,7 +1837,7 @@ msgstr ""
"ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:489
msgid ""
"This option is on by default; use <literal>--no-list-cleanup</literal> to "
"turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1767,7 +1855,7 @@ msgstr ""
"<literal>APT::Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:499
msgid ""
"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -1791,7 +1879,7 @@ msgstr ""
"también la página del manual de &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:514
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1805,7 +1893,7 @@ msgstr ""
"<literal>APT::Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml:521
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1814,7 +1902,7 @@ msgstr ""
"preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:527
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running the <literal>autoremove</"
@@ -1827,7 +1915,7 @@ msgstr ""
"Get::AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml:534
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -1847,7 +1935,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:545
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1858,7 +1946,7 @@ msgstr ""
"Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:551
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -1867,18 +1955,18 @@ msgstr ""
"arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:556
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
-"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself. "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override. Configuration Item: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
-"Ignora si los paquetes no se pueden autenticar, sin generar ningún diálogo "
-"sobre ello. Esto es útil para herramientas como pbuilder. Opción de "
-"configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:566
msgid ""
"Forbid the update command to acquire unverifiable data from configured "
"sources. Apt will fail at the update command for repositories without valid "
@@ -1887,7 +1975,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1897,13 +1985,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
-#: apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml:587 apt-cache.8.xml:352 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1313 apt_preferences.5.xml:709
msgid "Files"
msgstr "Ficheros"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
#, fuzzy
#| msgid ""
#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1919,7 +2007,7 @@ msgstr ""
"preferences;, el Cómo de APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml:604
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1956,9 +2044,9 @@ msgstr ""
"si está obsoleta."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
-#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
-#: apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml:49 apt-cache.8.xml:137 apt-cache.8.xml:161
+#: apt-cache.8.xml:183 apt-cache.8.xml:188 apt-cache.8.xml:204
+#: apt-cache.8.xml:222 apt-cache.8.xml:234
msgid "&synopsis-pkg;"
msgstr "&synopsis-pkg;"
@@ -2124,10 +2212,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:124
+#, fuzzy
+#| msgid ""
+#| "<literal>Total distinct</literal> versions is the number of package "
+#| "versions found in the cache; this value is therefore at least equal to "
+#| "the number of total package names. If more than one distribution is being "
+#| "accessed (for instance, \"stable\" and \"unstable\"), this value can be "
+#| "considerably larger than the number of total package names."
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
"instance, \"stable\" and \"unstable\"), this value can be considerably "
"larger than the number of total package names."
msgstr ""
@@ -2138,7 +2232,7 @@ msgstr ""
"considerablemente mayor que el número total de paquetes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:130
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
@@ -2147,11 +2241,17 @@ msgstr ""
"dependencia de todos los paquetes de la caché."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:138
+#, fuzzy
+#| msgid ""
+#| "<literal>showsrc</literal> displays all the source package records that "
+#| "match the given package names. All versions are shown, as well as all "
+#| "records that declare the name to be a binary package."
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."
msgstr ""
"<literal>showsrc</literal> muestra todos los campos de los paquetes fuente "
"que coinciden con los nombres de los paquetes proporcionados. Se muestran "
@@ -2159,7 +2259,7 @@ msgstr ""
"son binarios."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:147
msgid ""
"<literal>dump</literal> shows a short listing of every package in the cache. "
"It is primarily for debugging."
@@ -2168,7 +2268,7 @@ msgstr ""
"la caché. Fundamentalmente para depuración."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml:152
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2178,7 +2278,7 @@ msgstr ""
"además, la usa el método &dselect;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml:157
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
@@ -2187,7 +2287,7 @@ msgstr ""
"satisfechas en la caché de paquetes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml:162
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg --print-"
"avail</command>; it displays the package records for the named packages."
@@ -2196,12 +2296,22 @@ msgstr ""
"avail</command>, muestra los campos del paquete para los paquetes nombrados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:167
msgid "&synopsis-regex;"
msgstr "&synopsis-regex;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:168
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see &regex;. It "
+#| "searches the package names and the descriptions for an occurrence of the "
+#| "regular expression and prints out the package name and the short "
+#| "description, including virtual package names. If <option>--full</option> "
+#| "is given then output identical to <literal>show</literal> is produced for "
+#| "each matched package, and if <option>--names-only</option> is given then "
+#| "the long description is not searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see &regex;. It searches "
@@ -2210,7 +2320,7 @@ msgid ""
"including virtual package names. If <option>--full</option> is given then "
"output identical to <literal>show</literal> is produced for each matched "
"package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."
msgstr ""
"<literal>search</literal> realiza una búsqueda de la expresión regular POSIX "
"dada en todo el texto de todos los paquetes disponibles, consulte &regex;. "
@@ -2223,7 +2333,7 @@ msgstr ""
"de los paquetes, no en la descripción larga."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:179
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -2232,7 +2342,7 @@ msgstr ""
"búsqueda que se juntarán mediante una «Y lógica»."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:184
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -2241,7 +2351,7 @@ msgstr ""
"paquete y de todos los demás paquetes que la pueden satisfacer."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:189
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -2249,12 +2359,12 @@ msgstr ""
"<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:193
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:194
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -2270,7 +2380,7 @@ msgstr ""
"generate</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:199
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -2281,7 +2391,7 @@ msgstr ""
"virtuales también aparecen en la lista generada."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:205
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2302,7 +2412,7 @@ msgstr ""
"active la opción <literal>APT::Cache::GivenOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml:214
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2317,12 +2427,12 @@ msgstr ""
"líneas verdes son conflictos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:219
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:223
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2332,12 +2442,12 @@ msgstr ""
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:227
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:228
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -2350,7 +2460,7 @@ msgstr ""
"detallada acerca de la prioridad de selección del paquete nombrado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml:235
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -2369,7 +2479,7 @@ msgstr ""
"paquetes (<literal>APT::Architecture</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:251
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -2380,7 +2490,7 @@ msgstr ""
"configuración: <literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:257
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2395,7 +2505,7 @@ msgstr ""
"Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:265
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2409,7 +2519,7 @@ msgstr ""
"configuración: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:272
msgid ""
"Print only important dependencies; for use with <literal>unmet</literal> and "
"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2421,9 +2531,16 @@ msgstr ""
"Cache::Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml:286
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be tweaked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
@@ -2437,7 +2554,19 @@ msgstr ""
"<literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:294
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data. A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture. Configuration Item: <literal>APT::Cache::ShowImplicit</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:304
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -2446,7 +2575,7 @@ msgstr ""
"Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:309
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -2463,7 +2592,7 @@ msgstr ""
"configuración: <literal>APT::Cache::AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml:318
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2475,16 +2604,20 @@ msgstr ""
"Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:324
+#, fuzzy
+#| msgid ""
+#| "Only search on the package names, not the long descriptions. "
+#| "Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgid ""
-"Only search on the package names, not the long descriptions. Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
"Sólo busca en los nombres de paquetes, no en las descripciones largas. "
"Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:329
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -2495,7 +2628,7 @@ msgstr ""
"configuración: <literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -2506,7 +2639,7 @@ msgstr ""
"vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:342
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -2517,12 +2650,12 @@ msgstr ""
"Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:360
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:365
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3995,6 +4128,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:295
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true, as giving a Release file's "
+#| "validation an expiration date prevents replay attacks over a long "
+#| "timescale, and can also for example help users to identify mirrors that "
+#| "are no longer updated - but the feature depends on the correctness of the "
+#| "clock on the user system. Archive maintainers are encouraged to create "
+#| "Release files with the <literal>Valid-Until</literal> header, but if they "
+#| "don't or a stricter value is desired the <literal>Max-ValidTime</literal> "
+#| "option below can be used."
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -4003,7 +4146,9 @@ msgid ""
"user system. Archive maintainers are encouraged to create Release files with "
"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
"value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used. The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
msgstr ""
"Opción relacionada con la seguridad, cuyo valor predeterminado es «true», ya "
"que una validación con fecha de vencimiento para un fichero «Release» evita "
@@ -4015,7 +4160,16 @@ 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:308
+#: apt.conf.5.xml:310
+#, fuzzy
+#| msgid ""
+#| "Maximum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. If the Release file itself includes a "
+#| "<literal>Valid-Until</literal> header the earlier date of the two is used "
+#| "as the expiration date. The default value is <literal>0</literal> which "
+#| "stands for \"valid forever\". Archive specific settings can be made by "
+#| "appending the label of the archive to the option name."
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -4023,7 +4177,9 @@ msgid ""
"<literal>Valid-Until</literal> header the earlier date of the two is used as "
"the expiration date. The default value is <literal>0</literal> which stands "
"for \"valid forever\". Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."
msgstr ""
"El periodo (en segundos) a partir de la creación del fichero "
"«Release» (indicado en la cabecera <literal>Date</literal>) durante el cual "
@@ -4034,7 +4190,16 @@ 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:320
+#: apt.conf.5.xml:323
+#, fuzzy
+#| msgid ""
+#| "Minimum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. Use this if you need to use a seldom "
+#| "updated (local) mirror of a more frequently updated archive with a "
+#| "<literal>Valid-Until</literal> header instead of completely disabling the "
+#| "expiration date checking. Archive specific settings can and should be "
+#| "used by appending the label of the archive to the option name."
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -4042,7 +4207,9 @@ msgid ""
"(local) mirror of a more frequently updated archive with a <literal>Valid-"
"Until</literal> header instead of completely disabling the expiration date "
"checking. Archive specific settings can and should be used by appending the "
-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."
msgstr ""
"El tiempo mínimo en segundos a partir de la creación del fichero "
"<filename>Release</filename> (indicado en la cabecera <literal>Date</"
@@ -4054,7 +4221,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:332
+#: apt.conf.5.xml:336
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -4065,7 +4232,7 @@ msgstr ""
"enteros. Su valor predeterminado es «true»."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:339
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 "
@@ -4083,7 +4250,7 @@ msgstr ""
"parches."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:349
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4098,7 +4265,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:353
+#: apt.conf.5.xml:357
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -4107,7 +4274,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:358
+#: apt.conf.5.xml:362
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."
@@ -4117,7 +4284,7 @@ msgstr ""
"«true» de forma predeterminada."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:367
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]/</"
@@ -4137,7 +4304,7 @@ msgstr ""
"opciones anteriores."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:375
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 "
@@ -4156,7 +4323,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:381 apt.conf.5.xml:469
+#: apt.conf.5.xml:385 apt.conf.5.xml:473
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."
@@ -4166,7 +4333,7 @@ msgstr ""
"y a la recepción de datos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:384
+#: apt.conf.5.xml:388
#, fuzzy
#| msgid ""
#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
@@ -4195,7 +4362,7 @@ msgstr ""
"cumplir la especificación HTTP/1.1."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:395
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -4204,7 +4371,7 @@ msgstr ""
"redirección; activado por omisión."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml:398
#, fuzzy
#| msgid ""
#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
@@ -4226,7 +4393,7 @@ msgstr ""
"implícitamente la descarga simultánea desde varios servidores)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:405
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 "
@@ -4237,7 +4404,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:405
+#: apt.conf.5.xml:409
msgid ""
"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
"an external command to discover the http proxy to use. Apt expects the "
@@ -4251,7 +4418,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:427
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4268,7 +4435,7 @@ msgstr ""
"<literal>Pipeline-Depth</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:435
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4308,7 +4475,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:452
+#: apt.conf.5.xml:456
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]/</"
@@ -4341,7 +4508,7 @@ msgstr ""
"<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: apt.conf.5.xml:476
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, "
@@ -4358,7 +4525,7 @@ msgstr ""
"ejemplos)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:483
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 "
@@ -4372,7 +4539,7 @@ msgstr ""
"a su poca eficiencia."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:488
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4388,13 +4555,13 @@ msgstr ""
"compatibles con la RFC 2428."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:502
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"algo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:497
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4416,7 +4583,7 @@ msgstr ""
"especificar órdenes para desmontar mediante UMount."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:510
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4425,13 +4592,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:517
+#: apt.conf.5.xml:521
#, 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:512
+#: apt.conf.5.xml:516
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4451,19 +4618,19 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:526
#, 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:525
+#: apt.conf.5.xml:529
#, 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:518
+#: apt.conf.5.xml:522
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 "
@@ -4495,13 +4662,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:532
+#: apt.conf.5.xml:536
#, 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:527
+#: apt.conf.5.xml:531
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4526,7 +4693,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:537
+#: apt.conf.5.xml:541
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4538,7 +4705,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:544
+#: apt.conf.5.xml:548
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4552,7 +4719,7 @@ msgstr ""
"paquetes locales. El valor predeterminado es «false»."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:556
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4571,13 +4738,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:569
+#: apt.conf.5.xml:573
#, 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:557
+#: apt.conf.5.xml:561
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4616,7 +4783,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:574
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4630,24 +4797,32 @@ msgstr ""
"implícito)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:583
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:589
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:595
msgid ""
"The maximum file size of Release/Release.gpg/InRelease files. The default "
"is 10MB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:602
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to. The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:611
msgid ""
"Allow the update operation to load data files from a repository without a "
"trusted signature. If enabled this option no data files will be loaded and "
@@ -4656,7 +4831,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:622
msgid ""
"Allow that a repository that was previously gpg signed to become unsigned "
"durign a update operation. When there is no valid signature of a perviously "
@@ -4666,13 +4841,46 @@ msgid ""
"source untrusted and warn about them if you try to install them."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:634
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:636
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them. Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>. The value should be a "
+"normal URI to a text file, expect that package specific data is replaced "
+"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"if the package is from a component (e.g. <literal>main</literal>) this is "
+"the first part otherwise it is omitted, 2. the first letter of source "
+"package name, expect if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version. "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>') and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>'). The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:664
msgid "Directories"
msgstr "Directorios"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:666
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4693,7 +4901,7 @@ msgstr ""
"filename> ó <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:673
#, fuzzy
#| msgid ""
#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
@@ -4727,7 +4935,7 @@ msgstr ""
"directorio predeterminado está en <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:683
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4743,7 +4951,7 @@ msgstr ""
"<envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:689
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 "
@@ -4754,7 +4962,7 @@ msgstr ""
"Al finalizar este proceso carga el fichero de configuración principal."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:693
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4771,16 +4979,26 @@ msgstr ""
"literal> especifican la ubicación de sus respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:701
+#, fuzzy
+#| msgid ""
+#| "The configuration item <literal>RootDir</literal> has a special meaning. "
+#| "If set, all paths in <literal>Dir::</literal> will be relative to "
+#| "<literal>RootDir</literal>, <emphasis>even paths that are specified "
+#| "absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> "
+#| "is set to <filename>/tmp/staging</filename> and <literal>Dir::State::"
+#| "status</literal> is set to <filename>/var/lib/dpkg/status</filename>, "
+#| "then the status file will be looked up in <filename>/tmp/staging/var/lib/"
+#| "dpkg/status</filename>."
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>. So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>. If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."
msgstr ""
"La opción de configuración <literal>RootDir</literal> tiene un significado "
"especial. Si se define, todas las rutas de <literal>Dir::</literal> serán "
@@ -4792,7 +5010,7 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:715
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 "
@@ -4810,12 +5028,12 @@ msgstr ""
"de expresiones regulares."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:724
msgid "APT in DSelect"
msgstr "APT con DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:726
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4826,7 +5044,7 @@ msgstr ""
"encuentran en la sección <literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:731
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4848,7 +5066,7 @@ msgstr ""
"realiza esta acción antes de descargar paquetes nuevos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:745
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4857,7 +5075,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:709
+#: apt.conf.5.xml:750
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4866,7 +5084,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:714
+#: apt.conf.5.xml:755
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4876,12 +5094,12 @@ msgstr ""
"preguntará en caso de error."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:761
msgid "How APT calls &dpkg;"
msgstr "Invocación de APT a dpkg"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:762
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4890,7 +5108,7 @@ msgstr ""
"se encuentran en la sección <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:767
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 "
@@ -4901,7 +5119,7 @@ msgstr ""
"introduce a &dpkg; como un sólo argumento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:773
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 "
@@ -4914,7 +5132,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:739
+#: apt.conf.5.xml:780
#, fuzzy
#| msgid ""
#| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4938,29 +5156,51 @@ msgstr ""
"la entrada estándar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
-#, fuzzy
-#| msgid ""
-#| "Version 2 of this protocol dumps more information, including the protocol "
-#| "version, the APT configuration space and the packages, files and versions "
-#| "being changed. Version 2 is enabled by setting <literal>DPkg::Tools::"
-#| "options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command "
-#| "given to <literal>Pre-Install-Pkgs</literal>."
-msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
-msgstr ""
-"La versión 2 de este protocolo vuelca más información, incluyendo la versión "
-"del protocolo, el espacio de configuración de APT y de los paquetes, los "
-"ficheros y las versiones que cambian. La versión 2 se habilita definiendo "
-"<literal>DPkg::Tools::Options::cmd::Version</literal> con el valor 2. "
-"<literal>cmd</literal> es una orden que se pasa a <literal>Pre-Install-Pkgs</"
-"literal>."
+#: apt.conf.5.xml:787
+msgid ""
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
+msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:792
+msgid ""
+"Each configuration directive line has the form <literal>key=value</"
+"literal>. Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:800
+msgid ""
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:810
+msgid ""
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
+"\" is an incorrect typename which is just kept to remain compatible, it "
+"should be read as \"no\" and users are encouraged to support both."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:816
msgid ""
"The version of the protocol to be used for the command "
"<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4971,7 +5211,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:823
msgid ""
"The file descriptor to be used to send the information can be requested with "
"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4982,7 +5222,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:833
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4991,7 +5231,7 @@ msgstr ""
"predeterminado es <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:838
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -5001,12 +5241,12 @@ msgstr ""
"paquetes y a producir todos los binarios."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:843
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:779
+#: apt.conf.5.xml:844
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 "
@@ -5033,7 +5273,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:794
+#: apt.conf.5.xml:859
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5047,7 +5287,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:853
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 "
@@ -5071,7 +5311,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:866
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 "
@@ -5094,7 +5334,7 @@ msgstr ""
"eliminación."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:874
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -5124,7 +5364,7 @@ msgstr ""
"imposibilidad de arrancar el sistema. "
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:889
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5142,7 +5382,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:831
+#: apt.conf.5.xml:896
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -5158,7 +5398,7 @@ msgstr ""
"los disparadores necesarios para configurar este paquete."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:909
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5176,7 +5416,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:902
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 "
@@ -5201,12 +5441,12 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:922
msgid "Periodic and Archives options"
msgstr "Las opciones «Periodic» y «Archives»"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:923
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -5220,12 +5460,12 @@ msgstr ""
"documentación de estas opciones."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:931
msgid "Debug options"
msgstr "Opciones de depuración"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:933
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5242,7 +5482,7 @@ msgstr ""
"para un usuario normal, aunque unas cuantas sí son:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:944
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5253,7 +5493,7 @@ msgstr ""
"purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:952
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5264,7 +5504,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:896
+#: apt.conf.5.xml:961
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5276,7 +5516,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:904
+#: apt.conf.5.xml:969
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -5285,14 +5525,14 @@ msgstr ""
"statfs en los identificadores de los discos ópticos."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:914
+#: apt.conf.5.xml:979
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:923
+#: apt.conf.5.xml:988
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -5300,26 +5540,26 @@ msgstr ""
"<literal>cdrom://</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:999
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:945
+#: apt.conf.5.xml:1010
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:956
+#: apt.conf.5.xml:1021
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:967
+#: apt.conf.5.xml:1032
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -5328,7 +5568,7 @@ msgstr ""
"criptográficas mediante <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:978
+#: apt.conf.5.xml:1043
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -5337,14 +5577,14 @@ msgstr ""
"paquetes almacenadas en CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:988
+#: apt.conf.5.xml:1053
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:998
+#: apt.conf.5.xml:1063
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -5353,7 +5593,7 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1008
+#: apt.conf.5.xml:1073
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 "
@@ -5364,7 +5604,7 @@ msgstr ""
"identificador de un CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1084
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."
@@ -5374,14 +5614,14 @@ msgstr ""
"a la vez."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1031
+#: apt.conf.5.xml:1096
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:1041
+#: apt.conf.5.xml:1106
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -5391,7 +5631,7 @@ msgstr ""
"ficheros descargados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1116
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -5400,7 +5640,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:1063
+#: apt.conf.5.xml:1128
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -5410,7 +5650,7 @@ msgstr ""
"índices completos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1074
+#: apt.conf.5.xml:1139
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -5418,7 +5658,7 @@ msgstr ""
"descargas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1085
+#: apt.conf.5.xml:1150
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5427,7 +5667,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:1095
+#: apt.conf.5.xml:1160
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5443,7 +5683,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml:1174
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5474,7 +5714,7 @@ msgstr ""
"la sección en la que aparece el paquete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1130
+#: apt.conf.5.xml:1195
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5483,7 +5723,7 @@ msgstr ""
"invocó, con los argumentos separados por un espacio."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1141
+#: apt.conf.5.xml:1206
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5492,7 +5732,7 @@ msgstr ""
"estado y cualquier error encontrado durante el análisis."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1152
+#: apt.conf.5.xml:1217
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5501,7 +5741,7 @@ msgstr ""
"literal> debería entregar los paquetes a &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1164
+#: apt.conf.5.xml:1229
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5509,12 +5749,12 @@ msgstr ""
"&dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1240
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:1185
+#: apt.conf.5.xml:1250
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5523,7 +5763,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:1196
+#: apt.conf.5.xml:1261
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 "
@@ -5534,7 +5774,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:1208
+#: apt.conf.5.xml:1273
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5543,7 +5783,7 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml:1283
msgid ""
"Display the external commands that are called by apt hooks. This includes e."
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5551,13 +5791,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt.conf.5.xml:1307 apt_preferences.5.xml:556 sources.list.5.xml:358
#: apt-ftparchive.1.xml:592
msgid "Examples"
msgstr "Ejemplos"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml:1308
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5567,7 +5807,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml:1320
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5769,11 +6009,12 @@ msgstr "prioridad 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:118
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that do not belong to the target release."
msgstr ""
-"a las versiones que ni están instaladas ni pertenecen a la distribución "
+"a las versiones que no están instaladas y que pertenecen a la distribución "
"objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -5783,14 +6024,23 @@ msgstr "prioridad 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:123
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
msgstr ""
"a las versiones que no están instaladas y que pertenecen a la distribución "
"objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:127
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:131
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5807,7 +6057,7 @@ msgstr ""
"la opción «ButAutomaticUpgrades: yes»."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml:138
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -5816,7 +6066,7 @@ msgstr ""
"determinar qué versión del paquete debe instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml:141
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5833,12 +6083,12 @@ msgstr ""
"ser peligroso)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid "Install the highest priority version."
msgstr "Instala la versión de mayor prioridad."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:148
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -5847,7 +6097,7 @@ msgstr ""
"(esto es, la que tiene un número de versión mayor)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml:151
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5858,7 +6108,7 @@ msgstr ""
"<literal>--reinstall</literal>, se instalará la que no está instalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:157
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5873,7 +6123,7 @@ msgstr ""
"command> o <command>apt-get upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:164
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5887,7 +6137,7 @@ msgstr ""
"upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5906,12 +6156,12 @@ msgstr ""
"versión instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:178
msgid "The Effect of APT Preferences"
msgstr "El efecto de las preferencias sobre APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:180
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5924,7 +6174,7 @@ msgstr ""
"registros pueden tener una de estos dos formatos: el específico o el general."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:186
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages with a specified version or version range. For example, "
@@ -5941,7 +6191,7 @@ msgstr ""
"paquetes separados por espacios."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5953,7 +6203,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:199
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5968,7 +6218,7 @@ msgstr ""
"identificado por su nombre de dominio."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:205
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5979,7 +6229,7 @@ msgstr ""
"prioridad alta a todas las versiones disponibles desde un sitio local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:210
#, no-wrap
msgid ""
"Package: *\n"
@@ -5991,7 +6241,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml:215
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
"which can be used to match a hostname. The following record will assign a "
@@ -6005,7 +6255,7 @@ msgstr ""
"debian.org»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:219
#, no-wrap
msgid ""
"Package: *\n"
@@ -6017,7 +6267,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:223
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -6032,7 +6282,7 @@ msgstr ""
"sino el autor o el nombre del proveedor, tales como «Debian» o «Ximian»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml:228
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -6043,7 +6293,7 @@ msgstr ""
"archivo de paquetes «<literal>unstable</literal>» (inestable)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:232
#, no-wrap
msgid ""
"Package: *\n"
@@ -6055,7 +6305,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:237
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -6066,7 +6316,7 @@ msgstr ""
"«<literal>&testing-codename;</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
#, no-wrap
msgid ""
"Package: *\n"
@@ -6078,7 +6328,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6090,7 +6340,7 @@ msgstr ""
"«<literal>&stable-version;</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, no-wrap
msgid ""
"Package: *\n"
@@ -6101,13 +6351,22 @@ msgstr ""
"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:258
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:266
msgid "Regular expressions and &glob; syntax"
msgstr "Expresiones regulares y sintaxis &glob;"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:268
msgid ""
"APT also supports pinning by &glob; expressions, and regular expressions "
"surrounded by slashes. For example, the following example assigns the "
@@ -6122,7 +6381,7 @@ msgstr ""
"«kde» (como expresión regular extendida POSIX delimitada por barras)."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
@@ -6134,7 +6393,7 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6145,7 +6404,7 @@ msgstr ""
"paquetes provenientes de una publicación a partir de &ubuntu-codename;."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
#, no-wrap
msgid ""
"Package: *\n"
@@ -6157,7 +6416,7 @@ msgstr ""
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
@@ -6175,12 +6434,12 @@ msgstr ""
"literal>» en un campo «Package» no se considera una expresión &glob;."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid "How APT Interprets Priorities"
msgstr "Interpretación de APT de las prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:314
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking):"
@@ -6190,12 +6449,12 @@ msgstr ""
"siguiente modo:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:319
msgid "P &gt;= 1000"
msgstr "P &gt;= 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -6204,12 +6463,12 @@ msgstr ""
"el sistema."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml:324
msgid "990 &lt;= P &lt; 1000"
msgstr "990 &lt;= P &lt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -6218,12 +6477,12 @@ msgstr ""
"que la versión instalada sea más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:330
msgid "500 &lt;= P &lt; 990"
msgstr "500 &lt;= P &lt; 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:331
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -6233,12 +6492,12 @@ msgstr ""
"más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "100 &lt;= P &lt; 500"
msgstr "100 &lt;= P &lt; 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:337
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -6247,12 +6506,12 @@ msgstr ""
"perteneciente a otra distribución, o si la versión instalada es más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:342
msgid "0 &lt; P &lt; 100"
msgstr "0 &lt; P &lt; 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:343
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -6260,22 +6519,40 @@ msgstr ""
"La versión sólo se instala si no hay ninguna versión del paquete instalada."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:347
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:348
msgid "prevents the version from being installed"
msgstr "Evita la instalación de la versión."
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:351
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:352
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
-msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version. Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+#: apt_preferences.5.xml:358
+#, fuzzy
+#| msgid ""
+#| "If any specific-form records match an available package version then the "
+#| "first such record determines the priority of the package version. "
+#| "Failing that, if any general-form records match an available package "
+#| "version then the first such record determines the priority of the package "
+#| "version."
+msgid ""
+"The first specific-form record matching an available package version "
+"determines the priority of the package version. Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version. Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
msgstr ""
"Si cualquier registro con formato específico coincide con una versión "
"disponible de un paquete, el registro determina la prioridad de la versión "
@@ -6284,7 +6561,7 @@ msgstr ""
"versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:366
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -6293,7 +6570,7 @@ msgstr ""
"registros antes mencionados:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:370
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6321,12 +6598,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:383
msgid "Then:"
msgstr "Por ello:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6341,7 +6618,7 @@ msgstr ""
"perl;*, se instalará una versión anterior de <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:390
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6352,7 +6629,7 @@ msgstr ""
"versiones, incluso sobre los pertenecientes a la distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:394
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6365,12 +6642,12 @@ msgstr ""
"hay ninguna versión del paquete ya instalado."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml:404
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinar la versión del paquete y las propiedades de la distribución"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:406
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6381,7 +6658,7 @@ msgstr ""
"describen los paquetes disponibles en cada uno de los sitios."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:410
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6401,27 +6678,27 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:418
msgid "the <literal>Package:</literal> line"
msgstr "La línea <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml:419
msgid "gives the package name"
msgstr "indica el nombre del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml:422 apt_preferences.5.xml:472
msgid "the <literal>Version:</literal> line"
msgstr "La línea <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:423
msgid "gives the version number for the named package"
msgstr "indica el número de versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:428
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6442,12 +6719,12 @@ msgstr ""
"son relevantes para las prioridades de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:439
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:440
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6465,18 +6742,18 @@ msgstr ""
"línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:450
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:456
msgid "the <literal>Codename:</literal> line"
msgstr "La línea <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml:457
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6495,13 +6772,13 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:466
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:473
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian release version &stable-version;. Note that there is "
@@ -6518,7 +6795,7 @@ msgstr ""
"siguientes línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
#, no-wrap
msgid ""
"Pin: release v=&stable-version;\n"
@@ -6530,12 +6807,12 @@ msgstr ""
"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:491
msgid "the <literal>Component:</literal> line"
msgstr "La línea <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml:492
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6554,18 +6831,18 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:507
msgid "the <literal>Origin:</literal> line"
msgstr "La línea <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:508
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6578,18 +6855,18 @@ msgstr ""
"mediante la siguiente línea:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:514
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:520
msgid "the <literal>Label:</literal> line"
msgstr "La línea <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:521
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6602,13 +6879,13 @@ msgstr ""
"siguiente línea:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:527
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:534
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6633,12 +6910,12 @@ msgstr ""
"la distribución «<literal>unstable</literal>» (inestable)."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml:547
msgid "Optional Lines in an APT Preferences Record"
msgstr "Líneas opcionales en el registro de preferencias de APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:549
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6649,12 +6926,12 @@ msgstr ""
"Útil para comentarios."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:558
msgid "Tracking Stable"
msgstr "Seguir la distribución «stable» (estable)"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:566
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6678,7 +6955,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:560
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6693,8 +6970,8 @@ msgstr ""
"<literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
-#: apt_preferences.5.xml:672
+#: apt_preferences.5.xml:583 apt_preferences.5.xml:629
+#: apt_preferences.5.xml:687
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6706,7 +6983,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml:578
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6720,13 +6997,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:595
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:589
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6739,12 +7016,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:601
msgid "Tracking Testing or Unstable"
msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Package: *\n"
@@ -6772,7 +7049,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:603
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6789,7 +7066,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:624
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6802,13 +7079,13 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:644
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:635
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6827,12 +7104,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml:651
msgid "Tracking the evolution of a codename release"
msgstr "Seguir la evolución de una publicación por el nombre"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml:665
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6866,7 +7143,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:653
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6893,7 +7170,7 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml:682
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6907,13 +7184,13 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml:702
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:693
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6932,7 +7209,7 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml:717
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6943,13 +7220,24 @@ msgstr "Lista de fuentes de datos de APT configurados"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+#, fuzzy
+#| msgid ""
+#| "The source list <filename>/etc/apt/sources.list</filename> is designed to "
+#| "support any number of active sources and a variety of source media. The "
+#| "file lists one source per line, with the most preferred source listed "
+#| "first. The information available from the configured sources is acquired "
+#| "by <command>apt-get update</command> (or by an equivalent command from "
+#| "another APT front-end)."
+msgid ""
+"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
msgstr ""
"La lista de fuentes <filename>/etc/apt/sources.list</filename> se ha "
"diseñado para permitir cualquier número de fuentes activas así como "
@@ -6958,37 +7246,35 @@ msgstr ""
"las fuentes configuradas se obtiene mediante <command>apt-get update</"
"command> (o una orden equivalente de una interfaz de APT)."
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
-msgid ""
-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
-"literal>) followed by options and arguments for this type. Individual "
-"entries cannot be continued onto a following line. Empty lines are ignored, "
-"and a <literal>#</literal> character anywhere on a line marks the remainder "
-"of that line as a comment."
-msgstr ""
-"Cada línea que define una fuente empieza con el tipo (por ejemplo, "
-"<literal>«deb-src</literal>») seguido de las opciones y argumentos para este "
-"tipo. Una entrada individual no puede continuar en la siguiente línea. Las "
-"líneas vacías se ignoran, y un carácter «<literal>#</literal>» presente en "
-"cualquier lugar de la línea marca los caracteres restantes como comentario."
-
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml:45
msgid "sources.list.d"
msgstr "sources.list.d"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:46
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files. The format is the same as "
+#| "for the regular <filename>sources.list</filename> file. File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters. Otherwise APT will print a notice that it has ignored a "
+#| "file, unless that file matches a pattern in the <literal>Dir::Ignore-"
+#| "Files-Silently</literal> configuration list - in which case it will be "
+#| "silently ignored."
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files. The format is the same as for "
-"the regular <filename>sources.list</filename> file. File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"add sources.list entries in separate files. Two different file formats are "
+"allowed as described in the next two sections. Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format. The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters. Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."
msgstr ""
"El directorio <filename>/etc/apt/sources.list.d</filename> ofrece una manera "
"de añadir entradas de «sources.list» en ficheros separados. El formato es "
@@ -7001,16 +7287,106 @@ msgstr ""
"silenciosamente."
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml:58
+msgid "one line style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:60
+msgid ""
+"Files in this format have the extension <filename>.list</filename>. Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"
+"literal>) followed by options and arguments for this type. Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line. If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>) included in the line after the type separated from "
+"it with a space. If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by a equal sign (<literal>=</literal>). "
+"Multivalue options have also <literal>-=</literal> and <literal>+=</literal> "
+"as separator which instead of replacing the default with the given value(s) "
+"modify the default value(s) to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:79
+msgid ""
+"This is the traditional format and supported by all apt versions. Note that "
+"not all options as described below are supported by all apt versions. Note "
+"also that some older applications parsing this format on its own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:87
+msgid "deb822 style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:89
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>. The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, like the metadata itself apt will download from the configured "
+"sources or the <filename>debian/control</filename> file in a Debian source "
+"package. Individual entries are separated by an empty line, additional "
+"empty lines are ignored, and a <literal>#</literal> character at the start "
+"of the line marks the entire line as a comment. An entry can hence be "
+"disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it. Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s). Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:108
+msgid ""
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier. It "
+"is intended to make this format gradually the default format and deprecating "
+"the previously described one line style format as it is easier to create, "
+"extend and modify by humans and machines alike especially if a lot of "
+"sources and/or options are involved. Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but could encounter problems with software not "
+"supporting the format yet."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:123
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: General Format"
msgstr "Los tipos «deb» y «deb-src»"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml:124
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type references a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. The "
+#| "<literal>distribution</literal> is generally an archive name like "
+#| "<literal>stable</literal> or <literal>testing</literal> or a codename "
+#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</"
+#| "literal> while component is one of <literal>main</literal>, "
+#| "<literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "<literal>deb-src</literal> type references a Debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type references a typical two-level Debian "
"archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
"<literal>stable</literal> or <literal>testing</literal> or a codename like "
"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
"literal> while component is one of <literal>main</literal>, "
@@ -7032,53 +7408,48 @@ msgstr ""
"literal> para obtener los índices de fuentes."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:135
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one line style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
msgstr ""
"El formato para una entrada en el fichero <filename>sources.list</filename> "
"usando los tipos <literal>deb</literal> y <literal>deb-src</literal> es:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
-#, fuzzy, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ opciones ] uri distribución [componente1] [componente2] [...]"
+#: sources.list.5.xml:138
+#, no-wrap
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
+msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:143
#, no-wrap
msgid ""
" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
+" URIs: uri\n"
+" Suites: suite\n"
+" Components: [component1] [component2] [...]\n"
+" option1: value1\n"
+" option2: value2\n"
" "
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:141
msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml:152
#, fuzzy
#| msgid ""
#| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -7095,8 +7466,8 @@ msgid ""
"<literal>suite</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>suite</literal> must end with a "
"slash (<literal>/</literal>). This is useful for the case when only a "
-"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest. "
+"If <literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"El URI para el tipo <literal>deb</literal> debe especificar la base de la "
@@ -7109,7 +7480,7 @@ msgstr ""
"<literal>distribución</literal> no define una ruta exacta."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml:161
#, fuzzy
#| msgid ""
#| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -7138,7 +7509,7 @@ msgstr ""
"sistema."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
+#: sources.list.5.xml:169
#, fuzzy
#| msgid ""
#| "Since only one distribution can be specified per line it may be necessary "
@@ -7153,17 +7524,16 @@ msgstr ""
#| "also parallelizes connections to different hosts to more effectively deal "
#| "with sites with low bandwidth."
msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+"Especially in the one line style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "
"location is desired. APT will sort the URI list after it has generated a "
"complete set internally, and will collapse multiple references to the same "
"Internet host, for instance, into a single connection, so that it does not "
-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
msgstr ""
"Debido a que sólo se puede especificar una distribución por línea, es "
"posible que se precisen varias líneas para la misma URI si desea tener "
@@ -7178,39 +7548,61 @@ msgstr ""
"aprovechar mejor el ancho de banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
-msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>. Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
-msgstr ""
-"<literal>options</literal> siempre es opcional, y debe estar delimitado por "
-"corchetes. Puede consistir de varias opciones con la forma "
-"<literal><replaceable>opción</replaceable>=<replaceable>valor</replaceable></"
-"literal>. Varias opciones se separan con espacios. APT permite las "
-"siguientes opciones (tenga en cuenta que las opciones no permitidas se "
-"ignoran silenciosamente):"
+#: sources.list.5.xml:181
+msgid ""
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+"Es importante listar las fuentes por orden de preferencia, con la fuente "
+"preferente al inicio. Lo normal es ordenar las fuentes por velocidad, de la "
+"más rápida a la más lenta (CD-ROM seguido de servidores en la red local, "
+"seguidos por servidores de Internet distantes, por ejemplo)."
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:188
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:190
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:186
msgid ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
+"As an example, the sources for your distribution could look like this in one "
+"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:193
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: Options"
+msgstr "Los tipos «deb» y «deb-src»"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:194
+msgid ""
+"Each source entry can have options specified modifying which and how the "
+"source is accessed and data acquired from it. Format, syntax and names of "
+"the options varies between the two formats one line and deb822 style as "
+"described, but they have both the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one line name in brackets. "
+"Remember that beside setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
msgstr ""
-"<literal>arch=<replaceable>arquitecura1</replaceable>,"
-"<replaceable>arquitecura2</replaceable>,…</literal> se puede utilizar para "
-"definir la arquitectura para la que se descarga información sobre "
-"arquitecturas. Si no se define esta opción, se descargarán todas las "
-"arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:205
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -7219,10 +7611,10 @@ msgstr ""
#| "architectures defined by the <literal>APT::Architectures</literal> option "
#| "will be downloaded."
msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
msgstr ""
"<literal>arch=<replaceable>arquitecura1</replaceable>,"
"<replaceable>arquitecura2</replaceable>,…</literal> se puede utilizar para "
@@ -7231,65 +7623,93 @@ msgstr ""
"arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:212
msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
-msgstr ""
-"<literal>trusted=yes</literal> se puede definir para indicar que los "
-"paquetes que proviene de esta fuente siempre están autenticados incluso si "
-"el fichero <filename>Release</filename> no está firmado, o si no se puede "
-"comprobar la firma. Esto desactiva partes de &apt-secure; y por ello solo se "
-"debe utilizar en un contexto local y de confianza. <literal>trusted=no</"
-"literal> ofrece lo opuesto, ya que supone que las fuentes correctamente "
-"autenticadas no lo están."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information like translated package "
+"descriptions should be downloaded. If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
+msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:220
msgid ""
-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope."
msgstr ""
-"Es importante listar las fuentes por orden de preferencia, con la fuente "
-"preferente al inicio. Lo normal es ordenar las fuentes por velocidad, de la "
-"más rápida a la más lenta (CD-ROM seguido de servidores en la red local, "
-"seguidos por servidores de Internet distantes, por ejemplo)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-msgid "Some examples:"
-msgstr "Algunos ejemplos:"
+#: sources.list.5.xml:228
+msgid ""
+"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
+msgstr ""
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:235
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"<option>Signed-By</option> (<option>signed-by</option>) is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key in either the <filename>trusted.gpg</"
+"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set only the key(s) in this keyring or only the key with this "
+"fingerprint is used for the &apt-secure; verification of this repository. "
+"Otherwise all keys in the trusted keyrings are considered valid signers for "
+"this repository."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:249
+msgid ""
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare until then the data provided in the "
+"repository should be considered valid and if this time is reached, but no "
+"new data is provided the data is considered expired and an error is raised. "
+"Beside increasing security as a malicious attacker can't sent old data "
+"forever denying a user to be able to upgrade to a new version, this also "
+"helps users identify mirrors which are no longer updated. Some repositories "
+"like historic archives aren't updated anymore by design through, so this "
+"check can be disabled by setting this option to <literal>no</literal>. "
+"Defaults to the value of configuration option <option>Acquire::Check-Valid-"
+"Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:266
+msgid ""
+"<option>Valid-Until-Min</option> (<option>check-valid-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldomly updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely. Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:288
msgid "URI specification"
msgstr "Especificación del URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml:290
msgid "The currently recognized URI types are:"
msgstr "Los tipos de URI permitidos actualmente son:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:294
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7300,7 +7720,7 @@ msgstr ""
"particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml:301
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7310,7 +7730,7 @@ msgstr ""
"list»."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:308
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7328,7 +7748,7 @@ msgstr ""
"autenticación no es seguro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:319
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7349,7 +7769,7 @@ msgstr ""
"fichero de configuración."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:331
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -7362,7 +7782,7 @@ msgstr ""
"permite realizar la copia de ficheros con APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:338
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7376,12 +7796,12 @@ msgstr ""
"transferencia de ficheros desde la máquina remota."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:345
msgid "adding more recognizable URI types"
msgstr "Añadir más tipos de URI reconocidos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:347
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7400,45 +7820,85 @@ msgstr ""
"debtorrent, consulte &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian "
+#| "for stable/main, stable/contrib, and stable/non-free."
msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
"Utiliza el archivo local (o montado mediante NFS) en «/home/jason/debian» "
"para «stable/main», «stable/contrib», y «stable/non-free»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
-#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+#: sources.list.5.xml:361
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr "deb file:/home/jason/debian stable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:362
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:367
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como arriba, excepto que usa la distribución «unstable» (en desarrollo)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
-#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:368
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:369
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:374
msgid "Source line for the above"
msgstr "Línea para obtener el código fuente desde la ubicación anterior."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
-#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:375
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:376
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:382
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7449,17 +7909,41 @@ msgstr ""
"obtiene <literal>amd64</literal> y <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
-#, no-wrap
+#: sources.list.5.xml:384
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgid ""
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:386
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml:398
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7468,13 +7952,24 @@ msgstr ""
"usa sólo la sección «hamm/main»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:400
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "deb http://archive.debian.org/debian-archive hamm main"
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr "deb http://archive.debian.org/debian-archive hamm main"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml:406
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7483,13 +7978,24 @@ msgstr ""
"del directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:408
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:409
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:414
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7502,19 +8008,49 @@ msgstr ""
"filename>, se usará sólo una sesión FTP para ambas."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:418
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:419
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml:431
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:432
+#, fuzzy, no-wrap
+#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:424
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
+#| "directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</"
+#| "filename> on amd64, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; "
+#| "official debian archives are not structured like this] <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7522,7 +8058,7 @@ msgid ""
"amd64, and so forth for other supported architectures. [Note this example "
"only illustrates how to use the substitution variable; official debian "
"archives are not structured like this] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
msgstr ""
"Utiliza HTTP para acceder al archivo en «ftp.tlh.debian.org», bajo el "
"directorio «universe», y sólo usa ficheros que se encuentren bajo "
@@ -7533,8 +8069,39 @@ msgstr ""
"tiene esta estructura.) <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml:437
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:439
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:445
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:454
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;, &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
#. type: Content of: <refentry><refmeta><manvolnum>
@@ -10215,6 +10782,151 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
msgid "Which will use the already fetched archives on the disc."
msgstr "Esto utiliza los archivos del disco previamente obtenidos."
+#~ msgid ""
+#~ "No action; perform a simulation of events that would occur but do not "
+#~ "actually change the system. Configuration Item: <literal>APT::Get::"
+#~ "Simulate</literal>."
+#~ msgstr ""
+#~ "No realiza ninguna acción, simula lo que hubiese ocurrido pero sin hacer "
+#~ "cambios reales en el sistema. Opción de configuración: <literal>APT::Get::"
+#~ "Simulate</literal>."
+
+#~ msgid ""
+#~ "Simulated runs performed as a user will automatically deactivate locking "
+#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
+#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
+#~ "notice will also be displayed indicating that this is only a simulation. "
+#~ "Runs performed as root do not trigger either NoLocking or the notice - "
+#~ "superusers should know what they are doing without further warnings from "
+#~ "<literal>apt-get</literal>."
+#~ msgstr ""
+#~ "Las simulaciones de ejecución realizadas por un usuario desactivan el "
+#~ "bloqueo de forma automática (<literal>Debug::NoLocking</literal>), y si "
+#~ "se define la opción <literal>APT::Get::Show-User-Simulation-Note</"
+#~ "literal> (activa de forma predefinida) se muestra un aviso que indica que "
+#~ "solo es una simulación. Las ejecuciones realizadas como usuario «root» no "
+#~ "activan «NoLocking» o el aviso. Los administradores deben ser conscientes "
+#~ "de sus acciones sin avisos de <literal>apt-get</literal>."
+
+#~ msgid ""
+#~ "Ignore if packages can't be authenticated and don't prompt about it. "
+#~ "This is useful for tools like pbuilder. Configuration Item: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+#~ msgstr ""
+#~ "Ignora si los paquetes no se pueden autenticar, sin generar ningún "
+#~ "diálogo sobre ello. Esto es útil para herramientas como pbuilder. Opción "
+#~ "de configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
+
+#, fuzzy
+#~| msgid ""
+#~| "Version 2 of this protocol dumps more information, including the "
+#~| "protocol version, the APT configuration space and the packages, files "
+#~| "and versions being changed. Version 2 is enabled by setting "
+#~| "<literal>DPkg::Tools::options::cmd::Version</literal> to 2. "
+#~| "<literal>cmd</literal> is a command given to <literal>Pre-Install-Pkgs</"
+#~| "literal>."
+#~ msgid ""
+#~ "Version 2 of this protocol dumps more information, including the protocol "
+#~ "version, the APT configuration space and the packages, files and versions "
+#~ "being changed. Version 3 adds the architecture and <literal>MultiArch</"
+#~ "literal> flag to each version being dumped."
+#~ msgstr ""
+#~ "La versión 2 de este protocolo vuelca más información, incluyendo la "
+#~ "versión del protocolo, el espacio de configuración de APT y de los "
+#~ "paquetes, los ficheros y las versiones que cambian. La versión 2 se "
+#~ "habilita definiendo <literal>DPkg::Tools::Options::cmd::Version</literal> "
+#~ "con el valor 2. <literal>cmd</literal> es una orden que se pasa a "
+#~ "<literal>Pre-Install-Pkgs</literal>."
+
+#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr ""
+#~ "a las versiones que ni están instaladas ni pertenecen a la distribución "
+#~ "objetivo."
+
+#~ msgid ""
+#~ "Each line specifying a source starts with type (e.g. <literal>deb-src</"
+#~ "literal>) followed by options and arguments for this type. Individual "
+#~ "entries cannot be continued onto a following line. Empty lines are "
+#~ "ignored, and a <literal>#</literal> character anywhere on a line marks "
+#~ "the remainder of that line as a comment."
+#~ msgstr ""
+#~ "Cada línea que define una fuente empieza con el tipo (por ejemplo, "
+#~ "<literal>«deb-src</literal>») seguido de las opciones y argumentos para "
+#~ "este tipo. Una entrada individual no puede continuar en la siguiente "
+#~ "línea. Las líneas vacías se ignoran, y un carácter «<literal>#</literal>» "
+#~ "presente en cualquier lugar de la línea marca los caracteres restantes "
+#~ "como comentario."
+
+#, fuzzy
+#~| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#~ msgid "deb [ options ] uri suite [component1] [component2] [...]"
+#~ msgstr "deb [ opciones ] uri distribución [componente1] [componente2] [...]"
+
+#~ msgid ""
+#~ "<literal>options</literal> is always optional and needs to be surrounded "
+#~ "by square brackets. It can consist of multiple settings in the form "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>. Multiple settings are separated by spaces. The "
+#~ "following settings are supported by APT (note however that unsupported "
+#~ "settings will be ignored silently):"
+#~ msgstr ""
+#~ "<literal>options</literal> siempre es opcional, y debe estar delimitado "
+#~ "por corchetes. Puede consistir de varias opciones con la forma "
+#~ "<literal><replaceable>opción</replaceable>=<replaceable>valor</"
+#~ "replaceable></literal>. Varias opciones se separan con espacios. APT "
+#~ "permite las siguientes opciones (tenga en cuenta que las opciones no "
+#~ "permitidas se ignoran silenciosamente):"
+
+#, fuzzy
+#~| msgid ""
+#~| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~| "replaceable>,…</literal> can be used to specify for which architectures "
+#~| "information should be downloaded. If this option is not set all "
+#~| "architectures defined by the <literal>APT::Architectures</literal> "
+#~| "option will be downloaded."
+#~ msgid ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> which can be "
+#~ "used to add/remove architectures from the set which will be downloaded."
+#~ msgstr ""
+#~ "<literal>arch=<replaceable>arquitecura1</replaceable>,"
+#~ "<replaceable>arquitecura2</replaceable>,…</literal> se puede utilizar "
+#~ "para definir la arquitectura para la que se descarga información sobre "
+#~ "arquitecturas. Si no se define esta opción, se descargarán todas las "
+#~ "arquitecturas definidas por la opción <literal>APT::Architectures</"
+#~ "literal>."
+
+#~ msgid ""
+#~ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+#~ "this source are always authenticated even if the <filename>Release</"
+#~ "filename> file is not signed or the signature can't be checked. This "
+#~ "disables parts of &apt-secure; and should therefore only be used in a "
+#~ "local and trusted context. <literal>trusted=no</literal> is the opposite "
+#~ "which handles even correctly authenticated sources as not authenticated."
+#~ msgstr ""
+#~ "<literal>trusted=yes</literal> se puede definir para indicar que los "
+#~ "paquetes que proviene de esta fuente siempre están autenticados incluso "
+#~ "si el fichero <filename>Release</filename> no está firmado, o si no se "
+#~ "puede comprobar la firma. Esto desactiva partes de &apt-secure; y por "
+#~ "ello solo se debe utilizar en un contexto local y de confianza. "
+#~ "<literal>trusted=no</literal> ofrece lo opuesto, ya que supone que las "
+#~ "fuentes correctamente autenticadas no lo están."
+
+#~ msgid "Some examples:"
+#~ msgstr "Algunos ejemplos:"
+
+#~ msgid ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+#~ msgstr ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+
#~ msgid "apt"
#~ msgstr "apt"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index d1e60a655..801797b21 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-03-09 02:17+0100\n"
+"POT-Creation-Date: 2015-08-21 06:12-0400\n"
"PO-Revision-Date: 2014-11-15 17:26+0100\n"
"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -612,17 +612,15 @@ msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
#. type: Content of: <refentry><refmeta><manvolnum>
#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
-#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
-#: apt-config.8.xml:22
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21 apt-config.8.xml:22
msgid "8"
msgstr "8"
#. type: Content of: <refentry><refmeta><refmiscinfo>
#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
-#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
-#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
-#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
-#: apt-ftparchive.1.xml:23
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22 apt-config.8.xml:23
+#: apt.conf.5.xml:28 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23 apt-ftparchive.1.xml:23
msgid "APT"
msgstr "APT"
@@ -633,10 +631,9 @@ msgstr "interface en ligne de commande"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
-#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
-#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
-#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
-#: apt-ftparchive.1.xml:34
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33 apt-config.8.xml:34
+#: apt.conf.5.xml:37 apt_preferences.5.xml:32 sources.list.5.xml:32
+#: apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34 apt-ftparchive.1.xml:34
msgid "Description"
msgstr "Description"
@@ -658,8 +655,8 @@ msgstr ""
msgid ""
"<literal>list</literal> is used to display a list of packages. It supports "
"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option> are supported."
+"<option>--installed</option>, <option>--upgradable</option>, <option>--"
+"upgradeable</option>, <option>--all-versions</option> are supported."
msgstr ""
"La commande <literal>list</literal> est utilisée pour afficher une liste de "
"paquets. Il gère les motifs du shell pour chercher les noms de paquets, "
@@ -667,7 +664,7 @@ msgstr ""
"upgradable</option>, <option>--all-versions</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml:55
msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
@@ -676,7 +673,7 @@ msgstr ""
"affiche les paquets correspondants."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml:61
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
@@ -685,7 +682,7 @@ msgstr ""
"paquet(s) donné(s)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml:68
msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
@@ -694,7 +691,7 @@ msgstr ""
"paquets dont l'installation ou la mise à jour est souhaitée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml:72 apt-get.8.xml:112
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -711,7 +708,7 @@ msgstr ""
"unstable)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml:82 apt-get.8.xml:147
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note that removing a package "
@@ -726,8 +723,29 @@ msgstr ""
"(sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu "
"d'être supprimé."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "alias since 1.1)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:90 apt-get.8.xml:228
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
+"installés dans le but de satisfaire les dépendances d'autres paquets et qui "
+"ne sont plus nécessaires."
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml:95
msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
@@ -736,7 +754,7 @@ msgstr ""
"sources.list et fournit des vérifications de sécurité de base."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml:101
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
@@ -745,7 +763,7 @@ msgstr ""
"d'index répertoriant les paquets disponibles et sa source."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml:107
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -759,7 +777,7 @@ msgstr ""
"jamais supprimés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml:116
msgid ""
"<literal>full-upgrade</literal> performs the function of upgrade but may "
"also remove installed packages if that is required in order to resolve a "
@@ -770,19 +788,19 @@ msgstr ""
"nécessaire pour résoudre un conflit entre des paquets."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt.8.xml:126 apt-get.8.xml:262 apt-cache.8.xml:246 apt-mark.8.xml:104
#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
#: apt-ftparchive.1.xml:500
msgid "options"
msgstr "options"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
+#: apt.8.xml:136
msgid "Script usage"
msgstr "Utilisation de scripts"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml:138
msgid ""
"The &apt; commandline is designed as a end-user tool and it may change the "
"output between versions. While it tries to not break backward compatibility "
@@ -798,12 +816,12 @@ msgstr ""
"commandes dans vos scripts."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
+#: apt.8.xml:146
msgid "Differences to &apt-get;"
msgstr "Différences avec &apt-get;"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
+#: apt.8.xml:147
msgid ""
"The <command>apt</command> command is meant to be pleasant for end users and "
"does not need to be backward compatible like &apt-get;. Therefore some "
@@ -814,17 +832,17 @@ msgstr ""
"conséquent, certaines options sont différentes :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
+#: apt.8.xml:153
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
msgstr "L'option <literal>DPkg::Progress-Fancy</literal> est activée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:157
msgid "The option <literal>APT::Color</literal> is enabled."
msgstr "L'option <literal>APT::Color</literal> est activée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:161
msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
@@ -833,7 +851,7 @@ msgstr ""
"commande <literal>dpkg --list</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml:166
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
"enabled by default."
@@ -842,16 +860,16 @@ msgstr ""
"literal> activée par défaut."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt.8.xml:176 apt-get.8.xml:597 apt-cache.8.xml:359 apt-key.8.xml:191
#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
-#: apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701
-#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-config.8.xml:105 apt.conf.5.xml:1319 apt_preferences.5.xml:716
+#: sources.list.5.xml:453 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
#: apt-ftparchive.1.xml:603
msgid "See Also"
msgstr "Voir aussi"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml:177
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
@@ -860,14 +878,14 @@ msgstr ""
"d'APT dans &guidesdir;, &apt-preferences;, le « HOWTO » d'APT."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt.8.xml:182 apt-get.8.xml:603 apt-cache.8.xml:364 apt-mark.8.xml:131
#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "Diagnostics"
msgstr "Diagnostics"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml:183
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1240,28 +1258,23 @@ msgstr ""
"installés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
-msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
-msgstr ""
-"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
-"installés dans le but de satisfaire les dépendances d'autres paquets et qui "
-"ne sont plus nécessaires."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:233
-msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu). By default it displays the changelog for the version that is "
-"installed. However, you can specify the same options as for the "
-"<option>install</option> command."
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
+#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
+#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "changelogs</ulink> for Ubuntu). By default it displays the changelog for "
+#| "the version that is installed. However, you can specify the same options "
+#| "as for the <option>install</option> command."
+msgid ""
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>. By default it "
+"displays the changelog for the version that is installed. However, you can "
+"specify the same options as for the <option>install</option> command."
msgstr ""
"<literal>changelog</literal> télécharge le journal des modifications d'un "
"paquet et l'affiche avec <command>sensible-pager</command>. Le nom du "
@@ -1275,7 +1288,21 @@ msgstr ""
"<option>install</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml:243
+msgid ""
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:267
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1284,7 +1311,7 @@ msgstr ""
"Élément de configuration : <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml:272
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -1293,7 +1320,7 @@ msgstr ""
"de configuration : <literal>APT::Install-Suggests</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:277
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1303,7 +1330,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:282
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -1331,7 +1358,7 @@ msgstr ""
"configuration : <literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml:297
msgid ""
"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -1351,7 +1378,7 @@ msgstr ""
"<literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -1363,7 +1390,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:315
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1385,39 +1412,21 @@ msgstr ""
"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:330
msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system. Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-"Pas d'action ; simule les événements qui devraient se produire sans "
-"effectuer de changement réel sur le système. Élément de configuration : "
-"<literal>APT::Get::Simulate</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
-msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>) so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation. A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>). Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."
msgstr ""
-"Lorsque la simulation est effectuée par un utilisateur sans privilège, le "
-"verrouillage sera désactivé automatiquement (<literal>Debug::NoLocking</"
-"literal>). Une mention explicite indiquant qu'il s'agit d'une simple "
-"simulation sera affichée si l'option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> est activée (elle est active par défaut). Ni la désactivation "
-"du verrou (NoLocking) ni l'affichage de la mention de simulation ne seront "
-"déclenchées si la commande est lancée par l'utilisateur root (pour qui il "
-"n'est pas jugé utile qu'<literal>apt-get</literal> envoie de telles "
-"notifications)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:340
msgid ""
"Simulated runs print out a series of lines, each representing a "
"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1432,7 +1441,7 @@ msgstr ""
"que les dommages n'ont aucune conséquence (rare)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:348
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -1448,7 +1457,7 @@ msgstr ""
"configuration : <literal>APT::Get::Assume-Yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:356
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
"Assume-No</literal>."
@@ -1457,7 +1466,7 @@ msgstr ""
"configuration : <literal>APT::Get::Assume-No</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:361
msgid ""
"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1467,7 +1476,7 @@ msgstr ""
"Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:367
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -1476,7 +1485,7 @@ msgstr ""
"Élément de configuration : <literal>APT::Get::Show-Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:373
msgid ""
"This option controls the architecture packages are built for by <command>apt-"
"get source --compile</command> and how cross-builddependencies are "
@@ -1494,7 +1503,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml:383
msgid ""
"This option controls the activated build profiles for which a source package "
"is built by <command>apt-get source --compile</command> and how build "
@@ -1510,7 +1519,7 @@ msgstr ""
"Build-Profiles</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:394
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -1519,7 +1528,7 @@ msgstr ""
"configuration : <literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml:399
msgid ""
"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -1533,7 +1542,7 @@ msgstr ""
"<literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml:406
msgid ""
"Allow installing new packages when used in conjunction with "
"<literal>upgrade</literal>. This is useful if the update of a installed "
@@ -1553,7 +1562,7 @@ msgstr ""
"Élément de configuration : <literal>APT::Get::Upgrade-Allow-New</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:418
msgid ""
"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1566,7 +1575,7 @@ msgstr ""
"Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:425
msgid ""
"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1579,13 +1588,90 @@ msgstr ""
"configuration : <literal>APT::Get::Only-Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml:433
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+"Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse APT "
+"continuer sans poser de questions quand il réalise quelque chose de "
+"potentiellement dommageable. Cette option ne doit être utilisée que dans des "
+"circonstances très spéciales. Utiliser <literal>force-yes</literal> peut "
+"détruire le système... Élément de configuration : <literal>APT::Get::force-"
+"yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+"Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse APT "
+"continuer sans poser de questions quand il réalise quelque chose de "
+"potentiellement dommageable. Cette option ne doit être utilisée que dans des "
+"circonstances très spéciales. Utiliser <literal>force-yes</literal> peut "
+"détruire le système... Élément de configuration : <literal>APT::Get::force-"
+"yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+"Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse APT "
+"continuer sans poser de questions quand il réalise quelque chose de "
+"potentiellement dommageable. Cette option ne doit être utilisée que dans des "
+"circonstances très spéciales. Utiliser <literal>force-yes</literal> peut "
+"détruire le système... Élément de configuration : <literal>APT::Get::force-"
+"yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:457
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
msgid ""
"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
-"<literal>APT::Get::force-yes</literal>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."
msgstr ""
"Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse APT "
"continuer sans poser de questions quand il réalise quelque chose de "
@@ -1595,7 +1681,7 @@ msgstr ""
"yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:465
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected MD5 "
@@ -1617,7 +1703,7 @@ msgstr ""
"<literal>APT::Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:476
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1631,7 +1717,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:484
msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1640,7 +1726,7 @@ msgstr ""
"Élément de configuration : <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:489
msgid ""
"This option is on by default; use <literal>--no-list-cleanup</literal> to "
"turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1658,7 +1744,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:499
msgid ""
"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -1680,7 +1766,7 @@ msgstr ""
"Release</literal>. Voyez aussi la page de manuel d'&apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:514
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1694,7 +1780,7 @@ msgstr ""
"Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml:521
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1704,7 +1790,7 @@ msgstr ""
"Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:527
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running the <literal>autoremove</"
@@ -1717,7 +1803,7 @@ msgstr ""
"inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml:534
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -1737,7 +1823,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:545
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1749,7 +1835,7 @@ msgstr ""
"literal>, "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:551
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -1759,19 +1845,18 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:556
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
-"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself. "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override. Configuration Item: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
-"Ignorer le fait que les paquets ne peuvent pas être authentifiés ; ne le "
-"signale pas à l'utilisateur. Cette option est très utile pour certains "
-"outils comme pbuilder. Élément de configuration : <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:566
msgid ""
"Forbid the update command to acquire unverifiable data from configured "
"sources. Apt will fail at the update command for repositories without valid "
@@ -1780,7 +1865,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1796,13 +1881,13 @@ msgstr ""
"Fancy</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
-#: apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml:587 apt-cache.8.xml:352 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1313 apt_preferences.5.xml:709
msgid "Files"
msgstr "Fichiers"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1813,7 +1898,7 @@ msgstr ""
"« HOWTO » d'APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml:604
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1850,9 +1935,9 @@ msgstr ""
"ou obsolète."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
-#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
-#: apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml:49 apt-cache.8.xml:137 apt-cache.8.xml:161
+#: apt-cache.8.xml:183 apt-cache.8.xml:188 apt-cache.8.xml:204
+#: apt-cache.8.xml:222 apt-cache.8.xml:234
msgid "&synopsis-pkg;"
msgstr "&synopsis-pkg;"
@@ -2018,10 +2103,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:124
+#, fuzzy
+#| msgid ""
+#| "<literal>Total distinct</literal> versions is the number of package "
+#| "versions found in the cache; this value is therefore at least equal to "
+#| "the number of total package names. If more than one distribution is being "
+#| "accessed (for instance, \"stable\" and \"unstable\"), this value can be "
+#| "considerably larger than the number of total package names."
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
"instance, \"stable\" and \"unstable\"), this value can be considerably "
"larger than the number of total package names."
msgstr ""
@@ -2032,7 +2123,7 @@ msgstr ""
"considérablement plus grande que le nombre total de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:130
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
@@ -2041,18 +2132,24 @@ msgstr ""
"dépendances déclarées par tous les paquets présents dans le cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:138
+#, fuzzy
+#| msgid ""
+#| "<literal>showsrc</literal> displays all the source package records that "
+#| "match the given package names. All versions are shown, as well as all "
+#| "records that declare the name to be a binary package."
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."
msgstr ""
"<literal>showsrc</literal> affiche toutes les entrées de paquets source qui "
"correspondent aux noms donnés. Toutes les versions sont affichées et toutes "
"les entrées qui déclarent que ces noms correspondent à des paquets binaires."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:147
msgid ""
"<literal>dump</literal> shows a short listing of every package in the cache. "
"It is primarily for debugging."
@@ -2061,7 +2158,7 @@ msgstr ""
"paquet du cache. Elle est d'abord destinée au débogage."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml:152
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2071,7 +2168,7 @@ msgstr ""
"et la méthode &dselect; s'en sert."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml:157
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
@@ -2080,7 +2177,7 @@ msgstr ""
"dépendances absentes dans le cache de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml:162
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg --print-"
"avail</command>; it displays the package records for the named packages."
@@ -2090,12 +2187,22 @@ msgstr ""
"argument."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:167
msgid "&synopsis-regex;"
msgstr "&synopsis-regex;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:168
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see &regex;. It "
+#| "searches the package names and the descriptions for an occurrence of the "
+#| "regular expression and prints out the package name and the short "
+#| "description, including virtual package names. If <option>--full</option> "
+#| "is given then output identical to <literal>show</literal> is produced for "
+#| "each matched package, and if <option>--names-only</option> is given then "
+#| "the long description is not searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see &regex;. It searches "
@@ -2104,7 +2211,7 @@ msgid ""
"including virtual package names. If <option>--full</option> is given then "
"output identical to <literal>show</literal> is produced for each matched "
"package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."
msgstr ""
"La commande <literal>search</literal> recherche l'expression rationnelle "
"POSIX donnée en paramètre sur tous les paquets disponibles, voir &regex;. "
@@ -2116,7 +2223,7 @@ msgstr ""
"mais seulement dans les noms de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:179
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -2125,7 +2232,7 @@ msgstr ""
"rationnelles différentes sur lesquelles seront réalisées un « et » logique."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:184
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -2135,7 +2242,7 @@ msgstr ""
"satisfont ces dépendances."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:189
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -2144,12 +2251,12 @@ msgstr ""
"dépendances inverses d'un paquet."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:193
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:194
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -2164,7 +2271,7 @@ msgstr ""
"l'option <option>--generate</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:199
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -2175,7 +2282,7 @@ msgstr ""
"affichés dans la liste créée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:205
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2197,7 +2304,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml:214
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2212,14 +2319,14 @@ msgstr ""
"conflits."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:219
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
"Attention, dotty ne peut pas représenter des ensembles très grands de "
"paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:223
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2229,12 +2336,12 @@ msgstr ""
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:227
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:228
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -2247,7 +2354,7 @@ msgstr ""
"paquet donné en argument."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml:235
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -2267,7 +2374,7 @@ msgstr ""
"literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:251
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -2278,7 +2385,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:257
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2294,7 +2401,7 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:265
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2309,7 +2416,7 @@ msgstr ""
"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:272
msgid ""
"Print only important dependencies; for use with <literal>unmet</literal> and "
"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2321,9 +2428,16 @@ msgstr ""
"<literal>APT::Cache::Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml:286
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be tweaked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
@@ -2336,7 +2450,19 @@ msgstr ""
"replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:294
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data. A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture. Configuration Item: <literal>APT::Cache::ShowImplicit</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:304
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -2346,7 +2472,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:309
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -2364,7 +2490,7 @@ msgstr ""
"<literal>APT::Cache::AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml:318
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2376,17 +2502,21 @@ msgstr ""
"configuration : <literal>APT::Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:324
+#, fuzzy
+#| msgid ""
+#| "Only search on the package names, not the long descriptions. "
+#| "Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgid ""
-"Only search on the package names, not the long descriptions. Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
"N'effectue une recherche que sur les noms de paquets et pas sur les "
"descriptions longues. Élément de configuration : <literal>APT::Cache::"
"NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:329
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -2397,7 +2527,7 @@ msgstr ""
"configuration : <literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -2409,7 +2539,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:342
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -2420,12 +2550,12 @@ msgstr ""
"Élément de configuration : <literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:360
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:365
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3908,6 +4038,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:295
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true, as giving a Release file's "
+#| "validation an expiration date prevents replay attacks over a long "
+#| "timescale, and can also for example help users to identify mirrors that "
+#| "are no longer updated - but the feature depends on the correctness of the "
+#| "clock on the user system. Archive maintainers are encouraged to create "
+#| "Release files with the <literal>Valid-Until</literal> header, but if they "
+#| "don't or a stricter value is desired the <literal>Max-ValidTime</literal> "
+#| "option below can be used."
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3916,7 +4056,9 @@ msgid ""
"user system. Archive maintainers are encouraged to create Release files with "
"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
"value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used. The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
msgstr ""
"L'activation de l'option de sécurité qui permet de mettre une limite "
"temporelle de validité au fichier Release permet d'éviter des attaques de "
@@ -3928,7 +4070,16 @@ msgstr ""
"alors utilisée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:308
+#: apt.conf.5.xml:310
+#, fuzzy
+#| msgid ""
+#| "Maximum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. If the Release file itself includes a "
+#| "<literal>Valid-Until</literal> header the earlier date of the two is used "
+#| "as the expiration date. The default value is <literal>0</literal> which "
+#| "stands for \"valid forever\". Archive specific settings can be made by "
+#| "appending the label of the archive to the option name."
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3936,7 +4087,9 @@ msgid ""
"<literal>Valid-Until</literal> header the earlier date of the two is used as "
"the expiration date. The default value is <literal>0</literal> which stands "
"for \"valid forever\". Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."
msgstr ""
"Durée maximale (en secondes) pendant laquelle un fichier Release est "
"considéré comme valable, à partir du moment de sa création. Si ce fichier "
@@ -3947,7 +4100,16 @@ msgstr ""
"l'option."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml:323
+#, fuzzy
+#| msgid ""
+#| "Minimum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. Use this if you need to use a seldom "
+#| "updated (local) mirror of a more frequently updated archive with a "
+#| "<literal>Valid-Until</literal> header instead of completely disabling the "
+#| "expiration date checking. Archive specific settings can and should be "
+#| "used by appending the label of the archive to the option name."
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3955,7 +4117,9 @@ msgid ""
"(local) mirror of a more frequently updated archive with a <literal>Valid-"
"Until</literal> header instead of completely disabling the expiration date "
"checking. Archive specific settings can and should be used by appending the "
-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."
msgstr ""
"Durée minimale (en secondes) pendant laquelle un fichier Release est "
"considéré comme valable, à partir du moment de sa création. Il est conseillé "
@@ -3967,7 +4131,7 @@ msgstr ""
"nom de l'option."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:336
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3978,7 +4142,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:335
+#: apt.conf.5.xml:339
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 "
@@ -3997,7 +4161,7 @@ msgstr ""
"fichiers de différences."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:349
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4013,7 +4177,7 @@ msgstr ""
"initiée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:357
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -4023,7 +4187,7 @@ msgstr ""
"échoué."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:358
+#: apt.conf.5.xml:362
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."
@@ -4033,7 +4197,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:363
+#: apt.conf.5.xml:367
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]/</"
@@ -4054,7 +4218,7 @@ msgstr ""
"options de mandataire HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:375
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 "
@@ -4074,7 +4238,7 @@ msgstr ""
"fichiers .deb très grands."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381 apt.conf.5.xml:469
+#: apt.conf.5.xml:385 apt.conf.5.xml:473
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."
@@ -4084,7 +4248,7 @@ msgstr ""
"connexion qu'aux données."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:384
+#: apt.conf.5.xml:388
#, fuzzy
#| msgid ""
#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
@@ -4113,7 +4277,7 @@ msgstr ""
"qui ne respectent pas la norme HTTP/1.1."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:395
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -4122,7 +4286,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:394
+#: apt.conf.5.xml:398
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes per second. The default "
@@ -4138,7 +4302,7 @@ msgstr ""
"serveurs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:405
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 "
@@ -4150,7 +4314,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:405
+#: apt.conf.5.xml:409
msgid ""
"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
"an external command to discover the http proxy to use. Apt expects the "
@@ -4173,7 +4337,7 @@ msgstr ""
"l'ancien nom d'option <literal>ProxyAutoDetect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:427
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4190,7 +4354,7 @@ msgstr ""
"literal> n'est pas encore gérée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:435
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4223,7 +4387,7 @@ msgstr ""
"<literal>TLSv1</literal> ou <literal>SSLv3</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:456
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]/</"
@@ -4259,7 +4423,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: apt.conf.5.xml:476
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, "
@@ -4276,7 +4440,7 @@ msgstr ""
"modèle de fichier de configuration)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:483
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 "
@@ -4291,7 +4455,7 @@ msgstr ""
"efficacité de cette méthode."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:488
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4307,13 +4471,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:498
+#: apt.conf.5.xml:502
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:497
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4336,7 +4500,7 @@ msgstr ""
"<literal>UMount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:510
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4345,13 +4509,13 @@ msgstr ""
"permet de passer des paramètres à gpgv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:521
#, 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:512
+#: apt.conf.5.xml:516
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4371,19 +4535,19 @@ msgstr ""
"type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:526
#, 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:525
+#: apt.conf.5.xml:529
#, 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:518
+#: apt.conf.5.xml:522
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 "
@@ -4415,13 +4579,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:532
+#: apt.conf.5.xml:536
#, 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:527
+#: apt.conf.5.xml:531
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4448,7 +4612,7 @@ msgstr ""
"question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:541
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4460,7 +4624,7 @@ msgstr ""
"surtout destiné aux miroirs locaux."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:548
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4475,7 +4639,7 @@ msgstr ""
"(« False »)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:556
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4495,13 +4659,13 @@ msgstr ""
"langues étant particulièrement rares."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:573
#, 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:557
+#: apt.conf.5.xml:561
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4541,7 +4705,7 @@ msgstr ""
"alors « de, fr, en ». <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:574
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4555,24 +4719,32 @@ msgstr ""
"(après un « <literal>none</literal> » implicite)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:583
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:585
+#: apt.conf.5.xml:589
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><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:595
msgid ""
"The maximum file size of Release/Release.gpg/InRelease files. The default "
"is 10MB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:602
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to. The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:611
msgid ""
"Allow the update operation to load data files from a repository without a "
"trusted signature. If enabled this option no data files will be loaded and "
@@ -4581,7 +4753,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:622
msgid ""
"Allow that a repository that was previously gpg signed to become unsigned "
"durign a update operation. When there is no valid signature of a perviously "
@@ -4591,13 +4763,46 @@ msgid ""
"source untrusted and warn about them if you try to install them."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:634
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:636
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them. Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>. The value should be a "
+"normal URI to a text file, expect that package specific data is replaced "
+"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"if the package is from a component (e.g. <literal>main</literal>) this is "
+"the first part otherwise it is omitted, 2. the first letter of source "
+"package name, expect if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version. "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>') and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>'). The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:664
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:666
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4617,7 +4822,7 @@ msgstr ""
"<filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:673
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4642,7 +4847,7 @@ msgstr ""
"dans <literal>Dir::Cache</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:683
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4657,7 +4862,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:689
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 "
@@ -4668,7 +4873,7 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:693
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4686,16 +4891,26 @@ msgstr ""
"programmes correspondants."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:701
+#, fuzzy
+#| msgid ""
+#| "The configuration item <literal>RootDir</literal> has a special meaning. "
+#| "If set, all paths in <literal>Dir::</literal> will be relative to "
+#| "<literal>RootDir</literal>, <emphasis>even paths that are specified "
+#| "absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> "
+#| "is set to <filename>/tmp/staging</filename> and <literal>Dir::State::"
+#| "status</literal> is set to <filename>/var/lib/dpkg/status</filename>, "
+#| "then the status file will be looked up in <filename>/tmp/staging/var/lib/"
+#| "dpkg/status</filename>."
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>. So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>. If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."
msgstr ""
"L'option de configuration <literal>RootDir</literal> a une signification "
"particulière. Lorsqu'elle est définie, tous les chemins déclarés dans "
@@ -4708,7 +4923,7 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:715
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 "
@@ -4726,12 +4941,12 @@ msgstr ""
"est possible d'utiliser la syntaxe des expressions rationnelles."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:724
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:726
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4742,7 +4957,7 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:731
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4765,7 +4980,7 @@ msgstr ""
"avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:745
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4774,7 +4989,7 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:750
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4783,7 +4998,7 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:755
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4793,12 +5008,12 @@ msgstr ""
"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:761
msgid "How APT calls &dpkg;"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:762
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4807,7 +5022,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:767
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 "
@@ -4818,7 +5033,7 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:773
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 "
@@ -4831,7 +5046,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:739
+#: apt.conf.5.xml:780
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 "
@@ -4849,21 +5064,51 @@ msgstr ""
"l'entrée standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:787
+msgid ""
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:792
msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
+"Each configuration directive line has the form <literal>key=value</"
+"literal>. Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
msgstr ""
-"La deuxième version de ce protocole donne plus de renseignements : on "
-"obtient la version du protocole, la configuration de APT et les paquets, "
-"fichiers ou versions qui ont changé. La troisième version ajoute "
-"l'architecture et le marqueur <literal>MultiArch</literal> à chaque version "
-"déposée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:800
+msgid ""
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:810
+msgid ""
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
+"\" is an incorrect typename which is just kept to remain compatible, it "
+"should be read as \"no\" and users are encouraged to support both."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:816
msgid ""
"The version of the protocol to be used for the command "
"<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4880,7 +5125,7 @@ msgstr ""
"version la plus haute qu'il gère."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:823
msgid ""
"The file descriptor to be used to send the information can be requested with "
"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4898,7 +5143,7 @@ msgstr ""
"confirmation le numéro du descripteur de fichier utilisé."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:833
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4907,7 +5152,7 @@ msgstr ""
"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:838
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4917,14 +5162,14 @@ msgstr ""
"créés."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:843
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:779
+#: apt.conf.5.xml:844
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 "
@@ -4951,7 +5196,7 @@ msgstr ""
"pendant la configuration des paquets."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:859
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4965,7 +5210,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:853
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 "
@@ -4989,7 +5234,7 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:866
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 "
@@ -5012,7 +5257,7 @@ msgstr ""
"options « unpack » et « remove »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:874
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -5042,7 +5287,7 @@ msgstr ""
"configuré et donc éventuellement non amorçable."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:889
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5061,7 +5306,7 @@ msgstr ""
"peut conserver l'option active."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:896
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -5079,7 +5324,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:844
+#: apt.conf.5.xml:909
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5097,7 +5342,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:902
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 "
@@ -5123,12 +5368,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:922
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:923
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -5140,12 +5385,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:931
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:933
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5163,7 +5408,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:944
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5174,7 +5419,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:952
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5186,7 +5431,7 @@ msgstr ""
"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:961
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5198,7 +5443,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:904
+#: apt.conf.5.xml:969
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -5207,12 +5452,12 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:914
+#: apt.conf.5.xml:979
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:923
+#: apt.conf.5.xml:988
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -5220,24 +5465,24 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:999
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:945
+#: apt.conf.5.xml:1010
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:956
+#: apt.conf.5.xml:1021
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:967
+#: apt.conf.5.xml:1032
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -5246,7 +5491,7 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:978
+#: apt.conf.5.xml:1043
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -5255,14 +5500,14 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:988
+#: apt.conf.5.xml:1053
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:998
+#: apt.conf.5.xml:1063
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -5271,7 +5516,7 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1008
+#: apt.conf.5.xml:1073
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 "
@@ -5282,7 +5527,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:1019
+#: apt.conf.5.xml:1084
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."
@@ -5292,14 +5537,14 @@ msgstr ""
"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1031
+#: apt.conf.5.xml:1096
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:1041
+#: apt.conf.5.xml:1106
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -5309,7 +5554,7 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1116
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -5319,7 +5564,7 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1063
+#: apt.conf.5.xml:1128
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -5329,7 +5574,7 @@ msgstr ""
"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1074
+#: apt.conf.5.xml:1139
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -5337,7 +5582,7 @@ msgstr ""
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1085
+#: apt.conf.5.xml:1150
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5346,7 +5591,7 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1160
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5361,7 +5606,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:1109
+#: apt.conf.5.xml:1174
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5397,7 +5642,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:1130
+#: apt.conf.5.xml:1195
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5406,7 +5651,7 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1141
+#: apt.conf.5.xml:1206
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5416,7 +5661,7 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1152
+#: apt.conf.5.xml:1217
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5425,18 +5670,18 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1164
+#: apt.conf.5.xml:1229
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:1175
+#: apt.conf.5.xml:1240
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:1185
+#: apt.conf.5.xml:1250
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5445,7 +5690,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:1196
+#: apt.conf.5.xml:1261
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 "
@@ -5456,7 +5701,7 @@ msgstr ""
"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1208
+#: apt.conf.5.xml:1273
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5465,7 +5710,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml:1283
msgid ""
"Display the external commands that are called by apt hooks. This includes e."
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5476,13 +5721,13 @@ msgstr ""
"Post}-Invoke</literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt.conf.5.xml:1307 apt_preferences.5.xml:556 sources.list.5.xml:358
#: apt-ftparchive.1.xml:592
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml:1308
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5492,7 +5737,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml:1320
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5689,12 +5934,13 @@ msgstr "une priorité égale à 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:118
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that do not belong to the target release."
msgstr ""
-"est affectée aux versions qui ne sont pas installées et qui n'appartiennent "
-"pas à la distribution par défaut."
+"est affectée aux versions qui ne sont pas installées et qui appartiennent à "
+"la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:122
@@ -5703,14 +5949,23 @@ msgstr "une priorité égale à 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:123
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
msgstr ""
"est affectée aux versions qui ne sont pas installées et qui appartiennent à "
"la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:127
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:131
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5728,7 +5983,7 @@ msgstr ""
"« ButAutomaticUpgrades: yes »."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml:138
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -5737,7 +5992,7 @@ msgstr ""
"qu'il faut installer (par ordre de priorité) :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml:141
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5753,12 +6008,12 @@ msgstr ""
"arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid "Install the highest priority version."
msgstr "Installer la version qui possède la priorité la plus haute."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:148
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -5767,7 +6022,7 @@ msgstr ""
"plus récente (c.-à-d. celle dont le numéro de version est le plus grand)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml:151
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5779,7 +6034,7 @@ msgstr ""
"qui n'est pas installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:157
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5794,7 +6049,7 @@ msgstr ""
"replaceable></command> ou <command>apt-get dist-upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:164
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5807,7 +6062,7 @@ msgstr ""
"<command>apt-get upgrade</command> ne provoquent pas de retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5826,12 +6081,12 @@ msgstr ""
"priorité que celle de la version installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:178
msgid "The Effect of APT Preferences"
msgstr "Conséquences des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:180
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5844,7 +6099,7 @@ msgstr ""
"formes, une forme particulière et une forme générale."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:186
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages with a specified version or version range. For example, "
@@ -5860,7 +6115,7 @@ msgstr ""
"dont le numéro de version commence par <literal>&good-perl;</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5872,7 +6127,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:199
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5887,7 +6142,7 @@ msgstr ""
"un nom complètement qualifié."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:205
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5898,7 +6153,7 @@ msgstr ""
"priorité haute à toutes les versions disponibles dans le site local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:210
#, no-wrap
msgid ""
"Package: *\n"
@@ -5910,7 +6165,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml:215
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
"which can be used to match a hostname. The following record will assign a "
@@ -5923,7 +6178,7 @@ msgstr ""
"serveur identifié par le nom d'hôte « ftp.de.debian.org »."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:219
#, no-wrap
msgid ""
"Package: *\n"
@@ -5935,7 +6190,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:223
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -5950,7 +6205,7 @@ msgstr ""
"mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml:228
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5961,7 +6216,7 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:232
#, no-wrap
msgid ""
"Package: *\n"
@@ -5973,7 +6228,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:237
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5984,7 +6239,7 @@ msgstr ""
"<literal>&testing-codename;</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
#, no-wrap
msgid ""
"Package: *\n"
@@ -5996,7 +6251,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6008,7 +6263,7 @@ msgstr ""
"<literal>&stable-version;</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, no-wrap
msgid ""
"Package: *\n"
@@ -6019,13 +6274,22 @@ msgstr ""
"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:258
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:266
msgid "Regular expressions and &glob; syntax"
msgstr "Expressions régulières et syntaxe &glob;"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:268
msgid ""
"APT also supports pinning by &glob; expressions, and regular expressions "
"surrounded by slashes. For example, the following example assigns the "
@@ -6041,7 +6305,7 @@ msgstr ""
"POSIX étendue, entourée de barres obliques)."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
@@ -6053,7 +6317,7 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6065,7 +6329,7 @@ msgstr ""
"par &ubuntu-codename;."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
#, no-wrap
msgid ""
"Package: *\n"
@@ -6077,7 +6341,7 @@ msgstr ""
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
@@ -6096,12 +6360,12 @@ msgstr ""
"expression &glob; en soi."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid "How APT Interprets Priorities"
msgstr "Méthode d'interprétation des priorités par APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:314
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking):"
@@ -6110,12 +6374,12 @@ msgstr ""
"entiers positifs ou négatifs. Ils sont interprétés à peu près comme suit :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:319
msgid "P &gt;= 1000"
msgstr "P &gt;= 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -6124,12 +6388,12 @@ msgstr ""
"retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml:324
msgid "990 &lt;= P &lt; 1000"
msgstr "990 &lt;= P &lt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -6139,12 +6403,12 @@ msgstr ""
"plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:330
msgid "500 &lt;= P &lt; 990"
msgstr "500 &lt;= P &lt; 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:331
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -6153,12 +6417,12 @@ msgstr ""
"distribution par défaut ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "100 &lt;= P &lt; 500"
msgstr "100 &lt;= P &lt; 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:337
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -6167,34 +6431,52 @@ msgstr ""
"autre distribution ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:342
msgid "0 &lt; P &lt; 100"
msgstr "0 &lt; P &lt; 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:343
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr "la version sera installée si aucune version du paquet n'est installée."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:347
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:348
msgid "prevents the version from being installed"
msgstr "cette priorité empêche l'installation de la version."
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:351
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:352
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
-msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version. Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+#: apt_preferences.5.xml:358
+#, fuzzy
+#| msgid ""
+#| "If any specific-form records match an available package version then the "
+#| "first such record determines the priority of the package version. "
+#| "Failing that, if any general-form records match an available package "
+#| "version then the first such record determines the priority of the package "
+#| "version."
+msgid ""
+"The first specific-form record matching an available package version "
+"determines the priority of the package version. Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version. Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
msgstr ""
"Si l'une des entrées de forme particulière correspond à la version "
"disponible d'un paquet, la première entrée trouvée détermine la priorité de "
@@ -6203,7 +6485,7 @@ msgstr ""
"trouvée détermine la priorité."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:366
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -6212,7 +6494,7 @@ msgstr ""
"entrées décrites ci-dessous :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:370
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6240,12 +6522,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:383
msgid "Then:"
msgstr "Alors :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6260,7 +6542,7 @@ msgstr ""
"arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:390
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6271,7 +6553,7 @@ msgstr ""
"appartenant à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:394
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6284,13 +6566,13 @@ msgstr ""
"paquet n'est déjà installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml:404
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
"Détermination de la version des paquets et des propriétés des distributions"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:406
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6301,7 +6583,7 @@ msgstr ""
"décrivent les paquets disponibles à cet endroit."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:410
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6320,27 +6602,27 @@ msgstr ""
"sont pertinentes pour la détermination des priorités :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:418
msgid "the <literal>Package:</literal> line"
msgstr "la ligne <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml:419
msgid "gives the package name"
msgstr "donne le nom du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml:422 apt_preferences.5.xml:472
msgid "the <literal>Version:</literal> line"
msgstr "la ligne <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:423
msgid "gives the version number for the named package"
msgstr "donne le numéro de version du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:428
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6362,12 +6644,12 @@ msgstr ""
"pertinentes pour déterminer les priorités :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:439
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:440
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6384,18 +6666,18 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:450
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:456
msgid "the <literal>Codename:</literal> line"
msgstr "la ligne <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml:457
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6413,13 +6695,13 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:466
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:473
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian release version &stable-version;. Note that there is "
@@ -6436,7 +6718,7 @@ msgstr ""
"préférences demanderait ces lignes :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
#, no-wrap
msgid ""
"Pin: release v=&stable-version;\n"
@@ -6448,12 +6730,12 @@ msgstr ""
"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:491
msgid "the <literal>Component:</literal> line"
msgstr "La ligne <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml:492
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6471,18 +6753,18 @@ msgstr ""
"fichier des préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:507
msgid "the <literal>Origin:</literal> line"
msgstr "La ligne <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:508
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6495,18 +6777,18 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:514
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:520
msgid "the <literal>Label:</literal> line"
msgstr "La ligne <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:521
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6519,13 +6801,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:527
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:534
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6550,12 +6832,12 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml:547
msgid "Optional Lines in an APT Preferences Record"
msgstr "Lignes facultatives dans le fichier des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:549
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6566,12 +6848,12 @@ msgstr ""
"commentaires."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:558
msgid "Tracking Stable"
msgstr "Méthode pour suivre Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:566
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6595,7 +6877,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:560
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6610,8 +6892,8 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
-#: apt_preferences.5.xml:672
+#: apt_preferences.5.xml:583 apt_preferences.5.xml:629
+#: apt_preferences.5.xml:687
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6623,7 +6905,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml:578
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6636,13 +6918,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:595
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:589
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6655,12 +6937,12 @@ msgstr ""
"de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:601
msgid "Tracking Testing or Unstable"
msgstr "Méthode pour suivre Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Package: *\n"
@@ -6688,7 +6970,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:603
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6705,7 +6987,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:624
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6718,13 +7000,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:644
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:635
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6743,12 +7025,12 @@ msgstr ""
"installée. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml:651
msgid "Tracking the evolution of a codename release"
msgstr "Suivre l'évolution d'une version par son nom de code"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml:665
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6782,7 +7064,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:653
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6806,7 +7088,7 @@ msgstr ""
"exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml:682
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6819,13 +7101,13 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml:702
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:693
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6844,7 +7126,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml:717
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6855,13 +7137,24 @@ msgstr "Liste des sources de données APT configurées"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+#, fuzzy
+#| msgid ""
+#| "The source list <filename>/etc/apt/sources.list</filename> is designed to "
+#| "support any number of active sources and a variety of source media. The "
+#| "file lists one source per line, with the most preferred source listed "
+#| "first. The information available from the configured sources is acquired "
+#| "by <command>apt-get update</command> (or by an equivalent command from "
+#| "another APT front-end)."
+msgid ""
+"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
msgstr ""
"Le fichier de liste de sources <filename>/etc/apt/sources.list</filename> "
"est prévu pour pouvoir gérer un nombre quelconque de sources actives et de "
@@ -6870,37 +7163,35 @@ msgstr ""
"récupérée par la commande <command>apt-get update</command> (ou par une "
"commande équivalent avec une autre interface à APT)."
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
-msgid ""
-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
-"literal>) followed by options and arguments for this type. Individual "
-"entries cannot be continued onto a following line. Empty lines are ignored, "
-"and a <literal>#</literal> character anywhere on a line marks the remainder "
-"of that line as a comment."
-msgstr ""
-"Chaque ligne qui indique une source commence par son type (p. ex. "
-"<literal>deb-src</literal>), suivi d'options et paramètres pour ce type. Les "
-"entrées individuelles ne peuvent pas être multilignes. Les lignes vides sont "
-"ignorées et un caractère <literal>#</literal> sur une ligne indique que le "
-"reste de la ligne est un commentaire."
-
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml:45
msgid "sources.list.d"
msgstr "sources.list.d"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:46
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files. The format is the same as "
+#| "for the regular <filename>sources.list</filename> file. File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters. Otherwise APT will print a notice that it has ignored a "
+#| "file, unless that file matches a pattern in the <literal>Dir::Ignore-"
+#| "Files-Silently</literal> configuration list - in which case it will be "
+#| "silently ignored."
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files. The format is the same as for "
-"the regular <filename>sources.list</filename> file. File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"add sources.list entries in separate files. Two different file formats are "
+"allowed as described in the next two sections. Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format. The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters. Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."
msgstr ""
"Le répertoire <filename>/etc/apt/sources.list.d</filename> permet de "
"spécifier des sources de paquets dans des fichiers distincts qui se "
@@ -6915,16 +7206,106 @@ msgstr ""
"ignorés silencieusemennt)."
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml:58
+msgid "one line style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:60
+msgid ""
+"Files in this format have the extension <filename>.list</filename>. Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"
+"literal>) followed by options and arguments for this type. Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line. If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>) included in the line after the type separated from "
+"it with a space. If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by a equal sign (<literal>=</literal>). "
+"Multivalue options have also <literal>-=</literal> and <literal>+=</literal> "
+"as separator which instead of replacing the default with the given value(s) "
+"modify the default value(s) to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:79
+msgid ""
+"This is the traditional format and supported by all apt versions. Note that "
+"not all options as described below are supported by all apt versions. Note "
+"also that some older applications parsing this format on its own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:87
+msgid "deb822 style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:89
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>. The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, like the metadata itself apt will download from the configured "
+"sources or the <filename>debian/control</filename> file in a Debian source "
+"package. Individual entries are separated by an empty line, additional "
+"empty lines are ignored, and a <literal>#</literal> character at the start "
+"of the line marks the entire line as a comment. An entry can hence be "
+"disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it. Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s). Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:108
+msgid ""
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier. It "
+"is intended to make this format gradually the default format and deprecating "
+"the previously described one line style format as it is easier to create, "
+"extend and modify by humans and machines alike especially if a lot of "
+"sources and/or options are involved. Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but could encounter problems with software not "
+"supporting the format yet."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:123
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: General Format"
msgstr "Les types deb et deb-src."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml:124
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type references a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. The "
+#| "<literal>distribution</literal> is generally an archive name like "
+#| "<literal>stable</literal> or <literal>testing</literal> or a codename "
+#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</"
+#| "literal> while component is one of <literal>main</literal>, "
+#| "<literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "<literal>deb-src</literal> type references a Debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type references a typical two-level Debian "
"archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
"<literal>stable</literal> or <literal>testing</literal> or a codename like "
"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
"literal> while component is one of <literal>main</literal>, "
@@ -6946,79 +7327,72 @@ msgstr ""
"pour récupérer les index des sources."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:135
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one line style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
msgstr ""
"Le format d'une entrée dans <filename>sources.list</filename> utilisant les "
"types <literal>deb</literal> et <literal>deb-src</literal> est :"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
+#: sources.list.5.xml:138
#, no-wrap
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ options ] uri suite [composant1] [composant2] [...]"
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
+msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:143
#, no-wrap
msgid ""
" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
+" URIs: uri\n"
+" Suites: suite\n"
+" Components: [component1] [component2] [...]\n"
+" option1: value1\n"
+" option2: value2\n"
" "
msgstr ""
-" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: composant1 composant2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-" "
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:141
+#, fuzzy
+#| msgid ""
+#| "Alternatively a rfc822 style format is also supported: <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
"Autrement, un autre format de style rfc822 est aussi géré : <placeholder "
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml:152
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>suite</literal> can specify an exact path, in which case the "
+#| "components must be omitted and <literal>suite</literal> must end with a "
+#| "slash (<literal>/</literal>). This is useful for the case when only a "
+#| "particular sub-section of the archive denoted by the URI is of interest. "
+#| "If <literal>suite</literal> does not specify an exact path, at least one "
+#| "<literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>suite</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>suite</literal> must end with a "
"slash (<literal>/</literal>). This is useful for the case when only a "
-"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest. "
+"If <literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"L'URI de type <literal>deb</literal> doit indiquer la base de la "
@@ -7031,7 +7405,7 @@ msgstr ""
"un <literal>composant</literal> au moins doit être présent."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml:161
msgid ""
"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
"literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7050,19 +7424,32 @@ msgstr ""
"literal> crée automatiquement un URI en fonction de l'architecture effective."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
-msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+#: sources.list.5.xml:169
+#, fuzzy
+#| msgid ""
+#| "In the traditional style sources.list format since only one distribution "
+#| "can be specified per line it may be necessary to have multiple lines for "
+#| "the same URI, if a subset of all available distributions or components at "
+#| "that location is desired. APT will sort the URI list after it has "
+#| "generated a complete set internally, and will collapse multiple "
+#| "references to the same Internet host, for instance, into a single "
+#| "connection, so that it does not inefficiently establish an FTP "
+#| "connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"Especially in the one line style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "
"location is desired. APT will sort the URI list after it has generated a "
"complete set internally, and will collapse multiple references to the same "
"Internet host, for instance, into a single connection, so that it does not "
-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
msgstr ""
"Lorsqu'on utilise le type de style de sources.list traditionnel, puisqu'on "
"ne peut indiquer qu'une seule distribution par ligne, il peut être "
@@ -7078,30 +7465,73 @@ msgstr ""
"tirer plus efficacement parti des sites à faible bande passante."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
-msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>. Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
-msgstr ""
-"<literal>options</literal> est toujours optionnel et doit être entouré par "
-"des crochets. It est constitué de réglages multiples sous la forme "
-"<literal><replaceable>réglage</replaceable>=<replaceable>valeur</"
-"replaceable></literal>. Des réglages multiples sont séparés par des espaces. "
-"Les réglages suivants sont gérés par APT (des réglages non gérés seront "
-"ignorés silencieusement) :"
+#: sources.list.5.xml:181
+msgid ""
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+"Il est important d'indiquer les sources par ordre de préférence, la source "
+"principale apparaissant en premier. Un tri est fait, de la plus rapide à la "
+"plus lente ; par exemple, un CD suivi par les hôtes d'un réseau local, puis "
+"les hôtes distants."
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:188
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:190
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:186
+msgid ""
+"As an example, the sources for your distribution could look like this in one "
+"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:193
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: Options"
+msgstr "Les types deb et deb-src."
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:194
+msgid ""
+"Each source entry can have options specified modifying which and how the "
+"source is accessed and data acquired from it. Format, syntax and names of "
+"the options varies between the two formats one line and deb822 style as "
+"described, but they have both the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one line name in brackets. "
+"Remember that beside setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
+msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:205
+#, fuzzy
+#| msgid ""
+#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#| "replaceable>,…</literal> can be used to specify for which architectures "
+#| "information should be downloaded. If this option is not set all "
+#| "architectures defined by the <literal>APT::Architectures</literal> option "
+#| "will be downloaded."
msgid ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
msgstr ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> peut être utilisé pour indiquer les architectures "
@@ -7110,78 +7540,93 @@ msgstr ""
"Architectures</literal> sera téléchargée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:212
msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information like translated package "
+"descriptions should be downloaded. If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
msgstr ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> et <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> qui peuvent être utilisés pour "
-"ajouter ou supprimer des architectures dans l'ensemble qui sera téléchargée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:220
msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
-msgstr ""
-"<literal>trusted=yes</literal> peut être utilisée pour indiquer que les "
-"paquets issus de cette source doivent être authentifiés même si le fichier "
-"<filename>Release</filename> n'est pas signé ou que la signature ne peut pas "
-"être vérifiée. Cela désactive certaines parties d'&apt-secure; et ne devrait "
-"donc être utilisé que dans un contexte local ou sûr. <literal>trusted=no</"
-"literal> est l'opposé et considérera même les sources correctement "
-"authentifiées comme non authentifiées."
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope."
+msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:228
msgid ""
-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
msgstr ""
-"Il est important d'indiquer les sources par ordre de préférence, la source "
-"principale apparaissant en premier. Un tri est fait, de la plus rapide à la "
-"plus lente ; par exemple, un CD suivi par les hôtes d'un réseau local, puis "
-"les hôtes distants."
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-msgid "Some examples:"
-msgstr "Exemples :"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:235
+msgid ""
+"<option>Signed-By</option> (<option>signed-by</option>) is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key in either the <filename>trusted.gpg</"
+"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set only the key(s) in this keyring or only the key with this "
+"fingerprint is used for the &apt-secure; verification of this repository. "
+"Otherwise all keys in the trusted keyrings are considered valid signers for "
+"this repository."
+msgstr ""
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:249
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare until then the data provided in the "
+"repository should be considered valid and if this time is reached, but no "
+"new data is provided the data is considered expired and an error is raised. "
+"Beside increasing security as a malicious attacker can't sent old data "
+"forever denying a user to be able to upgrade to a new version, this also "
+"helps users identify mirrors which are no longer updated. Some repositories "
+"like historic archives aren't updated anymore by design through, so this "
+"check can be disabled by setting this option to <literal>no</literal>. "
+"Defaults to the value of configuration option <option>Acquire::Check-Valid-"
+"Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:266
+msgid ""
+"<option>Valid-Until-Min</option> (<option>check-valid-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldomly updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely. Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:288
msgid "URI specification"
msgstr "Spécification des URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml:290
msgid "The currently recognized URI types are:"
msgstr "Les types d'URI actuellement reconnues sont :"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:294
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7192,7 +7637,7 @@ msgstr ""
"avec les montages NFS, les miroirs et les archives locaux."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml:301
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7202,7 +7647,7 @@ msgstr ""
"pour créer des entrées dans la liste des sources."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:308
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7219,7 +7664,7 @@ msgstr ""
"Notez qu'il s'agit d'une méthode d'authentification peu sûre."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:319
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7241,7 +7686,7 @@ msgstr ""
"configuration seront ignorés."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:331
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -7255,7 +7700,7 @@ msgstr ""
"des fichiers avec APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:338
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7269,12 +7714,12 @@ msgstr ""
"sont utilisées pour l'accès aux fichiers de la machine distante."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:345
msgid "adding more recognizable URI types"
msgstr "ajout de types d'URI supplémentaires reconnues"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:347
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7293,46 +7738,86 @@ msgstr ""
"disponibles (voir &apt-transport-debtorrent;)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian "
+#| "for stable/main, stable/contrib, and stable/non-free."
msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
"Utiliser l'archive stockée localement (ou montée via NFS) dans /home/jason/"
"debian pour stable/main, stable/contrib et stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
-#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+#: sources.list.5.xml:361
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr "deb file:/home/jason/debian stable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:362
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:367
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Comme ci-dessus, excepté que cette ligne utilise la distribution "
"« unstable » (développement)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
-#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:368
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:369
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:374
msgid "Source line for the above"
msgstr "La précédente ligne, mais pour les sources."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
-#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:375
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:376
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:382
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7343,17 +7828,41 @@ msgstr ""
"<literal>amd64</literal> et <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
-#, no-wrap
+#: sources.list.5.xml:384
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgid ""
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:386
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml:398
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7362,13 +7871,24 @@ msgstr ""
"n'utiliser que la section hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:400
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "deb http://archive.debian.org/debian-archive hamm main"
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr "deb http://archive.debian.org/debian-archive hamm main"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml:406
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7377,13 +7897,24 @@ msgstr ""
"répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:408
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:409
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:414
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7396,19 +7927,49 @@ msgstr ""
"apparaissent, une seule session FTP sera utilisée pour les deux lignes."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:418
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:419
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml:431
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:432
+#, fuzzy, no-wrap
+#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:424
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
+#| "directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</"
+#| "filename> on amd64, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; "
+#| "official debian archives are not structured like this] <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7416,7 +7977,7 @@ msgid ""
"amd64, and so forth for other supported architectures. [Note this example "
"only illustrates how to use the substitution variable; official debian "
"archives are not structured like this] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
msgstr ""
"Utiliser HTTP pour accéder à l'archive située à ftp.tlh.debian.org, dans le "
"répertoire universe, et n'utiliser que les fichiers trouvés dans "
@@ -7428,8 +7989,39 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml:437
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:439
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:445
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:454
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;, &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
#. type: Content of: <refentry><refmeta><manvolnum>
@@ -10141,6 +10733,171 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
msgid "Which will use the already fetched archives on the disc."
msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
+#~ msgid ""
+#~ "No action; perform a simulation of events that would occur but do not "
+#~ "actually change the system. Configuration Item: <literal>APT::Get::"
+#~ "Simulate</literal>."
+#~ msgstr ""
+#~ "Pas d'action ; simule les événements qui devraient se produire sans "
+#~ "effectuer de changement réel sur le système. Élément de configuration : "
+#~ "<literal>APT::Get::Simulate</literal>."
+
+#~ msgid ""
+#~ "Simulated runs performed as a user will automatically deactivate locking "
+#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
+#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
+#~ "notice will also be displayed indicating that this is only a simulation. "
+#~ "Runs performed as root do not trigger either NoLocking or the notice - "
+#~ "superusers should know what they are doing without further warnings from "
+#~ "<literal>apt-get</literal>."
+#~ msgstr ""
+#~ "Lorsque la simulation est effectuée par un utilisateur sans privilège, le "
+#~ "verrouillage sera désactivé automatiquement (<literal>Debug::NoLocking</"
+#~ "literal>). Une mention explicite indiquant qu'il s'agit d'une simple "
+#~ "simulation sera affichée si l'option <literal>APT::Get::Show-User-"
+#~ "Simulation-Note</literal> est activée (elle est active par défaut). Ni la "
+#~ "désactivation du verrou (NoLocking) ni l'affichage de la mention de "
+#~ "simulation ne seront déclenchées si la commande est lancée par "
+#~ "l'utilisateur root (pour qui il n'est pas jugé utile qu'<literal>apt-get</"
+#~ "literal> envoie de telles notifications)."
+
+#~ msgid ""
+#~ "Ignore if packages can't be authenticated and don't prompt about it. "
+#~ "This is useful for tools like pbuilder. Configuration Item: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+#~ msgstr ""
+#~ "Ignorer le fait que les paquets ne peuvent pas être authentifiés ; ne le "
+#~ "signale pas à l'utilisateur. Cette option est très utile pour certains "
+#~ "outils comme pbuilder. Élément de configuration : <literal>APT::Get::"
+#~ "AllowUnauthenticated</literal>."
+
+#~ msgid ""
+#~ "Version 2 of this protocol dumps more information, including the protocol "
+#~ "version, the APT configuration space and the packages, files and versions "
+#~ "being changed. Version 3 adds the architecture and <literal>MultiArch</"
+#~ "literal> flag to each version being dumped."
+#~ msgstr ""
+#~ "La deuxième version de ce protocole donne plus de renseignements : on "
+#~ "obtient la version du protocole, la configuration de APT et les paquets, "
+#~ "fichiers ou versions qui ont changé. La troisième version ajoute "
+#~ "l'architecture et le marqueur <literal>MultiArch</literal> à chaque "
+#~ "version déposée."
+
+#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr ""
+#~ "est affectée aux versions qui ne sont pas installées et qui "
+#~ "n'appartiennent pas à la distribution par défaut."
+
+#~ msgid ""
+#~ "Each line specifying a source starts with type (e.g. <literal>deb-src</"
+#~ "literal>) followed by options and arguments for this type. Individual "
+#~ "entries cannot be continued onto a following line. Empty lines are "
+#~ "ignored, and a <literal>#</literal> character anywhere on a line marks "
+#~ "the remainder of that line as a comment."
+#~ msgstr ""
+#~ "Chaque ligne qui indique une source commence par son type (p. ex. "
+#~ "<literal>deb-src</literal>), suivi d'options et paramètres pour ce type. "
+#~ "Les entrées individuelles ne peuvent pas être multilignes. Les lignes "
+#~ "vides sont ignorées et un caractère <literal>#</literal> sur une ligne "
+#~ "indique que le reste de la ligne est un commentaire."
+
+#~ msgid "deb [ options ] uri suite [component1] [component2] [...]"
+#~ msgstr "deb [ options ] uri suite [composant1] [composant2] [...]"
+
+#~ msgid ""
+#~ " Types: deb deb-src\n"
+#~ " URIs: http://example.com\n"
+#~ " Suites: stable testing\n"
+#~ " Sections: component1 component2\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ "\n"
+#~ " Types: deb\n"
+#~ " URIs: http://another.example.com\n"
+#~ " Suites: experimental\n"
+#~ " Sections: component1 component2\n"
+#~ " Enabled: no\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ " "
+#~ msgstr ""
+#~ " Types: deb deb-src\n"
+#~ " URIs: http://example.com\n"
+#~ " Suites: stable testing\n"
+#~ " Sections: component1 component2\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ "\n"
+#~ " Types: deb\n"
+#~ " URIs: http://another.example.com\n"
+#~ " Suites: experimental\n"
+#~ " Sections: composant1 composant2\n"
+#~ " Enabled: no\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ " "
+
+#~ msgid ""
+#~ "<literal>options</literal> is always optional and needs to be surrounded "
+#~ "by square brackets. It can consist of multiple settings in the form "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>. Multiple settings are separated by spaces. The "
+#~ "following settings are supported by APT (note however that unsupported "
+#~ "settings will be ignored silently):"
+#~ msgstr ""
+#~ "<literal>options</literal> est toujours optionnel et doit être entouré "
+#~ "par des crochets. It est constitué de réglages multiples sous la forme "
+#~ "<literal><replaceable>réglage</replaceable>=<replaceable>valeur</"
+#~ "replaceable></literal>. Des réglages multiples sont séparés par des "
+#~ "espaces. Les réglages suivants sont gérés par APT (des réglages non gérés "
+#~ "seront ignorés silencieusement) :"
+
+#~ msgid ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> which can be "
+#~ "used to add/remove architectures from the set which will be downloaded."
+#~ msgstr ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> et <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> qui peuvent "
+#~ "être utilisés pour ajouter ou supprimer des architectures dans l'ensemble "
+#~ "qui sera téléchargée."
+
+#~ msgid ""
+#~ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+#~ "this source are always authenticated even if the <filename>Release</"
+#~ "filename> file is not signed or the signature can't be checked. This "
+#~ "disables parts of &apt-secure; and should therefore only be used in a "
+#~ "local and trusted context. <literal>trusted=no</literal> is the opposite "
+#~ "which handles even correctly authenticated sources as not authenticated."
+#~ msgstr ""
+#~ "<literal>trusted=yes</literal> peut être utilisée pour indiquer que les "
+#~ "paquets issus de cette source doivent être authentifiés même si le "
+#~ "fichier <filename>Release</filename> n'est pas signé ou que la signature "
+#~ "ne peut pas être vérifiée. Cela désactive certaines parties d'&apt-"
+#~ "secure; et ne devrait donc être utilisé que dans un contexte local ou "
+#~ "sûr. <literal>trusted=no</literal> est l'opposé et considérera même les "
+#~ "sources correctement authentifiées comme non authentifiées."
+
+#~ msgid "Some examples:"
+#~ msgstr "Exemples :"
+
+#~ msgid ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+#~ msgstr ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+
#~ msgid "apt"
#~ msgstr "apt"
diff --git a/doc/po/it.po b/doc/po/it.po
index af5fa2914..ed3f82de7 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-03-10 09:48+0100\n"
+"POT-Creation-Date: 2015-08-21 06:12-0400\n"
"PO-Revision-Date: 2015-01-27 14:11+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -663,17 +663,15 @@ msgstr ""
#. type: Content of: <refentry><refmeta><manvolnum>
#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
-#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
-#: apt-config.8.xml:22
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21 apt-config.8.xml:22
msgid "8"
msgstr "8"
#. type: Content of: <refentry><refmeta><refmiscinfo>
#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
-#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
-#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
-#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
-#: apt-ftparchive.1.xml:23
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22 apt-config.8.xml:23
+#: apt.conf.5.xml:28 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23 apt-ftparchive.1.xml:23
msgid "APT"
msgstr "APT"
@@ -684,10 +682,9 @@ msgstr "interfaccia a riga di comando"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
-#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
-#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
-#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
-#: apt-ftparchive.1.xml:34
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33 apt-config.8.xml:34
+#: apt.conf.5.xml:37 apt_preferences.5.xml:32 sources.list.5.xml:32
+#: apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34 apt-ftparchive.1.xml:34
msgid "Description"
msgstr "Descrizione"
@@ -710,16 +707,17 @@ msgstr ""
msgid ""
"<literal>list</literal> is used to display a list of packages. It supports "
"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option> are supported."
+"<option>--installed</option>, <option>--upgradable</option>, <option>--"
+"upgradeable</option>, <option>--all-versions</option> are supported."
msgstr ""
"<literal>list</literal> viene usato per visualizzare un elenco di pacchetti. "
"Permette l'uso dei modelli di shell per la corrispondenza con nomi di "
"pacchetto e sono gestite le seguenti opzioni: <option>--installed</option>, "
-"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-versions</option>."
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
+"versions</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml:55
msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
@@ -728,7 +726,7 @@ msgstr ""
"pacchetti che corrispondono."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml:61
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
@@ -737,7 +735,7 @@ msgstr ""
"specificati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml:68
msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
@@ -746,7 +744,7 @@ msgstr ""
"desidera vengano installati o aggiornati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml:72 apt-get.8.xml:112
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -764,7 +762,7 @@ msgstr ""
"(stable, testing, unstable)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml:82 apt-get.8.xml:147
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note that removing a package "
@@ -778,8 +776,29 @@ msgstr ""
"Se viene aggiunto un segno più in fondo al nome del pacchetto (senza spazi "
"in mezzo), il pacchetto specificato viene installato invece che rimosso."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "alias since 1.1)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:90 apt-get.8.xml:228
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> viene usato per rimuovere i pacchetti che sono "
+"stati installati automaticamente per soddisfare delle dipendenze per altri "
+"pacchetti e che non sono più necessari."
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml:95
msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
@@ -788,7 +807,7 @@ msgstr ""
"sources.list e fornisce controlli di sanità di base."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml:101
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
@@ -797,7 +816,7 @@ msgstr ""
"indici dei pacchetti con le loro fonti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml:107
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -810,7 +829,7 @@ msgstr ""
"pacchetti verranno installati, ma quelli esistenti non saranno mai rimossi."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml:116
msgid ""
"<literal>full-upgrade</literal> performs the function of upgrade but may "
"also remove installed packages if that is required in order to resolve a "
@@ -821,19 +840,19 @@ msgstr ""
"risolvere un conflitto tra pacchetti."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt.8.xml:126 apt-get.8.xml:262 apt-cache.8.xml:246 apt-mark.8.xml:104
#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
#: apt-ftparchive.1.xml:500
msgid "options"
msgstr "opzioni"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
+#: apt.8.xml:136
msgid "Script usage"
msgstr "Uso di script"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml:138
msgid ""
"The &apt; commandline is designed as a end-user tool and it may change the "
"output between versions. While it tries to not break backward compatibility "
@@ -849,12 +868,12 @@ msgstr ""
"negli script."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
+#: apt.8.xml:146
msgid "Differences to &apt-get;"
msgstr "Differenze con &apt-get;"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
+#: apt.8.xml:147
msgid ""
"The <command>apt</command> command is meant to be pleasant for end users and "
"does not need to be backward compatible like &apt-get;. Therefore some "
@@ -865,17 +884,17 @@ msgstr ""
"&apt-get;. Perciò alcune opzioni sono diverse:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
+#: apt.8.xml:153
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
msgstr "L'opzione <literal>DPkg::Progress-Fancy</literal> è abilitata."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:157
msgid "The option <literal>APT::Color</literal> is enabled."
msgstr "L'opzione <literal>APT::Color</literal> è abilitata."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:161
msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
@@ -884,7 +903,7 @@ msgstr ""
"<literal>dpkg --list</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml:166
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
"enabled by default."
@@ -893,16 +912,16 @@ msgstr ""
"abilitato in modo predefinito."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt.8.xml:176 apt-get.8.xml:597 apt-cache.8.xml:359 apt-key.8.xml:191
#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
-#: apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701
-#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-config.8.xml:105 apt.conf.5.xml:1319 apt_preferences.5.xml:716
+#: sources.list.5.xml:453 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
#: apt-ftparchive.1.xml:603
msgid "See Also"
msgstr "Vedere anche"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml:177
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
@@ -911,14 +930,14 @@ msgstr ""
"dell'utente di APT in &guidesdir;, &apt-preferences;, l'APT Howto."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt.8.xml:182 apt-get.8.xml:603 apt-cache.8.xml:364 apt-mark.8.xml:131
#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "Diagnostics"
msgstr "Diagnostica"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml:183
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1290,28 +1309,23 @@ msgstr ""
"impedisce che vengano eliminati i pacchetti installati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
-msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
-msgstr ""
-"<literal>autoremove</literal> viene usato per rimuovere i pacchetti che sono "
-"stati installati automaticamente per soddisfare delle dipendenze per altri "
-"pacchetti e che non sono più necessari."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:233
-msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu). By default it displays the changelog for the version that is "
-"installed. However, you can specify the same options as for the "
-"<option>install</option> command."
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
+#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
+#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "changelogs</ulink> for Ubuntu). By default it displays the changelog for "
+#| "the version that is installed. However, you can specify the same options "
+#| "as for the <option>install</option> command."
+msgid ""
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>. By default it "
+"displays the changelog for the version that is installed. However, you can "
+"specify the same options as for the <option>install</option> command."
msgstr ""
"<literal>changelog</literal> scarica il changelog di un pacchetto e lo "
"visualizza usando <command>sensible-pager</command>. Il nome e la directory "
@@ -1324,7 +1338,21 @@ msgstr ""
"opzioni del comando <option>install</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml:243
+msgid ""
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:267
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1334,7 +1362,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml:272
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -1343,7 +1371,7 @@ msgstr ""
"Voce di configurazione:<literal>APT::Install-Suggests</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:277
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1353,7 +1381,7 @@ msgstr ""
"Download-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:282
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -1381,7 +1409,7 @@ msgstr ""
"configurazione: <literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml:297
msgid ""
"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -1401,7 +1429,7 @@ msgstr ""
"configurazione: <literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -1412,7 +1440,7 @@ msgstr ""
"scaricato. Voce di configurazione: <literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:315
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1432,37 +1460,21 @@ msgstr ""
"qualcosa di inatteso. Voce di configurazione: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:330
msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system. Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-"Nessuna azione; effettua una simulazione degli eventi che si "
-"verificherebbero, ma non cambia realmente il sistema. Voce di "
-"configurazione: <literal>APT::Get::Simulate</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
-msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>) so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation. A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>). Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."
msgstr ""
-"Le esecuzioni simulate effettuate da un utente disattivano automaticamente "
-"il lock (<literal>Debug::NoLocking</literal>) e se è impostata l'opzione "
-"<literal>APT::Get::Show-User-Simulation-Note</literal> (come predefinito), "
-"viene anche visualizzato un messaggio che indica che quella fatta è solo una "
-"simulazione. Le esecuzioni effettuate da root non attivano né NoLocking né i "
-"messaggi: i superutenti dovrebbero sapere ciò che stanno facendo senza "
-"bisogno di ulteriori avvertimenti da <literal>apt-get</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:340
msgid ""
"Simulated runs print out a series of lines, each representing a "
"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1478,7 +1490,7 @@ msgstr ""
"hanno conseguenze (rari)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:348
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -1495,7 +1507,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:356
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
"Assume-No</literal>."
@@ -1504,7 +1516,7 @@ msgstr ""
"<literal>APT::Get::Assume-No</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:361
msgid ""
"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1514,7 +1526,7 @@ msgstr ""
"Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:367
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -1523,7 +1535,7 @@ msgstr ""
"configurazione: <literal>APT::Get::Show-Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:373
msgid ""
"This option controls the architecture packages are built for by <command>apt-"
"get source --compile</command> and how cross-builddependencies are "
@@ -1540,7 +1552,7 @@ msgstr ""
"di configurazione: <literal>APT::Get::Host-Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml:383
msgid ""
"This option controls the activated build profiles for which a source package "
"is built by <command>apt-get source --compile</command> and how build "
@@ -1556,7 +1568,7 @@ msgstr ""
"configurazione: <literal>APT::Build-Profiles</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:394
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -1565,7 +1577,7 @@ msgstr ""
"<literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml:399
msgid ""
"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -1578,7 +1590,7 @@ msgstr ""
"non desiderati. Voce di configurazione: <literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml:406
msgid ""
"Allow installing new packages when used in conjunction with "
"<literal>upgrade</literal>. This is useful if the update of a installed "
@@ -1597,7 +1609,7 @@ msgstr ""
"Voce di configurazione: <literal>APT::Get::Upgrade-Allow-New</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:418
msgid ""
"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1610,7 +1622,7 @@ msgstr ""
"configurazione: <literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:425
msgid ""
"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1624,13 +1636,90 @@ msgstr ""
"Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml:433
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+"Forza «sì»; questa è un'opzione pericolosa che fa sì che apt, se sta facendo "
+"qualcosa di potenzialmente pericoloso, continui senza chiedere "
+"l'autorizzazione all'utente. Non dovrebbe essere usata se non in situazioni "
+"molto particolari. L'uso di <literal>force-yes</literal> può potenzialmente "
+"distruggere il sistema. Voce di configurazione: <literal>APT::Get::force-"
+"yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+"Forza «sì»; questa è un'opzione pericolosa che fa sì che apt, se sta facendo "
+"qualcosa di potenzialmente pericoloso, continui senza chiedere "
+"l'autorizzazione all'utente. Non dovrebbe essere usata se non in situazioni "
+"molto particolari. L'uso di <literal>force-yes</literal> può potenzialmente "
+"distruggere il sistema. Voce di configurazione: <literal>APT::Get::force-"
+"yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+"Forza «sì»; questa è un'opzione pericolosa che fa sì che apt, se sta facendo "
+"qualcosa di potenzialmente pericoloso, continui senza chiedere "
+"l'autorizzazione all'utente. Non dovrebbe essere usata se non in situazioni "
+"molto particolari. L'uso di <literal>force-yes</literal> può potenzialmente "
+"distruggere il sistema. Voce di configurazione: <literal>APT::Get::force-"
+"yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:457
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
msgid ""
"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
-"<literal>APT::Get::force-yes</literal>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."
msgstr ""
"Forza «sì»; questa è un'opzione pericolosa che fa sì che apt, se sta facendo "
"qualcosa di potenzialmente pericoloso, continui senza chiedere "
@@ -1640,7 +1729,7 @@ msgstr ""
"yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:465
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected MD5 "
@@ -1661,7 +1750,7 @@ msgstr ""
"configurazione: <literal>APT::Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:476
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1674,7 +1763,7 @@ msgstr ""
"option>. Voce di configurazione: <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:484
msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1683,7 +1772,7 @@ msgstr ""
"configurazione: <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:489
msgid ""
"This option is on by default; use <literal>--no-list-cleanup</literal> to "
"turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1700,7 +1789,7 @@ msgstr ""
"fonti. Voce di configurazione: <literal>APT::Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:499
msgid ""
"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -1724,7 +1813,7 @@ msgstr ""
"pagina di manuale di &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:514
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1738,7 +1827,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml:521
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1748,7 +1837,7 @@ msgstr ""
"Get::Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:527
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running the <literal>autoremove</"
@@ -1762,7 +1851,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml:534
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -1781,7 +1870,7 @@ msgstr ""
"configurazione: <literal>APT::Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:545
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1792,7 +1881,7 @@ msgstr ""
"Dsc-Only</literal> e <literal>APT::Get::Tar-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:551
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -1801,18 +1890,18 @@ msgstr ""
"Voce di configurazione: <literal>APT::Get::Arch-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:556
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
-"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself. "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override. Configuration Item: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
-"Ignora se i pacchetti non possono essere autenticati e non chiedere "
-"all'utente cosa fare. È utile per strumenti come pbuilder. Voce di "
-"configurazione: <literal>APT::Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:566
msgid ""
"Forbid the update command to acquire unverifiable data from configured "
"sources. Apt will fail at the update command for repositories without valid "
@@ -1821,7 +1910,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1837,13 +1926,13 @@ msgstr ""
"Fancy</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
-#: apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml:587 apt-cache.8.xml:352 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1313 apt_preferences.5.xml:709
msgid "Files"
msgstr "File"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1854,7 +1943,7 @@ msgstr ""
"l'APT Howto."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml:604
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1891,9 +1980,9 @@ msgstr ""
"essa manca o non è aggiornata."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
-#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
-#: apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml:49 apt-cache.8.xml:137 apt-cache.8.xml:161
+#: apt-cache.8.xml:183 apt-cache.8.xml:188 apt-cache.8.xml:204
+#: apt-cache.8.xml:222 apt-cache.8.xml:234
msgid "&synopsis-pkg;"
msgstr "&synopsis-pkg;"
@@ -2057,10 +2146,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:124
+#, fuzzy
+#| msgid ""
+#| "<literal>Total distinct</literal> versions is the number of package "
+#| "versions found in the cache; this value is therefore at least equal to "
+#| "the number of total package names. If more than one distribution is being "
+#| "accessed (for instance, \"stable\" and \"unstable\"), this value can be "
+#| "considerably larger than the number of total package names."
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
"instance, \"stable\" and \"unstable\"), this value can be considerably "
"larger than the number of total package names."
msgstr ""
@@ -2071,7 +2166,7 @@ msgstr ""
"essere decisamente più grande del numero dei nomi totali di pacchetto."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:130
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
@@ -2080,11 +2175,17 @@ msgstr ""
"dichiarate da tutti i pacchetti nella cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:138
+#, fuzzy
+#| msgid ""
+#| "<literal>showsrc</literal> displays all the source package records that "
+#| "match the given package names. All versions are shown, as well as all "
+#| "records that declare the name to be a binary package."
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."
msgstr ""
"<literal>showsrc</literal> mostra tutti i pacchetti sorgente che "
"corrispondono ai nomi dei pacchetti specificati. Vengono mostrate tutte le "
@@ -2092,7 +2193,7 @@ msgstr ""
"pacchetto binario."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:147
msgid ""
"<literal>dump</literal> shows a short listing of every package in the cache. "
"It is primarily for debugging."
@@ -2101,7 +2202,7 @@ msgstr ""
"cache. Serve soprattutto a scopo di debug."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml:152
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2110,7 +2211,7 @@ msgstr ""
"stdout. Questa è adatta all'uso con &dpkg; ed è usata dal metodo &dselect;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml:157
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
@@ -2119,7 +2220,7 @@ msgstr ""
"soddisfatte nella cache dei pacchetti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml:162
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg --print-"
"avail</command>; it displays the package records for the named packages."
@@ -2128,12 +2229,22 @@ msgstr ""
"avail</command>; mostra i record dei pacchetti per i pacchetti specificati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:167
msgid "&synopsis-regex;"
msgstr "&synopsis-regex;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:168
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see &regex;. It "
+#| "searches the package names and the descriptions for an occurrence of the "
+#| "regular expression and prints out the package name and the short "
+#| "description, including virtual package names. If <option>--full</option> "
+#| "is given then output identical to <literal>show</literal> is produced for "
+#| "each matched package, and if <option>--names-only</option> is given then "
+#| "the long description is not searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see &regex;. It searches "
@@ -2142,7 +2253,7 @@ msgid ""
"including virtual package names. If <option>--full</option> is given then "
"output identical to <literal>show</literal> is produced for each matched "
"package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."
msgstr ""
"<literal>search</literal> esegue una ricerca completa a tutto testo in tutti "
"gli elenchi di pacchetti disponibili cercando il modello di espressione "
@@ -2156,7 +2267,7 @@ msgstr ""
"descrizione lunga."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:179
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -2165,7 +2276,7 @@ msgstr ""
"che vengono combinati con un AND."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:184
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -2175,7 +2286,7 @@ msgstr ""
"dipendenza."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:189
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -2184,12 +2295,12 @@ msgstr ""
"di un pacchetto."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:193
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:194
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -2204,7 +2315,7 @@ msgstr ""
"viene usato al meglio con l'opzione <option>--generate</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:199
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -2215,7 +2326,7 @@ msgstr ""
"virtuali sono anch'essi compresi nell'elenco generato."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:205
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2237,7 +2348,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml:214
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2251,14 +2362,14 @@ msgstr ""
"blu sono pre-dipendenze, le linee verdi sono conflitti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:219
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
"Attenzione: dotty non può creare i grafi degli insiemi più grandi di "
"pacchetti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:223
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2268,12 +2379,12 @@ msgstr ""
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:227
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:228
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -2286,7 +2397,7 @@ msgstr ""
"di priorità del pacchetto indicato."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml:235
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -2305,7 +2416,7 @@ msgstr ""
"elenchi dei pacchetti (<literal>APT::Architecture</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:251
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -2316,7 +2427,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:257
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2332,7 +2443,7 @@ msgstr ""
"configurazione: <literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:265
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2346,7 +2457,7 @@ msgstr ""
"configurazione. Voce di configurazione: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:272
msgid ""
"Print only important dependencies; for use with <literal>unmet</literal> and "
"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2358,9 +2469,16 @@ msgstr ""
"Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml:286
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be tweaked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
@@ -2373,7 +2491,19 @@ msgstr ""
"literal>, ad es. <literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:294
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data. A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture. Configuration Item: <literal>APT::Cache::ShowImplicit</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:304
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -2382,7 +2512,7 @@ msgstr ""
"configurazione: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:309
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -2400,7 +2530,7 @@ msgstr ""
"AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml:318
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2412,16 +2542,20 @@ msgstr ""
"<literal>APT::Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:324
+#, fuzzy
+#| msgid ""
+#| "Only search on the package names, not the long descriptions. "
+#| "Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgid ""
-"Only search on the package names, not the long descriptions. Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
"Cerca soltanto nei nomi dei pacchetti, non nelle descrizioni lunghe. Voce di "
"configurazione: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:329
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -2432,7 +2566,7 @@ msgstr ""
"<literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -2443,7 +2577,7 @@ msgstr ""
"configurazione: <literal>APT::Cache::RecurseDepends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:342
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -2454,12 +2588,12 @@ msgstr ""
"Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:360
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:365
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3937,6 +4071,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:295
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true, as giving a Release file's "
+#| "validation an expiration date prevents replay attacks over a long "
+#| "timescale, and can also for example help users to identify mirrors that "
+#| "are no longer updated - but the feature depends on the correctness of the "
+#| "clock on the user system. Archive maintainers are encouraged to create "
+#| "Release files with the <literal>Valid-Until</literal> header, but if they "
+#| "don't or a stricter value is desired the <literal>Max-ValidTime</literal> "
+#| "option below can be used."
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3945,7 +4089,9 @@ msgid ""
"user system. Archive maintainers are encouraged to create Release files with "
"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
"value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used. The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
msgstr ""
"Opzione relativa alla sicurezza attiva in modo predefinito, poiché dare una "
"data di scadenza alla convalida di un file Release evita attacchi ripetuti "
@@ -3958,7 +4104,16 @@ msgstr ""
"ValidTime</literal> seguente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:308
+#: apt.conf.5.xml:310
+#, fuzzy
+#| msgid ""
+#| "Maximum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. If the Release file itself includes a "
+#| "<literal>Valid-Until</literal> header the earlier date of the two is used "
+#| "as the expiration date. The default value is <literal>0</literal> which "
+#| "stands for \"valid forever\". Archive specific settings can be made by "
+#| "appending the label of the archive to the option name."
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3966,7 +4121,9 @@ msgid ""
"<literal>Valid-Until</literal> header the earlier date of the two is used as "
"the expiration date. The default value is <literal>0</literal> which stands "
"for \"valid forever\". Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."
msgstr ""
"Tempo massimo (in secondi) dalla sua creazione (come indicata "
"dall'intestazione <literal>Date</literal>) per il quale il file "
@@ -3978,7 +4135,16 @@ msgstr ""
"dell'archivio in fondo al nome dell'opzione."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml:323
+#, fuzzy
+#| msgid ""
+#| "Minimum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. Use this if you need to use a seldom "
+#| "updated (local) mirror of a more frequently updated archive with a "
+#| "<literal>Valid-Until</literal> header instead of completely disabling the "
+#| "expiration date checking. Archive specific settings can and should be "
+#| "used by appending the label of the archive to the option name."
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3986,7 +4152,9 @@ msgid ""
"(local) mirror of a more frequently updated archive with a <literal>Valid-"
"Until</literal> header instead of completely disabling the expiration date "
"checking. Archive specific settings can and should be used by appending the "
-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."
msgstr ""
"Tempo minimo (in secondi) dalla sua creazione (come indicata "
"dall'intestazione <literal>Date</literal>) per il quale il file "
@@ -3998,7 +4166,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:332
+#: apt.conf.5.xml:336
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -4009,7 +4177,7 @@ msgstr ""
"interamente i nuovi. Attiva in modo predefinito."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:339
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 "
@@ -4027,7 +4195,7 @@ msgstr ""
"completo invece delle patch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:349
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4042,7 +4210,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:353
+#: apt.conf.5.xml:357
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -4052,7 +4220,7 @@ msgstr ""
"ha avuto successo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:358
+#: apt.conf.5.xml:362
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."
@@ -4063,7 +4231,7 @@ msgstr ""
"vero."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:367
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]/</"
@@ -4082,7 +4250,7 @@ msgstr ""
"la variabile d'ambiente <envar>http_proxy</envar>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:375
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 "
@@ -4102,7 +4270,7 @@ msgstr ""
"file .deb."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381 apt.conf.5.xml:469
+#: apt.conf.5.xml:385 apt.conf.5.xml:473
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."
@@ -4112,7 +4280,7 @@ msgstr ""
"quello per i dati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:384
+#: apt.conf.5.xml:388
#, fuzzy
#| msgid ""
#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
@@ -4141,7 +4309,7 @@ msgstr ""
"con la specifica HTTP/1.1."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:395
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -4150,7 +4318,7 @@ msgstr ""
"meno le ridirezioni che sono abilitate in modo predefinito."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml:398
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes per second. The default "
@@ -4165,7 +4333,7 @@ msgstr ""
"scaricamento da più server contemporaneamente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:405
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 "
@@ -4177,7 +4345,7 @@ msgstr ""
"conosciuto."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:409
msgid ""
"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
"an external command to discover the http proxy to use. Apt expects the "
@@ -4200,7 +4368,7 @@ msgstr ""
"sull'opzione col nome obsoleto <literal>ProxyAutoDetect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:427
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4217,7 +4385,7 @@ msgstr ""
"<literal>Pipeline-Depth</literal> non è ancora supportata."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:435
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4258,7 +4426,7 @@ msgstr ""
"literal> è la corrispondente opzione specifica per ciascun host."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:456
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]/</"
@@ -4292,7 +4460,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: apt.conf.5.xml:476
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, "
@@ -4308,7 +4476,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:479
+#: apt.conf.5.xml:483
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 "
@@ -4322,7 +4490,7 @@ msgstr ""
"a causa della sua bassa efficienza."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:488
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4338,13 +4506,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:498
+#: apt.conf.5.xml:502
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"pippo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:497
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4366,7 +4534,7 @@ msgstr ""
"comandi per lo smontaggio possono essere specificati usando UMount."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:510
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4375,13 +4543,13 @@ msgstr ""
"literal>, che passa parametri aggiuntivi a gpgv."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:521
#, 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:512
+#: apt.conf.5.xml:516
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4400,19 +4568,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:522
+#: apt.conf.5.xml:526
#, 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:525
+#: apt.conf.5.xml:529
#, 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:518
+#: apt.conf.5.xml:522
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 "
@@ -4443,13 +4611,13 @@ msgstr ""
"all'elenco, dato che verrà aggiunto automaticamente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:536
#, 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:527
+#: apt.conf.5.xml:531
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4475,7 +4643,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:537
+#: apt.conf.5.xml:541
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4487,7 +4655,7 @@ msgstr ""
"soprattutto per i mirror locali."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:548
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4501,7 +4669,7 @@ msgstr ""
"modo predefinito è disabilitato."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:556
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4520,13 +4688,13 @@ msgstr ""
"codici di lingua lunghi sono particolarmente rari."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:573
#, 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:557
+#: apt.conf.5.xml:561
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4565,7 +4733,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:574
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4579,24 +4747,32 @@ msgstr ""
"implicito)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:583
msgid "When downloading, force to use only the IPv4 protocol."
msgstr "Durante gli scaricamenti, forza l'uso del solo protocollo IPv4."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:589
msgid "When downloading, force to use only the IPv6 protocol."
msgstr "Durante gli scaricamenti, forza l'uso del solo protocollo IPv6."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:595
msgid ""
"The maximum file size of Release/Release.gpg/InRelease files. The default "
"is 10MB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:602
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to. The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:611
msgid ""
"Allow the update operation to load data files from a repository without a "
"trusted signature. If enabled this option no data files will be loaded and "
@@ -4605,7 +4781,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:622
msgid ""
"Allow that a repository that was previously gpg signed to become unsigned "
"durign a update operation. When there is no valid signature of a perviously "
@@ -4615,13 +4791,46 @@ msgid ""
"source untrusted and warn about them if you try to install them."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:634
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:636
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them. Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>. The value should be a "
+"normal URI to a text file, expect that package specific data is replaced "
+"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"if the package is from a component (e.g. <literal>main</literal>) this is "
+"the first part otherwise it is omitted, 2. the first letter of source "
+"package name, expect if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version. "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>') and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>'). The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:664
msgid "Directories"
msgstr "Directory"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:666
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4641,7 +4850,7 @@ msgstr ""
"<filename>/</filename> o <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:673
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4665,7 +4874,7 @@ msgstr ""
"predefinita è contenuta in <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:683
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4680,7 +4889,7 @@ msgstr ""
"configurazione specificato da <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:689
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 "
@@ -4691,7 +4900,7 @@ msgstr ""
"termine viene caricato il file di configurazione principale."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:693
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4708,16 +4917,26 @@ msgstr ""
"specificano la posizione dei rispettivi programmi."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:701
+#, fuzzy
+#| msgid ""
+#| "The configuration item <literal>RootDir</literal> has a special meaning. "
+#| "If set, all paths in <literal>Dir::</literal> will be relative to "
+#| "<literal>RootDir</literal>, <emphasis>even paths that are specified "
+#| "absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> "
+#| "is set to <filename>/tmp/staging</filename> and <literal>Dir::State::"
+#| "status</literal> is set to <filename>/var/lib/dpkg/status</filename>, "
+#| "then the status file will be looked up in <filename>/tmp/staging/var/lib/"
+#| "dpkg/status</filename>."
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>. So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>. If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."
msgstr ""
"La voce di configurazione <literal>RootDir</literal> ha un significato "
"speciale. Se impostata, tutti i percorsi in <literal>Dir::</literal> saranno "
@@ -4729,7 +4948,7 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:715
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 "
@@ -4747,12 +4966,12 @@ msgstr ""
"questi modelli possono usare una sintassi con espressioni regolari."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:724
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:726
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4763,7 +4982,7 @@ msgstr ""
"sezione <literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:731
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4785,7 +5004,7 @@ msgstr ""
"scaricare i nuovi pacchetti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:745
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4795,7 +5014,7 @@ msgstr ""
"installazione."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:750
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4805,7 +5024,7 @@ msgstr ""
"aggiornamento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:755
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4815,12 +5034,12 @@ msgstr ""
"solo in caso di errore."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:761
msgid "How APT calls &dpkg;"
msgstr "Come APT invoca &dpkg;"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:762
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4829,7 +5048,7 @@ msgstr ""
"&dpkg;; sono nella sezione <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:767
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 "
@@ -4840,7 +5059,7 @@ msgstr ""
"passata a &dpkg; come un singolo argomento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:773
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 "
@@ -4853,7 +5072,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:739
+#: apt.conf.5.xml:780
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 "
@@ -4871,21 +5090,51 @@ msgstr ""
"lo standard input."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:787
msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:792
+msgid ""
+"Each configuration directive line has the form <literal>key=value</"
+"literal>. Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:800
+msgid ""
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:810
+msgid ""
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
+"\" is an incorrect typename which is just kept to remain compatible, it "
+"should be read as \"no\" and users are encouraged to support both."
msgstr ""
-"La versione 2 di questo protocollo fa il dump di più informazioni, inclusi "
-"la versione del protocollo, lo spazio di configurazione di APT, e i "
-"pacchetti, file e versioni che vengono modificati. La versione 3 aggiunge "
-"l'architettura e il contrassegno <literal>MultiArch</literal> per ciascuna "
-"versione di cui viene fatto il dump."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:816
msgid ""
"The version of the protocol to be used for the command "
"<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4902,7 +5151,7 @@ msgstr ""
"l'informazione nella versione più alta per cui ha il supporto."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:823
msgid ""
"The file descriptor to be used to send the information can be requested with "
"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4920,7 +5169,7 @@ msgstr ""
"file usato per conferma."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:833
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4929,7 +5178,7 @@ msgstr ""
"valore predefinito è <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:838
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4939,12 +5188,12 @@ msgstr ""
"binari."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:843
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:779
+#: apt.conf.5.xml:844
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 "
@@ -4972,7 +5221,7 @@ msgstr ""
"pacchetti."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:859
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4986,7 +5235,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:853
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 "
@@ -5010,7 +5259,7 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:866
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 "
@@ -5032,7 +5281,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:809
+#: apt.conf.5.xml:874
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -5062,7 +5311,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:824
+#: apt.conf.5.xml:889
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5080,7 +5329,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:831
+#: apt.conf.5.xml:896
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -5096,7 +5345,7 @@ msgstr ""
"necessari per configurare il pacchetto in questione."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:909
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5114,7 +5363,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:902
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 "
@@ -5139,12 +5388,12 @@ msgstr ""
"con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:922
msgid "Periodic and Archives options"
msgstr "Opzioni Periodic e Archives"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:923
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -5158,12 +5407,12 @@ msgstr ""
"all'inizio dello script."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:931
msgid "Debug options"
msgstr "Opzioni di debug"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:933
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5181,7 +5430,7 @@ msgstr ""
"esserlo:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:944
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5192,7 +5441,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:952
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5203,7 +5452,7 @@ msgstr ""
"install</literal>) come utente non root."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:961
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5215,7 +5464,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:904
+#: apt.conf.5.xml:969
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -5224,37 +5473,37 @@ msgstr ""
"negli ID dei CD-ROM."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:914
+#: apt.conf.5.xml:979
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:923
+#: apt.conf.5.xml:988
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:934
+#: apt.conf.5.xml:999
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:945
+#: apt.conf.5.xml:1010
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:956
+#: apt.conf.5.xml:1021
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:967
+#: apt.conf.5.xml:1032
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -5263,7 +5512,7 @@ msgstr ""
"usando <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:978
+#: apt.conf.5.xml:1043
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -5272,14 +5521,14 @@ msgstr ""
"pacchetti memorizzati su CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:988
+#: apt.conf.5.xml:1053
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:998
+#: apt.conf.5.xml:1063
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -5288,7 +5537,7 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1008
+#: apt.conf.5.xml:1073
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 "
@@ -5299,7 +5548,7 @@ msgstr ""
"system del CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1084
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."
@@ -5309,14 +5558,14 @@ msgstr ""
"contemporaneamente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1031
+#: apt.conf.5.xml:1096
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:1041
+#: apt.conf.5.xml:1106
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -5325,7 +5574,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:1051
+#: apt.conf.5.xml:1116
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -5335,7 +5584,7 @@ msgstr ""
"diff."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1063
+#: apt.conf.5.xml:1128
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -5345,7 +5594,7 @@ msgstr ""
"invece degli indici completi."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1074
+#: apt.conf.5.xml:1139
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -5353,7 +5602,7 @@ msgstr ""
"realmente gli scaricamenti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1085
+#: apt.conf.5.xml:1150
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5362,7 +5611,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:1095
+#: apt.conf.5.xml:1160
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5378,7 +5627,7 @@ msgstr ""
"pkgProblemResolver</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml:1174
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5410,7 +5659,7 @@ msgstr ""
"sezione in cui compare il pacchetto."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1130
+#: apt.conf.5.xml:1195
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5419,7 +5668,7 @@ msgstr ""
"gli argomenti separati da un singolo carattere di spazio."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1141
+#: apt.conf.5.xml:1206
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5428,7 +5677,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:1152
+#: apt.conf.5.xml:1217
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5437,7 +5686,7 @@ msgstr ""
"literal> deve passare i pacchetti a &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1164
+#: apt.conf.5.xml:1229
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5445,12 +5694,12 @@ msgstr ""
"nell'invocazione di &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1240
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:1185
+#: apt.conf.5.xml:1250
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5460,7 +5709,7 @@ msgstr ""
"dipendenze)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1196
+#: apt.conf.5.xml:1261
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 "
@@ -5471,7 +5720,7 @@ msgstr ""
"la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1208
+#: apt.conf.5.xml:1273
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5480,7 +5729,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml:1283
msgid ""
"Display the external commands that are called by apt hooks. This includes e."
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5491,13 +5740,13 @@ msgstr ""
"Invoke</literal> o <literal>APT::Update::{Pre,Post}-Invoke</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt.conf.5.xml:1307 apt_preferences.5.xml:556 sources.list.5.xml:358
#: apt-ftparchive.1.xml:592
msgid "Examples"
msgstr "Esempi"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml:1308
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5507,7 +5756,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml:1320
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5712,12 +5961,12 @@ msgstr "priorità 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:118
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that do not belong to the target release."
msgstr ""
-"alle versioni che non sono installate e non appartengono al rilascio "
-"obiettivo."
+"alle versioni che non sono installate e appartengono al rilascio obiettivo."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:122
@@ -5726,13 +5975,22 @@ msgstr "priorità 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:123
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
msgstr ""
"alle versioni che non sono installate e appartengono al rilascio obiettivo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:127
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:131
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5750,7 +6008,7 @@ msgstr ""
"contrassegnate come «ButAutomaticUpgrades: yes»."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml:138
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -5759,7 +6017,7 @@ msgstr ""
"seguenti regole, elencate in ordine di precedenza."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml:141
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5776,12 +6034,12 @@ msgstr ""
"rischioso.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid "Install the highest priority version."
msgstr "Installa la versione con la priorità più alta."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:148
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -5790,7 +6048,7 @@ msgstr ""
"recente (cioè quella con il numero di versione più alto)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml:151
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5802,7 +6060,7 @@ msgstr ""
"non installata."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:157
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5818,7 +6076,7 @@ msgstr ""
"upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:164
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5832,7 +6090,7 @@ msgstr ""
"upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5851,12 +6109,12 @@ msgstr ""
"priorità più alta di quella installata."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:178
msgid "The Effect of APT Preferences"
msgstr "L'effetto delle preferenze di APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:180
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5869,7 +6127,7 @@ msgstr ""
"due forme: una forma specifica e una forma generica."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:186
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages with a specified version or version range. For example, "
@@ -5886,7 +6144,7 @@ msgstr ""
"spazi."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5898,7 +6156,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:199
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5913,7 +6171,7 @@ msgstr ""
"identificato in base al suo nome di dominio pienamente qualificato."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:205
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5924,7 +6182,7 @@ msgstr ""
"priorità alta a tutte le versioni di pacchetto disponibili dal sito locale."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:210
#, no-wrap
msgid ""
"Package: *\n"
@@ -5936,7 +6194,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml:215
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
"which can be used to match a hostname. The following record will assign a "
@@ -5949,7 +6207,7 @@ msgstr ""
"identificato dal nome host «ftp.de.debian.org»"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:219
#, no-wrap
msgid ""
"Package: *\n"
@@ -5961,7 +6219,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:223
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -5976,7 +6234,7 @@ msgstr ""
"«Ximian»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml:228
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5987,7 +6245,7 @@ msgstr ""
"archivio è «<literal>unstable</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:232
#, no-wrap
msgid ""
"Package: *\n"
@@ -5999,7 +6257,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:237
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -6010,7 +6268,7 @@ msgstr ""
"codice è «<literal>&testing-codename;</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
#, no-wrap
msgid ""
"Package: *\n"
@@ -6022,7 +6280,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6034,7 +6292,7 @@ msgstr ""
"«<literal>&stable-version;</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, no-wrap
msgid ""
"Package: *\n"
@@ -6045,14 +6303,23 @@ msgstr ""
"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:258
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
# &glob; è rimpiazzato da "glob(7)"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
msgid "Regular expressions and &glob; syntax"
msgstr "Sintassi per le espressioni regolari e &glob;"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:268
msgid ""
"APT also supports pinning by &glob; expressions, and regular expressions "
"surrounded by slashes. For example, the following example assigns the "
@@ -6068,7 +6335,7 @@ msgstr ""
"POSIX racchiusa tra sbarre)."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
@@ -6080,7 +6347,7 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6091,7 +6358,7 @@ msgstr ""
"provenienti da un rilascio il cui nome inizia con &ubuntu-codename;."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
#, no-wrap
msgid ""
"Package: *\n"
@@ -6103,7 +6370,7 @@ msgstr ""
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
@@ -6122,12 +6389,12 @@ msgstr ""
"non viene considerato come un'espressione &glob;."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid "How APT Interprets Priorities"
msgstr "Come APT interpreta le priorità"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:314
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking):"
@@ -6137,12 +6404,12 @@ msgstr ""
"seguente (semplificando le cose):"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:319
msgid "P &gt;= 1000"
msgstr "P &gt;= 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -6151,12 +6418,12 @@ msgstr ""
"retrocessione del pacchetto"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml:324
msgid "990 &lt;= P &lt; 1000"
msgstr "990 &lt;= P &lt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -6165,12 +6432,12 @@ msgstr ""
"obiettivo, a meno che la versione installata non sia più recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:330
msgid "500 &lt;= P &lt; 990"
msgstr "500 &lt;= P &lt; 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:331
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -6180,12 +6447,12 @@ msgstr ""
"sia più recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "100 &lt;= P &lt; 500"
msgstr "100 &lt;= P &lt; 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:337
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -6195,12 +6462,12 @@ msgstr ""
"installata non sia più recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:342
msgid "0 &lt; P &lt; 100"
msgstr "0 &lt; P &lt; 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:343
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -6209,22 +6476,40 @@ msgstr ""
"è installata"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:347
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:348
msgid "prevents the version from being installed"
msgstr "impedisce l'installazione della versione"
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:351
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:352
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
-msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version. Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+#: apt_preferences.5.xml:358
+#, fuzzy
+#| msgid ""
+#| "If any specific-form records match an available package version then the "
+#| "first such record determines the priority of the package version. "
+#| "Failing that, if any general-form records match an available package "
+#| "version then the first such record determines the priority of the package "
+#| "version."
+msgid ""
+"The first specific-form record matching an available package version "
+"determines the priority of the package version. Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version. Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
msgstr ""
"Se almeno un record in forma specifica corrisponde ad una versione di "
"pacchetto disponibile, allora il primo di questi record determina la "
@@ -6234,7 +6519,7 @@ msgstr ""
"versione del pacchetto."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:366
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -6243,7 +6528,7 @@ msgstr ""
"record descritti in precedenza:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:370
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6271,12 +6556,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:383
msgid "Then:"
msgstr "Allora:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6291,7 +6576,7 @@ msgstr ""
"installata è &bad-perl;*, allora <literal>perl</literal> verrà retrocesso."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:390
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6302,7 +6587,7 @@ msgstr ""
"versioni, incluse quelle che appartengono al rilascio obiettivo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:394
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6316,13 +6601,13 @@ msgstr ""
"installata."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml:404
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
"Determinazione delle proprietà di versione del pacchetto e di distribuzione"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:406
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6333,7 +6618,7 @@ msgstr ""
"i pacchetti disponibili in quelle posizioni."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:410
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6352,27 +6637,27 @@ msgstr ""
"righe sono rilevanti per l'impostazione delle priorità di APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:418
msgid "the <literal>Package:</literal> line"
msgstr "la riga <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml:419
msgid "gives the package name"
msgstr "indica il nome del pacchetto"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml:422 apt_preferences.5.xml:472
msgid "the <literal>Version:</literal> line"
msgstr "la riga <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:423
msgid "gives the version number for the named package"
msgstr "indica il numero di versione per il pacchetto indicato"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:428
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6394,12 +6679,12 @@ msgstr ""
"priorità di APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:439
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "la riga <literal>Archive:</literal> o <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:440
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6416,18 +6701,18 @@ msgstr ""
"preferenze di APT si deve usare la riga:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:450
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:456
msgid "the <literal>Codename:</literal> line"
msgstr "la riga <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml:457
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6444,13 +6729,13 @@ msgstr ""
"valore nelle preferenze di APT si deve usare la riga:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:466
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:473
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian release version &stable-version;. Note that there is "
@@ -6467,7 +6752,7 @@ msgstr ""
"APT si deve usare una delle seguenti righe:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
#, no-wrap
msgid ""
"Pin: release v=&stable-version;\n"
@@ -6479,12 +6764,12 @@ msgstr ""
"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:491
msgid "the <literal>Component:</literal> line"
msgstr "la riga<literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml:492
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6502,18 +6787,18 @@ msgstr ""
"usare la riga:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:507
msgid "the <literal>Origin:</literal> line"
msgstr "la riga <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:508
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6525,18 +6810,18 @@ msgstr ""
"specificare questa origine nelle preferenze di APT si deve usare la riga:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:514
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:520
msgid "the <literal>Label:</literal> line"
msgstr "la riga <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:521
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6548,13 +6833,13 @@ msgstr ""
"specificare questa etichetta nelle preferenze di APT si deve usare la riga:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:527
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:534
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6579,12 +6864,12 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml:547
msgid "Optional Lines in an APT Preferences Record"
msgstr "Righe opzionali in un record delle preferenze di APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:549
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6595,12 +6880,12 @@ msgstr ""
"literal>. Ciò fornisce un posto dove mettere commenti."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:558
msgid "Tracking Stable"
msgstr "Seguire Stable in modo continuativo"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:566
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6625,7 +6910,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:560
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6641,8 +6926,8 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
-#: apt_preferences.5.xml:672
+#: apt_preferences.5.xml:583 apt_preferences.5.xml:629
+#: apt_preferences.5.xml:687
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6654,7 +6939,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml:578
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6667,13 +6952,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:595
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>pacchetto</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:589
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6686,12 +6971,12 @@ msgstr ""
"nuovamente questo comando. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:601
msgid "Tracking Testing or Unstable"
msgstr "Seguire Testing o Unstable in modo continuativo"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Package: *\n"
@@ -6719,7 +7004,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:603
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6736,7 +7021,7 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:624
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6749,13 +7034,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:644
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>pacchetto</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:635
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6774,12 +7059,12 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml:651
msgid "Tracking the evolution of a codename release"
msgstr "Seguire l'evoluzione di un rilascio in base al nome in codice"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml:665
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6814,7 +7099,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:653
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6841,7 +7126,7 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml:682
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6854,13 +7139,13 @@ msgstr ""
"codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml:702
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>pacchetto</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:693
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6879,7 +7164,7 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml:717
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6890,13 +7175,24 @@ msgstr "elenco delle fonti di dati configurate per APT"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+#, fuzzy
+#| msgid ""
+#| "The source list <filename>/etc/apt/sources.list</filename> is designed to "
+#| "support any number of active sources and a variety of source media. The "
+#| "file lists one source per line, with the most preferred source listed "
+#| "first. The information available from the configured sources is acquired "
+#| "by <command>apt-get update</command> (or by an equivalent command from "
+#| "another APT front-end)."
+msgid ""
+"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
msgstr ""
"L'elenco delle fonti <filename>/etc/apt/sources.list</filename> è progettato "
"per supportare qualsiasi numero di fonti attive e svariati supporti. Il file "
@@ -6905,37 +7201,35 @@ msgstr ""
"<command>apt-get update</command> (o con un comando equivalente in un'altra "
"interfaccia per APT)."
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
-msgid ""
-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
-"literal>) followed by options and arguments for this type. Individual "
-"entries cannot be continued onto a following line. Empty lines are ignored, "
-"and a <literal>#</literal> character anywhere on a line marks the remainder "
-"of that line as a comment."
-msgstr ""
-"Ogni riga che specifica una fonte inizia con il tipo (per esempio "
-"<literal>deb-src</literal>), seguito dalle opzioni e dagli argomenti per "
-"tale tipo. Ogni singola voce non può essere divisa su più righe. Le righe "
-"vuote vengono ignorate e un carattere <literal>#</literal> in qualsiasi "
-"punto di una riga contrassegna come commento la parte rimanente della riga."
-
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml:45
msgid "sources.list.d"
msgstr "sources.list.d"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:46
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files. The format is the same as "
+#| "for the regular <filename>sources.list</filename> file. File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters. Otherwise APT will print a notice that it has ignored a "
+#| "file, unless that file matches a pattern in the <literal>Dir::Ignore-"
+#| "Files-Silently</literal> configuration list - in which case it will be "
+#| "silently ignored."
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files. The format is the same as for "
-"the regular <filename>sources.list</filename> file. File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"add sources.list entries in separate files. Two different file formats are "
+"allowed as described in the next two sections. Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format. The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters. Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."
msgstr ""
"La directory <filename>/etc/apt/sources.list.d</filename> permette di "
"aggiungere voci per sources.list in file separati. Il formato è lo stesso "
@@ -6948,16 +7242,106 @@ msgstr ""
"caso viene ignorato in modo silenzioso."
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml:58
+msgid "one line style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:60
+msgid ""
+"Files in this format have the extension <filename>.list</filename>. Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"
+"literal>) followed by options and arguments for this type. Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line. If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>) included in the line after the type separated from "
+"it with a space. If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by a equal sign (<literal>=</literal>). "
+"Multivalue options have also <literal>-=</literal> and <literal>+=</literal> "
+"as separator which instead of replacing the default with the given value(s) "
+"modify the default value(s) to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:79
+msgid ""
+"This is the traditional format and supported by all apt versions. Note that "
+"not all options as described below are supported by all apt versions. Note "
+"also that some older applications parsing this format on its own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:87
+msgid "deb822 style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:89
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>. The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, like the metadata itself apt will download from the configured "
+"sources or the <filename>debian/control</filename> file in a Debian source "
+"package. Individual entries are separated by an empty line, additional "
+"empty lines are ignored, and a <literal>#</literal> character at the start "
+"of the line marks the entire line as a comment. An entry can hence be "
+"disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it. Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s). Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:108
+msgid ""
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier. It "
+"is intended to make this format gradually the default format and deprecating "
+"the previously described one line style format as it is easier to create, "
+"extend and modify by humans and machines alike especially if a lot of "
+"sources and/or options are involved. Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but could encounter problems with software not "
+"supporting the format yet."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:123
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: General Format"
msgstr "I tipi deb e deb-src"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml:124
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type references a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. The "
+#| "<literal>distribution</literal> is generally an archive name like "
+#| "<literal>stable</literal> or <literal>testing</literal> or a codename "
+#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</"
+#| "literal> while component is one of <literal>main</literal>, "
+#| "<literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "<literal>deb-src</literal> type references a Debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type references a typical two-level Debian "
"archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
"<literal>stable</literal> or <literal>testing</literal> or a codename like "
"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
"literal> while component is one of <literal>main</literal>, "
@@ -6979,79 +7363,72 @@ msgstr ""
"riga <literal>deb-src</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:135
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one line style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
msgstr ""
"Il formato per una voce in <filename>sources.list</filename> che usa il tipo "
"<literal>deb</literal> o <literal>deb-src</literal> è:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
+#: sources.list.5.xml:138
#, no-wrap
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ opzioni ] uri suite [componente1] [componente2] [...]"
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
+msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:143
#, no-wrap
msgid ""
" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
+" URIs: uri\n"
+" Suites: suite\n"
+" Components: [component1] [component2] [...]\n"
+" option1: value1\n"
+" option2: value2\n"
" "
msgstr ""
-" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: componente1 componente2\n"
-" Description: breve\n"
-" lunga lunga lunga\n"
-" [opzione1]: [valore-opzione1]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: componente1 componente2\n"
-" Enabled: no\n"
-" Description:breve\n"
-" lunga lunga lunga\n"
-" [opzione1]: [valore-opzione1]\n"
-" "
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:141
+#, fuzzy
+#| msgid ""
+#| "Alternatively a rfc822 style format is also supported: <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
"In alternativa è gestito anche un formato in stile rfc822: <placeholder type="
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml:152
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>suite</literal> can specify an exact path, in which case the "
+#| "components must be omitted and <literal>suite</literal> must end with a "
+#| "slash (<literal>/</literal>). This is useful for the case when only a "
+#| "particular sub-section of the archive denoted by the URI is of interest. "
+#| "If <literal>suite</literal> does not specify an exact path, at least one "
+#| "<literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>suite</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>suite</literal> must end with a "
"slash (<literal>/</literal>). This is useful for the case when only a "
-"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest. "
+"If <literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"L'URI per il tipo <literal>deb</literal> deve specificare la base della "
@@ -7064,7 +7441,7 @@ msgstr ""
"esatto, deve essere presente almeno una <literal>componente</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml:161
msgid ""
"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
"literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7083,19 +7460,32 @@ msgstr ""
"automaticamente un URI con l'architettura corrente."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
-msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+#: sources.list.5.xml:169
+#, fuzzy
+#| msgid ""
+#| "In the traditional style sources.list format since only one distribution "
+#| "can be specified per line it may be necessary to have multiple lines for "
+#| "the same URI, if a subset of all available distributions or components at "
+#| "that location is desired. APT will sort the URI list after it has "
+#| "generated a complete set internally, and will collapse multiple "
+#| "references to the same Internet host, for instance, into a single "
+#| "connection, so that it does not inefficiently establish an FTP "
+#| "connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"Especially in the one line style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "
"location is desired. APT will sort the URI list after it has generated a "
"complete set internally, and will collapse multiple references to the same "
"Internet host, for instance, into a single connection, so that it does not "
-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
msgstr ""
"Dato che, nel formato di sources.list in stile tradizionale, può essere "
"specificata solo una distribuzione per riga, può essere necessario avere più "
@@ -7112,30 +7502,73 @@ msgstr ""
"larghezza di banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
-msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>. Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
-msgstr ""
-"<literal>opzioni</literal> è sempre opzionale e deve essere racchiuso tra "
-"parentesi quadre. Può consistere di più impostazioni nella forma "
-"<literal><replaceable>impostazione</replaceable>=<replaceable>valore</"
-"replaceable></literal>. Impostazioni multiple vengono separate da spazi. APT "
-"supporta le seguenti impostazioni (notare però che le impostazioni non "
-"supportate verranno ignorate in modo silenzioso):"
+#: sources.list.5.xml:181
+msgid ""
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+"È importante elencare le fonti in ordine di preferenza con la fonte "
+"preferita elencata per prima. Tipicamente ciò viene fatto ordinando per "
+"velocità dalla più veloce alla più lenta (per esempio CD-ROM seguiti da host "
+"in una rete locale, seguiti da host Internet distanti)."
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:188
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:190
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:186
+msgid ""
+"As an example, the sources for your distribution could look like this in one "
+"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:193
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: Options"
+msgstr "I tipi deb e deb-src"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:194
+msgid ""
+"Each source entry can have options specified modifying which and how the "
+"source is accessed and data acquired from it. Format, syntax and names of "
+"the options varies between the two formats one line and deb822 style as "
+"described, but they have both the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one line name in brackets. "
+"Remember that beside setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
+msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:205
+#, fuzzy
+#| msgid ""
+#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#| "replaceable>,…</literal> can be used to specify for which architectures "
+#| "information should be downloaded. If this option is not set all "
+#| "architectures defined by the <literal>APT::Architectures</literal> option "
+#| "will be downloaded."
msgid ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
msgstr ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> può essere usato per specificare le architetture "
@@ -7144,78 +7577,93 @@ msgstr ""
"Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:212
msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information like translated package "
+"descriptions should be downloaded. If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
msgstr ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> e <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> possono essere usati per "
-"aggiungere e rimuovere architetture dall'insieme di quelle che verranno "
-"scaricate."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:220
msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope."
msgstr ""
-"<literal>trusted=yes</literal> può essere usato per indicare che i pacchetti "
-"da questa fonte sono sempre autenticati anche se il file <filename>Release</"
-"filename> non è firmato o la firma non può essere controllata. Ciò "
-"disabilita parti di &apt-secure; e dovrebbe quindi essere usato solo in un "
-"contesto locale o fidato. <literal>trusted=no</literal> fa l'opposto e "
-"tratta anche le fonti correttamente autenticate come non autenticate."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:228
msgid ""
-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
msgstr ""
-"È importante elencare le fonti in ordine di preferenza con la fonte "
-"preferita elencata per prima. Tipicamente ciò viene fatto ordinando per "
-"velocità dalla più veloce alla più lenta (per esempio CD-ROM seguiti da host "
-"in una rete locale, seguiti da host Internet distanti)."
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-msgid "Some examples:"
-msgstr "Alcuni esempi:"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:235
+msgid ""
+"<option>Signed-By</option> (<option>signed-by</option>) is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key in either the <filename>trusted.gpg</"
+"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set only the key(s) in this keyring or only the key with this "
+"fingerprint is used for the &apt-secure; verification of this repository. "
+"Otherwise all keys in the trusted keyrings are considered valid signers for "
+"this repository."
+msgstr ""
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:249
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare until then the data provided in the "
+"repository should be considered valid and if this time is reached, but no "
+"new data is provided the data is considered expired and an error is raised. "
+"Beside increasing security as a malicious attacker can't sent old data "
+"forever denying a user to be able to upgrade to a new version, this also "
+"helps users identify mirrors which are no longer updated. Some repositories "
+"like historic archives aren't updated anymore by design through, so this "
+"check can be disabled by setting this option to <literal>no</literal>. "
+"Defaults to the value of configuration option <option>Acquire::Check-Valid-"
+"Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:266
+msgid ""
+"<option>Valid-Until-Min</option> (<option>check-valid-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldomly updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely. Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:288
msgid "URI specification"
msgstr "Specificare URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml:290
msgid "The currently recognized URI types are:"
msgstr "I tipi di URI attualmente riconosciuti sono:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:294
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7226,7 +7674,7 @@ msgstr ""
"archivi locali."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml:301
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7236,7 +7684,7 @@ msgstr ""
"delle fonti."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:308
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7253,7 +7701,7 @@ msgstr ""
"è un metodo di autenticazione non sicuro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:319
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7273,7 +7721,7 @@ msgstr ""
"HTTP specificati nel file di configurazione verranno ignorati."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:331
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -7286,7 +7734,7 @@ msgstr ""
"rimovibili, per copiare i file nelle varie posizioni con APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:338
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7300,12 +7748,12 @@ msgstr ""
"command> e <command>dd</command>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:345
msgid "adding more recognizable URI types"
msgstr "aggiungere ulteriori tipi di URI riconoscibili"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:347
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7324,46 +7772,86 @@ msgstr ""
"debtorrrent; vedere &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian "
+#| "for stable/main, stable/contrib, and stable/non-free."
msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
"Usa l'archivio memorizzato in locale (o montato via NFS) in /home/gianni/"
"debian per stable/main, stable/contrib e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
-#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+#: sources.list.5.xml:361
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr "deb file:/home/gianni/debian stable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:362
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/gianni/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:367
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Come sopra, tranne per il fatto che usa la distribuzione unstable (di "
"sviluppo)"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
-#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:368
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb file:/home/gianni/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:369
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/gianni/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:374
msgid "Source line for the above"
msgstr "Riga per i sorgenti corrispondente alla precedente"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
-#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:375
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb-src file:/home/gianni/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:376
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb-src file:/home/gianni/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:382
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7374,17 +7862,41 @@ msgstr ""
"<literal>amd64</literal> e <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
-#, no-wrap
+#: sources.list.5.xml:384
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgid ""
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:386
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml:398
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7393,13 +7905,24 @@ msgstr ""
"hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:400
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "deb http://archive.debian.org/debian-archive hamm main"
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr "deb http://archive.debian.org/debian-archive hamm main"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml:406
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7408,13 +7931,24 @@ msgstr ""
"e usa solo l'area &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:408
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:409
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:414
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7427,19 +7961,49 @@ msgstr ""
"usata una sola sessione FTP per entrambe le righe."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:418
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:419
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml:431
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:432
+#, fuzzy, no-wrap
+#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:424
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
+#| "directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</"
+#| "filename> on amd64, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; "
+#| "official debian archives are not structured like this] <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7447,7 +8011,7 @@ msgid ""
"amd64, and so forth for other supported architectures. [Note this example "
"only illustrates how to use the substitution variable; official debian "
"archives are not structured like this] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
msgstr ""
"Usa HTTP per accedere all'archivio in ftp.tlh.debian.org nella directory "
"universe e usa solo i file che si trovano in <filename>unstable/binary-i386</"
@@ -7458,8 +8022,39 @@ msgstr ""
"modo.] <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml:437
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:439
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:445
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:454
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;, &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
#. type: Content of: <refentry><refmeta><manvolnum>
@@ -10143,6 +10738,170 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
msgid "Which will use the already fetched archives on the disc."
msgstr "che userà gli archivi già scaricati e presenti sul disco."
+#~ msgid ""
+#~ "No action; perform a simulation of events that would occur but do not "
+#~ "actually change the system. Configuration Item: <literal>APT::Get::"
+#~ "Simulate</literal>."
+#~ msgstr ""
+#~ "Nessuna azione; effettua una simulazione degli eventi che si "
+#~ "verificherebbero, ma non cambia realmente il sistema. Voce di "
+#~ "configurazione: <literal>APT::Get::Simulate</literal>."
+
+#~ msgid ""
+#~ "Simulated runs performed as a user will automatically deactivate locking "
+#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
+#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
+#~ "notice will also be displayed indicating that this is only a simulation. "
+#~ "Runs performed as root do not trigger either NoLocking or the notice - "
+#~ "superusers should know what they are doing without further warnings from "
+#~ "<literal>apt-get</literal>."
+#~ msgstr ""
+#~ "Le esecuzioni simulate effettuate da un utente disattivano "
+#~ "automaticamente il lock (<literal>Debug::NoLocking</literal>) e se è "
+#~ "impostata l'opzione <literal>APT::Get::Show-User-Simulation-Note</"
+#~ "literal> (come predefinito), viene anche visualizzato un messaggio che "
+#~ "indica che quella fatta è solo una simulazione. Le esecuzioni effettuate "
+#~ "da root non attivano né NoLocking né i messaggi: i superutenti dovrebbero "
+#~ "sapere ciò che stanno facendo senza bisogno di ulteriori avvertimenti da "
+#~ "<literal>apt-get</literal>."
+
+#~ msgid ""
+#~ "Ignore if packages can't be authenticated and don't prompt about it. "
+#~ "This is useful for tools like pbuilder. Configuration Item: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+#~ msgstr ""
+#~ "Ignora se i pacchetti non possono essere autenticati e non chiedere "
+#~ "all'utente cosa fare. È utile per strumenti come pbuilder. Voce di "
+#~ "configurazione: <literal>APT::Get::AllowUnauthenticated</literal>."
+
+#~ msgid ""
+#~ "Version 2 of this protocol dumps more information, including the protocol "
+#~ "version, the APT configuration space and the packages, files and versions "
+#~ "being changed. Version 3 adds the architecture and <literal>MultiArch</"
+#~ "literal> flag to each version being dumped."
+#~ msgstr ""
+#~ "La versione 2 di questo protocollo fa il dump di più informazioni, "
+#~ "inclusi la versione del protocollo, lo spazio di configurazione di APT, e "
+#~ "i pacchetti, file e versioni che vengono modificati. La versione 3 "
+#~ "aggiunge l'architettura e il contrassegno <literal>MultiArch</literal> "
+#~ "per ciascuna versione di cui viene fatto il dump."
+
+#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr ""
+#~ "alle versioni che non sono installate e non appartengono al rilascio "
+#~ "obiettivo."
+
+#~ msgid ""
+#~ "Each line specifying a source starts with type (e.g. <literal>deb-src</"
+#~ "literal>) followed by options and arguments for this type. Individual "
+#~ "entries cannot be continued onto a following line. Empty lines are "
+#~ "ignored, and a <literal>#</literal> character anywhere on a line marks "
+#~ "the remainder of that line as a comment."
+#~ msgstr ""
+#~ "Ogni riga che specifica una fonte inizia con il tipo (per esempio "
+#~ "<literal>deb-src</literal>), seguito dalle opzioni e dagli argomenti per "
+#~ "tale tipo. Ogni singola voce non può essere divisa su più righe. Le righe "
+#~ "vuote vengono ignorate e un carattere <literal>#</literal> in qualsiasi "
+#~ "punto di una riga contrassegna come commento la parte rimanente della "
+#~ "riga."
+
+#~ msgid "deb [ options ] uri suite [component1] [component2] [...]"
+#~ msgstr "deb [ opzioni ] uri suite [componente1] [componente2] [...]"
+
+#~ msgid ""
+#~ " Types: deb deb-src\n"
+#~ " URIs: http://example.com\n"
+#~ " Suites: stable testing\n"
+#~ " Sections: component1 component2\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ "\n"
+#~ " Types: deb\n"
+#~ " URIs: http://another.example.com\n"
+#~ " Suites: experimental\n"
+#~ " Sections: component1 component2\n"
+#~ " Enabled: no\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ " "
+#~ msgstr ""
+#~ " Types: deb deb-src\n"
+#~ " URIs: http://example.com\n"
+#~ " Suites: stable testing\n"
+#~ " Sections: componente1 componente2\n"
+#~ " Description: breve\n"
+#~ " lunga lunga lunga\n"
+#~ " [opzione1]: [valore-opzione1]\n"
+#~ "\n"
+#~ " Types: deb\n"
+#~ " URIs: http://another.example.com\n"
+#~ " Suites: experimental\n"
+#~ " Sections: componente1 componente2\n"
+#~ " Enabled: no\n"
+#~ " Description:breve\n"
+#~ " lunga lunga lunga\n"
+#~ " [opzione1]: [valore-opzione1]\n"
+#~ " "
+
+#~ msgid ""
+#~ "<literal>options</literal> is always optional and needs to be surrounded "
+#~ "by square brackets. It can consist of multiple settings in the form "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>. Multiple settings are separated by spaces. The "
+#~ "following settings are supported by APT (note however that unsupported "
+#~ "settings will be ignored silently):"
+#~ msgstr ""
+#~ "<literal>opzioni</literal> è sempre opzionale e deve essere racchiuso tra "
+#~ "parentesi quadre. Può consistere di più impostazioni nella forma "
+#~ "<literal><replaceable>impostazione</replaceable>=<replaceable>valore</"
+#~ "replaceable></literal>. Impostazioni multiple vengono separate da spazi. "
+#~ "APT supporta le seguenti impostazioni (notare però che le impostazioni "
+#~ "non supportate verranno ignorate in modo silenzioso):"
+
+#~ msgid ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> which can be "
+#~ "used to add/remove architectures from the set which will be downloaded."
+#~ msgstr ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> e <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> possono essere "
+#~ "usati per aggiungere e rimuovere architetture dall'insieme di quelle che "
+#~ "verranno scaricate."
+
+#~ msgid ""
+#~ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+#~ "this source are always authenticated even if the <filename>Release</"
+#~ "filename> file is not signed or the signature can't be checked. This "
+#~ "disables parts of &apt-secure; and should therefore only be used in a "
+#~ "local and trusted context. <literal>trusted=no</literal> is the opposite "
+#~ "which handles even correctly authenticated sources as not authenticated."
+#~ msgstr ""
+#~ "<literal>trusted=yes</literal> può essere usato per indicare che i "
+#~ "pacchetti da questa fonte sono sempre autenticati anche se il file "
+#~ "<filename>Release</filename> non è firmato o la firma non può essere "
+#~ "controllata. Ciò disabilita parti di &apt-secure; e dovrebbe quindi "
+#~ "essere usato solo in un contesto locale o fidato. <literal>trusted=no</"
+#~ "literal> fa l'opposto e tratta anche le fonti correttamente autenticate "
+#~ "come non autenticate."
+
+#~ msgid "Some examples:"
+#~ msgstr "Alcuni esempi:"
+
+#~ msgid ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+#~ msgstr ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+
#~ msgid "apt"
#~ msgstr "apt"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index a74d2af3a..f7355c060 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.6\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-08-21 06:12-0400\n"
"PO-Revision-Date: 2014-07-10 19:52+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -658,17 +658,15 @@ msgstr ""
#. type: Content of: <refentry><refmeta><manvolnum>
#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
-#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
-#: apt-config.8.xml:22
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21 apt-config.8.xml:22
msgid "8"
msgstr "8"
#. type: Content of: <refentry><refmeta><refmiscinfo>
#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
-#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
-#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
-#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
-#: apt-ftparchive.1.xml:23
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22 apt-config.8.xml:23
+#: apt.conf.5.xml:28 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23 apt-ftparchive.1.xml:23
msgid "APT"
msgstr "APT"
@@ -679,10 +677,9 @@ msgstr "コマンドラインインターフェイス"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
-#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
-#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
-#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
-#: apt-ftparchive.1.xml:34
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33 apt-config.8.xml:34
+#: apt.conf.5.xml:37 apt_preferences.5.xml:32 sources.list.5.xml:32
+#: apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34 apt-ftparchive.1.xml:34
msgid "Description"
msgstr "説明"
@@ -704,16 +701,16 @@ msgstr ""
msgid ""
"<literal>list</literal> is used to display a list of packages. It supports "
"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option> are supported."
+"<option>--installed</option>, <option>--upgradable</option>, <option>--"
+"upgradeable</option>, <option>--all-versions</option> are supported."
msgstr ""
"パッケージ一覧を表示するには <literal>list</literal> を使います。パッケージ名"
"のマッチングにシェルパターン、そしてオプション <option>--installed</"
-"option>、 <option>--upgradable</option>, <option>--upgradeable</option>、 <option>--all-versions</option> を"
-"サポートしています。"
+"option>、 <option>--upgradable</option>, <option>--upgradeable</option>、 "
+"<option>--all-versions</option> をサポートしています。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml:55
msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
@@ -722,7 +719,7 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml:61
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
@@ -731,7 +728,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml:68
msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
@@ -740,7 +737,7 @@ msgstr ""
"ジの名前を指定します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml:72 apt-get.8.xml:112
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -757,7 +754,7 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml:82 apt-get.8.xml:147
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note that removing a package "
@@ -771,8 +768,28 @@ msgstr ""
"(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
"トールします。"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "alias since 1.1)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:90 apt-get.8.xml:228
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> は、他のパッケージの依存関係を満たすために自動"
+"的にインストールされ、もう必要なくなったパッケージを削除するのに使用します。"
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml:95
msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
@@ -781,7 +798,7 @@ msgstr ""
"な健全性確認を行います。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml:101
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
@@ -790,7 +807,7 @@ msgstr ""
"再同期します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml:107
#, fuzzy
#| msgid ""
#| "<literal>upgrade</literal> is used to install the newest versions of all "
@@ -809,7 +826,7 @@ msgstr ""
"パッケージが削除されることはありません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml:116
msgid ""
"<literal>full-upgrade</literal> performs the function of upgrade but may "
"also remove installed packages if that is required in order to resolve a "
@@ -820,19 +837,19 @@ msgstr ""
"除も行います。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt.8.xml:126 apt-get.8.xml:262 apt-cache.8.xml:246 apt-mark.8.xml:104
#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
#: apt-ftparchive.1.xml:500
msgid "options"
msgstr "オプション"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
+#: apt.8.xml:136
msgid "Script usage"
msgstr "スクリプトでの利用"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml:138
msgid ""
"The &apt; commandline is designed as a end-user tool and it may change the "
"output between versions. While it tries to not break backward compatibility "
@@ -847,12 +864,12 @@ msgstr ""
"するようにしてください。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
+#: apt.8.xml:146
msgid "Differences to &apt-get;"
msgstr "&apt-get; との違い"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
+#: apt.8.xml:147
msgid ""
"The <command>apt</command> command is meant to be pleasant for end users and "
"does not need to be backward compatible like &apt-get;. Therefore some "
@@ -863,18 +880,18 @@ msgstr ""
"たがって、一部のオプションに異なる点があります:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
+#: apt.8.xml:153
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
msgstr ""
"オプション <literal>DPkg::Progress-Fancy</literal> が有効になっています。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:157
msgid "The option <literal>APT::Color</literal> is enabled."
msgstr "オプション <literal>APT::Color</literal> が有効になっています。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:161
msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
@@ -883,7 +900,7 @@ msgstr ""
"じように利用できます。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml:166
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
"enabled by default."
@@ -892,16 +909,16 @@ msgstr ""
"literal> がデフォルトで有効になっています。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt.8.xml:176 apt-get.8.xml:597 apt-cache.8.xml:359 apt-key.8.xml:191
#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
-#: apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701
-#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-config.8.xml:105 apt.conf.5.xml:1319 apt_preferences.5.xml:716
+#: sources.list.5.xml:453 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
#: apt-ftparchive.1.xml:603
msgid "See Also"
msgstr "関連項目"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml:177
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
@@ -910,14 +927,14 @@ msgstr ""
"&guidesdir; にあるAPTユーザガイド、 &apt-preferences;、 APT Howto."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt.8.xml:182 apt-get.8.xml:603 apt-cache.8.xml:364 apt-mark.8.xml:131
#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "Diagnostics"
msgstr "診断メッセージ"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml:183
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1270,27 +1287,23 @@ msgstr ""
"防げます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
-msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
-msgstr ""
-"<literal>autoremove</literal> は、他のパッケージの依存関係を満たすために自動"
-"的にインストールされ、もう必要なくなったパッケージを削除するのに使用します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:233
-msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu). By default it displays the changelog for the version that is "
-"installed. However, you can specify the same options as for the "
-"<option>install</option> command."
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
+#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
+#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "changelogs</ulink> for Ubuntu). By default it displays the changelog for "
+#| "the version that is installed. However, you can specify the same options "
+#| "as for the <option>install</option> command."
+msgid ""
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>. By default it "
+"displays the changelog for the version that is installed. However, you can "
+"specify the same options as for the <option>install</option> command."
msgstr ""
"<literal>changelog</literal> は、パッケージの changelog をダウンロードし、"
"<command>sensible-pager</command> で表示します。サーバ名とベースディレクトリ"
@@ -1302,7 +1315,21 @@ msgstr ""
"option> コマンドと同じオプションを使用できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml:243
+msgid ""
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:267
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1311,7 +1338,7 @@ msgstr ""
"<literal>APT::Install-Recommends</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml:272
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -1320,7 +1347,7 @@ msgstr ""
"<literal>APT::Install-Suggests</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:277
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1329,7 +1356,7 @@ msgstr ""
"いません。設定項目: <literal>APT::Get::Download-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:282
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -1355,7 +1382,7 @@ msgstr ""
"Get::Fix-Broken</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml:297
msgid ""
"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -1374,7 +1401,7 @@ msgstr ""
"Get::Fix-Missing</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -1385,7 +1412,7 @@ msgstr ""
"がよいでしょう。設定項目: <literal>APT::Get::Download</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:315
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1404,35 +1431,21 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:330
msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system. Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-"動作なし - なにが起こるのかのシミュレーションを行い、実際にはシステムの変更を"
-"行いません。設定項目: <literal>APT::Get::Simulate</literal>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
-msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>) so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation. A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>). Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."
msgstr ""
-"ユーザとしてシミュレーションを実行すると、自動ではロックを行いません "
-"(<literal>Debug::NoLocking</literal>)。また、<literal>APT::Get::Show-User-"
-"Simulation-Note</literal> オプションが設定されている (デフォルト) と、これが"
-"シミュレーションであるという注意を表示します。root 権限で実行すると、"
-"NoLocking も 注意も行われません (スーパーユーザは <literal>apt-get</literal> "
-"による警告などなくても、何をしているのか知っていなければなりません)。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:340
msgid ""
"Simulated runs print out a series of lines, each representing a "
"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1446,7 +1459,7 @@ msgstr ""
"れに) 空の角カッコは大した問題ではないことを表します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:348
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -1460,7 +1473,7 @@ msgstr ""
"定項目: <literal>APT::Get::Assume-Yes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:356
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
"Assume-No</literal>."
@@ -1469,7 +1482,7 @@ msgstr ""
"Assume-No</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:361
msgid ""
"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1478,7 +1491,7 @@ msgstr ""
"<literal>APT::Get::Show-Upgraded</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:367
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -1487,7 +1500,7 @@ msgstr ""
"<literal>APT::Get::Show-Versions</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:373
msgid ""
"This option controls the architecture packages are built for by <command>apt-"
"get source --compile</command> and how cross-builddependencies are "
@@ -1503,7 +1516,7 @@ msgstr ""
"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml:383
msgid ""
"This option controls the activated build profiles for which a source package "
"is built by <command>apt-get source --compile</command> and how build "
@@ -1518,7 +1531,7 @@ msgstr ""
"<literal>APT::Get::Host-Architecture</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:394
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -1527,7 +1540,7 @@ msgstr ""
"Get::Compile</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml:399
msgid ""
"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -1540,7 +1553,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml:406
msgid ""
"Allow installing new packages when used in conjunction with "
"<literal>upgrade</literal>. This is useful if the update of a installed "
@@ -1559,7 +1572,7 @@ msgstr ""
"注意してください。設定項目: <literal>APT::Get::Upgrade-Allow-New</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:418
msgid ""
"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1572,7 +1585,7 @@ msgstr ""
"Upgrade</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:425
msgid ""
"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1585,13 +1598,84 @@ msgstr ""
"定項目: <literal>APT::Get::Only-Upgrade</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml:433
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+"強制承諾 - 何か損傷を与えかねない動作をしようとした場合でも、確認なしで実行し"
+"てしまう危険なオプションです。よほどの状況でなければ、使うべきではありませ"
+"ん。<literal>force-yes</literal> を使うと、あなたのシステムを破壊しかねませ"
+"ん! 設定項目: <literal>APT::Get::force-yes</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+"強制承諾 - 何か損傷を与えかねない動作をしようとした場合でも、確認なしで実行し"
+"てしまう危険なオプションです。よほどの状況でなければ、使うべきではありませ"
+"ん。<literal>force-yes</literal> を使うと、あなたのシステムを破壊しかねませ"
+"ん! 設定項目: <literal>APT::Get::force-yes</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+"強制承諾 - 何か損傷を与えかねない動作をしようとした場合でも、確認なしで実行し"
+"てしまう危険なオプションです。よほどの状況でなければ、使うべきではありませ"
+"ん。<literal>force-yes</literal> を使うと、あなたのシステムを破壊しかねませ"
+"ん! 設定項目: <literal>APT::Get::force-yes</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:457
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
msgid ""
"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
-"<literal>APT::Get::force-yes</literal>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."
msgstr ""
"強制承諾 - 何か損傷を与えかねない動作をしようとした場合でも、確認なしで実行し"
"てしまう危険なオプションです。よほどの状況でなければ、使うべきではありませ"
@@ -1599,7 +1683,7 @@ msgstr ""
"ん! 設定項目: <literal>APT::Get::force-yes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:465
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected MD5 "
@@ -1620,7 +1704,7 @@ msgstr ""
"Print-URIs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:476
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1633,7 +1717,7 @@ msgstr ""
"<literal>APT::Get::Purge</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:484
msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1642,7 +1726,7 @@ msgstr ""
"定項目: <literal>APT::Get::ReInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:489
msgid ""
"This option is on by default; use <literal>--no-list-cleanup</literal> to "
"turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1658,7 +1742,7 @@ msgstr ""
"する時ぐらいでしょう。設定項目: <literal>APT::Get::List-Cleanup</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:499
msgid ""
"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -1681,7 +1765,7 @@ msgstr ""
"さい。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:514
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1694,7 +1778,7 @@ msgstr ""
"目: <literal>APT::Get::Trivial-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml:521
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1703,7 +1787,7 @@ msgstr ""
"項目: <literal>APT::Get::Remove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:527
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running the <literal>autoremove</"
@@ -1716,7 +1800,7 @@ msgstr ""
"<literal>APT::Get::AutomaticRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml:534
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -1734,7 +1818,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:545
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1745,7 +1829,7 @@ msgstr ""
"<literal>APT::Get::Dsc-Only</literal>, <literal>APT::Get::Tar-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:551
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -1754,18 +1838,18 @@ msgstr ""
"<literal>APT::Get::Arch-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:556
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
-"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself. "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override. Configuration Item: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
-"パッケージを確認できない場合に無視し、それについて質問しません。pbuilder のよ"
-"うなツールで便利です。設定項目: <literal>APT::Get::AllowUnauthenticated</"
-"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:566
msgid ""
"Forbid the update command to acquire unverifiable data from configured "
"sources. Apt will fail at the update command for repositories without valid "
@@ -1774,7 +1858,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1789,13 +1873,13 @@ msgstr ""
"<literal>Dpkg::Progress-Fancy</literal>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
-#: apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml:587 apt-cache.8.xml:352 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1313 apt_preferences.5.xml:709
msgid "Files"
msgstr "ファイル"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1806,7 +1890,7 @@ msgstr ""
"Howto"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml:604
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1843,9 +1927,9 @@ msgstr ""
"べてのコマンドによって、暗黙で実行されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
-#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
-#: apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml:49 apt-cache.8.xml:137 apt-cache.8.xml:161
+#: apt-cache.8.xml:183 apt-cache.8.xml:188 apt-cache.8.xml:204
+#: apt-cache.8.xml:222 apt-cache.8.xml:234
msgid "&synopsis-pkg;"
msgstr "&synopsis-pkg;"
@@ -2006,10 +2090,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:124
+#, fuzzy
+#| msgid ""
+#| "<literal>Total distinct</literal> versions is the number of package "
+#| "versions found in the cache; this value is therefore at least equal to "
+#| "the number of total package names. If more than one distribution is being "
+#| "accessed (for instance, \"stable\" and \"unstable\"), this value can be "
+#| "considerably larger than the number of total package names."
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
"instance, \"stable\" and \"unstable\"), this value can be considerably "
"larger than the number of total package names."
msgstr ""
@@ -2019,7 +2109,7 @@ msgstr ""
"スする場合、この値はパッケージ名総数よりもかなり大きい数になります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:130
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
@@ -2028,18 +2118,24 @@ msgstr ""
"れた依存関係の数です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:138
+#, fuzzy
+#| msgid ""
+#| "<literal>showsrc</literal> displays all the source package records that "
+#| "match the given package names. All versions are shown, as well as all "
+#| "records that declare the name to be a binary package."
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."
msgstr ""
"<literal>showsrc</literal> は、指定したパッケージ名に一致するソースパッケージ"
"を、すべて表示します。バイナリパッケージになるときの名称を宣言したレコードと"
"ともに、すべてのバージョンについて表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:147
msgid ""
"<literal>dump</literal> shows a short listing of every package in the cache. "
"It is primarily for debugging."
@@ -2048,7 +2144,7 @@ msgstr ""
"覧を表示します。主にデバッグ用です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml:152
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2057,7 +2153,7 @@ msgstr ""
"す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml:157
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
@@ -2066,7 +2162,7 @@ msgstr ""
"概要を表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml:162
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg --print-"
"avail</command>; it displays the package records for the named packages."
@@ -2075,12 +2171,22 @@ msgstr ""
"能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:167
msgid "&synopsis-regex;"
msgstr "&synopsis-regex;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:168
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see &regex;. It "
+#| "searches the package names and the descriptions for an occurrence of the "
+#| "regular expression and prints out the package name and the short "
+#| "description, including virtual package names. If <option>--full</option> "
+#| "is given then output identical to <literal>show</literal> is produced for "
+#| "each matched package, and if <option>--names-only</option> is given then "
+#| "the long description is not searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see &regex;. It searches "
@@ -2089,7 +2195,7 @@ msgid ""
"including virtual package names. If <option>--full</option> is given then "
"output identical to <literal>show</literal> is produced for each matched "
"package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."
msgstr ""
"<literal>search</literal> は、与えられた POSIX の正規表現 (&regex; を参照) に"
"より、すべての利用可能なパッケージに対して全文検索を行います。パッケージ名と"
@@ -2100,14 +2206,14 @@ msgstr ""
"ケージ名に対してのみ対象とします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:179
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
msgstr "空白で区切った引数で、複数の検索パターンの and をとることができます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:184
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -2116,7 +2222,7 @@ msgstr ""
"を満たす他のパッケージの一覧を表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:189
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -2124,12 +2230,12 @@ msgstr ""
"<literal>rdepends</literal> は、パッケージが持つ被依存関係を一覧表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:193
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:194
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -2143,7 +2249,7 @@ msgstr ""
"generate</option> オプションと共に使用すると非常に便利です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:199
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -2154,7 +2260,7 @@ msgstr ""
"た一覧にあります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:205
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2174,7 +2280,7 @@ msgstr ""
"GivenOnly</literal> をセットしてください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml:214
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2187,12 +2293,12 @@ msgstr ""
"表します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:219
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:223
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2201,12 +2307,12 @@ msgstr ""
"users/sander/html/gsvcg1.html\">VCG tool</ulink> の xvcg 専用です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:227
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:228
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -2218,7 +2324,7 @@ msgstr ""
"す。一方、パッケージ名を指定した場合、優先順の詳細情報を表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml:235
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -2236,7 +2342,7 @@ msgstr ""
"表示するだけです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:251
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -2247,7 +2353,7 @@ msgstr ""
"pkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:257
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2262,7 +2368,7 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:265
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2275,7 +2381,7 @@ msgstr ""
"<literal>quiet</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:272
msgid ""
"Print only important dependencies; for use with <literal>unmet</literal> and "
"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2286,9 +2392,16 @@ msgstr ""
"目: <literal>APT::Cache::Important</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml:286
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be tweaked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
@@ -2300,7 +2413,19 @@ msgstr ""
"replaceable></literal> 例: <literal>APT::Cache::ShowRecommends</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:294
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data. A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture. Configuration Item: <literal>APT::Cache::ShowImplicit</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:304
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -2309,7 +2434,7 @@ msgstr ""
"ShowFull</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:309
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -2326,7 +2451,7 @@ msgstr ""
"AllVersions</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml:318
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2337,16 +2462,20 @@ msgstr ""
"option> を使用してください。設定項目: <literal>APT::Cache::Generate</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:324
+#, fuzzy
+#| msgid ""
+#| "Only search on the package names, not the long descriptions. "
+#| "Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgid ""
-"Only search on the package names, not the long descriptions. Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
"説明文ではなく、パッケージ名からのみ検索します。設定項目: <literal>APT::"
"Cache::NamesOnly</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:329
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -2356,7 +2485,7 @@ msgstr ""
"表示します。設定項目: <literal>APT::Cache::AllNames</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -2367,7 +2496,7 @@ msgstr ""
"RecurseDepends</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:342
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -2378,12 +2507,12 @@ msgstr ""
"Installed</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:360
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:365
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3794,6 +3923,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:295
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true, as giving a Release file's "
+#| "validation an expiration date prevents replay attacks over a long "
+#| "timescale, and can also for example help users to identify mirrors that "
+#| "are no longer updated - but the feature depends on the correctness of the "
+#| "clock on the user system. Archive maintainers are encouraged to create "
+#| "Release files with the <literal>Valid-Until</literal> header, but if they "
+#| "don't or a stricter value is desired the <literal>Max-ValidTime</literal> "
+#| "option below can be used."
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3802,7 +3941,9 @@ msgid ""
"user system. Archive maintainers are encouraged to create Release files with "
"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
"value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used. The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
msgstr ""
"セキュリティ関連のオプションで、デフォルトは true です。Release ファイルの有"
"効期限検証により、長期間のリプレイ攻撃を防ぎます。さらに、例えばユーザが、も"
@@ -3813,7 +3954,16 @@ msgstr ""
"下の <literal>Max-ValidTime</literal> オプションを使用できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:308
+#: apt.conf.5.xml:310
+#, fuzzy
+#| msgid ""
+#| "Maximum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. If the Release file itself includes a "
+#| "<literal>Valid-Until</literal> header the earlier date of the two is used "
+#| "as the expiration date. The default value is <literal>0</literal> which "
+#| "stands for \"valid forever\". Archive specific settings can be made by "
+#| "appending the label of the archive to the option name."
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3821,7 +3971,9 @@ msgid ""
"<literal>Valid-Until</literal> header the earlier date of the two is used as "
"the expiration date. The default value is <literal>0</literal> which stands "
"for \"valid forever\". Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."
msgstr ""
"<filename>Release</filename> ファイルを作成してから (<literal>Date</literal> "
"ヘッダ)、有効であるとみなせる最大時間 (秒数) です。Release ファイル自体に "
@@ -3831,7 +3983,16 @@ msgstr ""
"固有の設定を作成できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml:323
+#, fuzzy
+#| msgid ""
+#| "Minimum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. Use this if you need to use a seldom "
+#| "updated (local) mirror of a more frequently updated archive with a "
+#| "<literal>Valid-Until</literal> header instead of completely disabling the "
+#| "expiration date checking. Archive specific settings can and should be "
+#| "used by appending the label of the archive to the option name."
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3839,7 +4000,9 @@ msgid ""
"(local) mirror of a more frequently updated archive with a <literal>Valid-"
"Until</literal> header instead of completely disabling the expiration date "
"checking. Archive specific settings can and should be used by appending the "
-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."
msgstr ""
"<filename>Release</filename> ファイルを作成してから (<literal>Date</literal> "
"ヘッダ)、有効であるとみなせる最小時間 (秒数) です。<literal>Valid-Until</"
@@ -3849,7 +4012,7 @@ msgstr ""
"定を作成できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:336
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3860,7 +4023,7 @@ msgstr ""
"す。デフォルトでは True です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:339
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 "
@@ -3876,7 +4039,7 @@ msgstr ""
"も、パッチをダウンロードする代わりに、完全なファイルをダウンロードします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:349
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3890,7 +4053,7 @@ msgstr ""
"<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:357
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -3899,7 +4062,7 @@ msgstr ""
"えられた回数だけリトライを行います。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:358
+#: apt.conf.5.xml:362
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."
@@ -3909,7 +4072,7 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:367
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]/</"
@@ -3927,7 +4090,7 @@ msgstr ""
"ないと、環境変数 <envar>http_proxy</envar> を使用します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:375
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 "
@@ -3946,7 +4109,7 @@ msgstr ""
"が汚れるのを防げます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381 apt.conf.5.xml:469
+#: apt.conf.5.xml:385 apt.conf.5.xml:473
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."
@@ -3956,7 +4119,7 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:384
+#: apt.conf.5.xml:388
#, fuzzy
#| msgid ""
#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
@@ -3983,7 +4146,7 @@ msgstr ""
"フォルト値は 0 (= 無効) です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:395
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -3992,7 +4155,7 @@ msgstr ""
"かどうかを制御します。デフォルトでは有効です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml:398
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes per second. The default "
@@ -4006,7 +4169,7 @@ msgstr ""
"からダウンロードしなくなることに注意してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:405
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 "
@@ -4017,7 +4180,7 @@ msgstr ""
"ロードするための、異なる User-Agent を設定できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:409
msgid ""
"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
"an external command to discover the http proxy to use. Apt expects the "
@@ -4039,7 +4202,7 @@ msgstr ""
"古い <literal>ProxyAutoDetect</literal> よりも優先されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:427
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4056,7 +4219,7 @@ msgstr ""
"していません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:435
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4094,7 +4257,7 @@ msgstr ""
"ごとのオプションです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:456
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]/</"
@@ -4126,7 +4289,7 @@ msgstr ""
"literal>, <literal>$(SITE_PORT)</literal> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: apt.conf.5.xml:476
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, "
@@ -4141,7 +4304,7 @@ msgstr ""
"定例はサンプル設定ファイルを参照してください)。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:483
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 "
@@ -4154,7 +4317,7 @@ msgstr ""
"FTP over HTTP を使用するのは推奨しません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:488
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4170,13 +4333,13 @@ msgstr ""
"いことに注意してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:502
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:497
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4197,7 +4360,7 @@ msgstr ""
"マンドは UMount で指定することができます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:510
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4206,13 +4369,13 @@ msgstr ""
"る、<literal>gpgv::Options</literal> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:521
#, 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:512
+#: apt.conf.5.xml:516
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4230,19 +4393,19 @@ msgstr ""
"す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:526
#, 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:525
+#: apt.conf.5.xml:529
#, 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:518
+#: apt.conf.5.xml:522
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 "
@@ -4271,13 +4434,13 @@ msgstr ""
"<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:536
#, 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:527
+#: apt.conf.5.xml:531
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4301,7 +4464,7 @@ msgstr ""
"のみ定義されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:541
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4312,7 +4475,7 @@ msgstr ""
"んどローカルミラーでのみ有効になることに注意してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:548
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4325,7 +4488,7 @@ msgstr ""
"する際に、CPU の能力を余計に消費します。デフォルトでは false です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:556
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4343,13 +4506,13 @@ msgstr ""
"意してください。長い言語コードは特に見かけません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:573
#, 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:557
+#: apt.conf.5.xml:561
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4386,7 +4549,7 @@ msgstr ""
"ことに注意してください。<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:574
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4399,24 +4562,32 @@ msgstr ""
"後) に追加します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:583
msgid "When downloading, force to use only the IPv4 protocol."
msgstr "ダウンロード時に IPv4 プロトコルだけを使うように強制します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:589
msgid "When downloading, force to use only the IPv6 protocol."
msgstr "ダウンロード時に IPv6 プロトコルだけを使うように強制します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:595
msgid ""
"The maximum file size of Release/Release.gpg/InRelease files. The default "
"is 10MB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:602
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to. The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:611
msgid ""
"Allow the update operation to load data files from a repository without a "
"trusted signature. If enabled this option no data files will be loaded and "
@@ -4425,7 +4596,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:622
msgid ""
"Allow that a repository that was previously gpg signed to become unsigned "
"durign a update operation. When there is no valid signature of a perviously "
@@ -4435,13 +4606,46 @@ msgid ""
"source untrusted and warn about them if you try to install them."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:634
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:636
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them. Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>. The value should be a "
+"normal URI to a text file, expect that package specific data is replaced "
+"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"if the package is from a component (e.g. <literal>main</literal>) this is "
+"the first part otherwise it is omitted, 2. the first letter of source "
+"package name, expect if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version. "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>') and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>'). The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:664
msgid "Directories"
msgstr "ディレクトリ"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:666
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4460,7 +4664,7 @@ msgstr ""
"サブアイテムすべてに、前に付加するデフォルトディレクトリを含んでいます。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:673
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4484,7 +4688,7 @@ msgstr ""
"でいます。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:683
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4498,7 +4702,7 @@ msgstr ""
"ファイルを指定された場合のみ、この設定の効果があります)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:689
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 "
@@ -4509,7 +4713,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:693
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4526,16 +4730,26 @@ msgstr ""
"プログラムの場所を指定します。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:701
+#, fuzzy
+#| msgid ""
+#| "The configuration item <literal>RootDir</literal> has a special meaning. "
+#| "If set, all paths in <literal>Dir::</literal> will be relative to "
+#| "<literal>RootDir</literal>, <emphasis>even paths that are specified "
+#| "absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> "
+#| "is set to <filename>/tmp/staging</filename> and <literal>Dir::State::"
+#| "status</literal> is set to <filename>/var/lib/dpkg/status</filename>, "
+#| "then the status file will be looked up in <filename>/tmp/staging/var/lib/"
+#| "dpkg/status</filename>."
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>. So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>. If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."
msgstr ""
"設定項目 <literal>RootDir</literal> は特別な意味を持ちます。設定されている"
"と、<literal>Dir::</literal> のすべてのパスは、<emphasis>絶対パスとして指定し"
@@ -4546,7 +4760,7 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:715
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 "
@@ -4562,12 +4776,12 @@ msgstr ""
"フォルト値を見ればわかる通り、このパターンには正規表現を使用できます。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:724
msgid "APT in DSelect"
msgstr "DSelect での APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:726
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4578,7 +4792,7 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:731
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4599,7 +4813,7 @@ msgstr ""
"パッケージをダウンロードする直前に行います。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:745
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4608,7 +4822,7 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:750
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4617,7 +4831,7 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:755
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4626,12 +4840,12 @@ msgstr ""
"します。デフォルトはエラーが発生した場合のみです。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:761
msgid "How APT calls &dpkg;"
msgstr "APT が &dpkg; を呼ぶ方法"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:762
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4640,7 +4854,7 @@ msgstr ""
"<literal>DPkg</literal> セクションにあります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:767
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 "
@@ -4650,7 +4864,7 @@ msgstr ""
"なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:773
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 "
@@ -4662,7 +4876,7 @@ msgstr ""
"bin/sh</filename> を通して呼び出され、何か問題があれば APT が異常終了します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:780
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 "
@@ -4679,20 +4893,51 @@ msgstr ""
"ります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:787
+msgid ""
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:792
msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
+"Each configuration directive line has the form <literal>key=value</"
+"literal>. Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
msgstr ""
-"このプロトコルのバージョン 2 では、(プロトコルのバージョンや APT 設定スペー"
-"ス、パッケージを含む) 詳細情報やファイル、変更されているバージョンを出力しま"
-"す。バージョン 3 では出力の各バージョンにアーキテクチャと "
-"<literal>MultiArch</literal> フラグが追加されています。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:800
+msgid ""
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:810
+msgid ""
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
+"\" is an incorrect typename which is just kept to remain compatible, it "
+"should be read as \"no\" and users are encouraged to support both."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:816
msgid ""
"The version of the protocol to be used for the command "
"<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4708,7 +4953,7 @@ msgstr ""
"ポートしている最大のバージョンの情報を代わりに送ります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:823
msgid ""
"The file descriptor to be used to send the information can be requested with "
"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4725,7 +4970,7 @@ msgstr ""
"ルディスクリプタの番号が収録されています。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:833
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4734,7 +4979,7 @@ msgstr ""
"<filename>/</filename> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:838
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4743,12 +4988,12 @@ msgstr ""
"ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:843
msgid "dpkg trigger usage (and related options)"
msgstr "dpkg トリガの使い方 (および関連オプション)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:779
+#: apt.conf.5.xml:844
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 "
@@ -4772,7 +5017,7 @@ msgstr ""
"(もしくはそれ以上) の時間 100% のままとなり、進捗レポートを壊してしまいます。"
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:859
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4786,7 +5031,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:853
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 "
@@ -4809,7 +5054,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:866
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 "
@@ -4829,7 +5074,7 @@ msgstr ""
"在 APT は、このフラグを、展開呼び出しや削除呼び出しにも追加します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:874
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4856,7 +5101,7 @@ msgstr ""
"能性があるからです。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:889
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4873,7 +5118,7 @@ msgstr ""
"では、最後以外のすべての実行で、無効にできます。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:896
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4888,7 +5133,7 @@ msgstr ""
"ことに注意してください。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:909
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4906,7 +5151,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:902
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 "
@@ -4929,12 +5174,12 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:922
msgid "Periodic and Archives options"
msgstr "Periodic オプションと Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:923
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4947,12 +5192,12 @@ msgstr ""
"トは、このスクリプトの先頭を参照してください。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:931
msgid "Debug options"
msgstr "デバッグオプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:933
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4968,7 +5213,7 @@ msgstr ""
"のオプションは興味がないでしょうが、以下のものは興味を引くかもしれません。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:944
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4979,7 +5224,7 @@ msgstr ""
"にします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:952
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4990,7 +5235,7 @@ msgstr ""
"literal>) を行う場合に使用します。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:961
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5002,7 +5247,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:904
+#: apt.conf.5.xml:969
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -5011,34 +5256,34 @@ msgstr ""
"ないようにします。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:914
+#: apt.conf.5.xml:979
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:923
+#: apt.conf.5.xml:988
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:934
+#: apt.conf.5.xml:999
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:1010
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1021
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:967
+#: apt.conf.5.xml:1032
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -5046,7 +5291,7 @@ msgstr ""
"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:978
+#: apt.conf.5.xml:1043
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -5055,12 +5300,12 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:988
+#: apt.conf.5.xml:1053
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:998
+#: apt.conf.5.xml:1063
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -5068,7 +5313,7 @@ msgstr ""
"<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1008
+#: apt.conf.5.xml:1073
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 "
@@ -5078,7 +5323,7 @@ msgstr ""
"システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1084
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."
@@ -5087,13 +5332,13 @@ msgstr ""
"<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1031
+#: apt.conf.5.xml:1096
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:1041
+#: apt.conf.5.xml:1106
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -5102,7 +5347,7 @@ msgstr ""
"ジやエラーを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1116
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -5111,7 +5356,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1063
+#: apt.conf.5.xml:1128
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -5120,14 +5365,14 @@ msgstr ""
"リストへのパッチ適用に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1074
+#: apt.conf.5.xml:1139
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:1085
+#: apt.conf.5.xml:1150
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5136,7 +5381,7 @@ msgstr ""
"に出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1160
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5151,7 +5396,7 @@ msgstr ""
"路に対応しています。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml:1174
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5180,7 +5425,7 @@ msgstr ""
"ます。<literal>section</literal> はパッケージが現れるセクション名です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1130
+#: apt.conf.5.xml:1195
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5189,7 +5434,7 @@ msgstr ""
"切られます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1141
+#: apt.conf.5.xml:1206
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5198,7 +5443,7 @@ msgstr ""
"を解析中に発生したエラーを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1152
+#: apt.conf.5.xml:1217
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5207,18 +5452,18 @@ msgstr ""
"のトレースを生成します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1164
+#: apt.conf.5.xml:1229
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:1175
+#: apt.conf.5.xml:1240
msgid "Output the priority of each package list on startup."
msgstr "起動時の各パッケージの優先度を表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1185
+#: apt.conf.5.xml:1250
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5227,7 +5472,7 @@ msgstr ""
"した場合にのみ、適用されます)。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1196
+#: apt.conf.5.xml:1261
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 "
@@ -5238,7 +5483,7 @@ msgstr ""
"説明したものと同じです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1208
+#: apt.conf.5.xml:1273
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5247,7 +5492,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml:1283
msgid ""
"Display the external commands that are called by apt hooks. This includes e."
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5258,13 +5503,13 @@ msgstr ""
"{Pre,Post}-Invoke</literal> があります。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt.conf.5.xml:1307 apt_preferences.5.xml:556 sources.list.5.xml:358
#: apt-ftparchive.1.xml:592
msgid "Examples"
msgstr "サンプル"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml:1308
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5274,7 +5519,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml:1320
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5469,10 +5714,11 @@ msgstr "優先度 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:118
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
-msgstr "インストールされておらず、ターゲットリリースに含まれないバージョン。"
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that do not belong to the target release."
+msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:122
@@ -5481,12 +5727,21 @@ msgstr "優先度 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:123
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:127
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:131
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5504,7 +5759,7 @@ msgstr ""
"てます。"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml:138
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -5513,7 +5768,7 @@ msgstr ""
"を上から順番に適用します。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml:141
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5528,12 +5783,12 @@ msgstr ""
"す。また、パッケージのダウングレードは危険であることにも注意してください)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid "Install the highest priority version."
msgstr "最も高い優先度のバージョンをインストールします。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:148
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -5542,7 +5797,7 @@ msgstr ""
"が高いもの) をインストールします。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml:151
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5553,7 +5808,7 @@ msgstr ""
"トールされていないものをインストールします。"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:157
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5568,7 +5823,7 @@ msgstr ""
"get upgrade</command> を実行するとパッケージが更新されます。"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:164
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5581,7 +5836,7 @@ msgstr ""
"get upgrade</command> を実行しても、ダウングレードしません。"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5600,12 +5855,12 @@ msgstr ""
"ケージがあるからです。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:178
msgid "The Effect of APT Preferences"
msgstr "APT プリファレンスファイルの効果"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:180
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5617,7 +5872,7 @@ msgstr ""
"れています。レコードは特定形式か、汎用形式のどちらかの形式をとります。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:186
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages with a specified version or version range. For example, "
@@ -5633,7 +5888,7 @@ msgstr ""
"きます。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5645,7 +5900,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:199
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5659,7 +5914,7 @@ msgstr ""
"てます。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:205
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5670,7 +5925,7 @@ msgstr ""
"全パッケージについて、高い優先度を割り当てます。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:210
#, no-wrap
msgid ""
"Package: *\n"
@@ -5682,7 +5937,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml:215
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
"which can be used to match a hostname. The following record will assign a "
@@ -5695,7 +5950,7 @@ msgstr ""
"てます。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:219
#, no-wrap
msgid ""
"Package: *\n"
@@ -5707,7 +5962,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:223
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -5721,7 +5976,7 @@ msgstr ""
"トアドレスではなく、\"Debian\" や \"Ximian\" といった作者やベンダ名です。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml:228
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5731,7 +5986,7 @@ msgstr ""
"ディストリビューションに属するパッケージを、すべて低い優先度に割り当てます。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:232
#, no-wrap
msgid ""
"Package: *\n"
@@ -5743,7 +5998,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:237
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5754,7 +6009,7 @@ msgstr ""
"り当てます。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
#, no-wrap
msgid ""
"Package: *\n"
@@ -5766,7 +6021,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5777,7 +6032,7 @@ msgstr ""
"に属するパッケージを、すべて高い優先度に割り当てます。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, no-wrap
msgid ""
"Package: *\n"
@@ -5788,13 +6043,22 @@ msgstr ""
"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:258
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:266
msgid "Regular expressions and &glob; syntax"
msgstr "正規表現と &glob; 構文"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:268
msgid ""
"APT also supports pinning by &glob; expressions, and regular expressions "
"surrounded by slashes. For example, the following example assigns the "
@@ -5808,7 +6072,7 @@ msgstr ""
"ケージに、優先度500を割り当てます。"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
@@ -5820,7 +6084,7 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -5831,7 +6095,7 @@ msgstr ""
"パッケージに、優先度 990 を割り当てます。"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
#, no-wrap
msgid ""
"Package: *\n"
@@ -5843,7 +6107,7 @@ msgstr ""
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
@@ -5860,12 +6124,12 @@ msgstr ""
"体とは見なされません。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid "How APT Interprets Priorities"
msgstr "APT が優先度に割り込む方法"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:314
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking):"
@@ -5874,12 +6138,12 @@ msgstr ""
"ません。これは (おおざっぱにいうと) 以下のように解釈されます。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:319
msgid "P &gt;= 1000"
msgstr "P &gt;= 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -5887,12 +6151,12 @@ msgstr ""
"パッケージがダウングレードしても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml:324
msgid "990 &lt;= P &lt; 1000"
msgstr "990 &lt;= P &lt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -5901,12 +6165,12 @@ msgstr ""
"に含まれなくても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:330
msgid "500 &lt;= P &lt; 990"
msgstr "500 &lt;= P &lt; 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:331
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -5915,12 +6179,12 @@ msgstr ""
"ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "100 &lt;= P &lt; 500"
msgstr "100 &lt;= P &lt; 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:337
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -5930,12 +6194,12 @@ msgstr ""
"ル"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:342
msgid "0 &lt; P &lt; 100"
msgstr "0 &lt; P &lt; 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:343
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -5944,22 +6208,40 @@ msgstr ""
"ンストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:347
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:348
msgid "prevents the version from being installed"
msgstr "このバージョンのインストール禁止"
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:351
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:352
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
-msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version. Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+#: apt_preferences.5.xml:358
+#, fuzzy
+#| msgid ""
+#| "If any specific-form records match an available package version then the "
+#| "first such record determines the priority of the package version. "
+#| "Failing that, if any general-form records match an available package "
+#| "version then the first such record determines the priority of the package "
+#| "version."
+msgid ""
+"The first specific-form record matching an available package version "
+"determines the priority of the package version. Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version. Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
msgstr ""
"特定形式のレコードが利用可能パッケージバージョンに一致した場合、最初のレコー"
"ドが、パッケージバージョンの優先度を決定します。失敗して、汎用形式のレコード"
@@ -5967,7 +6249,7 @@ msgstr ""
"バージョンの優先度を決定します。"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:366
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -5976,7 +6258,7 @@ msgstr ""
"仮定してください。"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:370
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6004,12 +6286,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:383
msgid "Then:"
msgstr "すると、以下のように動作します。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6023,7 +6305,7 @@ msgstr ""
"れている場合、<literal>perl</literal> はダウングレードされます。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:390
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6034,7 +6316,7 @@ msgstr ""
"なります。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:394
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6047,12 +6329,12 @@ msgstr ""
"い場合にのみインストールされます。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml:404
msgid "Determination of Package Version and Distribution Properties"
msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:406
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6063,7 +6345,7 @@ msgstr ""
"filename> ファイルを提供します。"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:410
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6081,27 +6363,27 @@ msgstr ""
"ます。APT 優先度の設定は、レコードごとに以下の 2 行だけです。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:418
msgid "the <literal>Package:</literal> line"
msgstr "<literal>Package:</literal> 行"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml:419
msgid "gives the package name"
msgstr "パッケージ名"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml:422 apt_preferences.5.xml:472
msgid "the <literal>Version:</literal> line"
msgstr "<literal>Version:</literal> 行"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:423
msgid "gives the version number for the named package"
msgstr "その名前のパッケージのバージョン番号"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:428
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6122,12 +6404,12 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:439
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:440
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6143,18 +6425,18 @@ msgstr ""
"ルでこの値を指定するには、以下の行が必要になります。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:450
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:456
msgid "the <literal>Codename:</literal> line"
msgstr "<literal>Codename:</literal> 行"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml:457
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6171,13 +6453,13 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:466
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:473
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian release version &stable-version;. Note that there is "
@@ -6194,7 +6476,7 @@ msgstr ""
"ります。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
#, no-wrap
msgid ""
"Pin: release v=&stable-version;\n"
@@ -6206,12 +6488,12 @@ msgstr ""
"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:491
msgid "the <literal>Component:</literal> line"
msgstr "<literal>Component:</literal> 行"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml:492
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6228,18 +6510,18 @@ msgstr ""
"下の行が必要になります。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:507
msgid "the <literal>Origin:</literal> line"
msgstr "<literal>Origin:</literal> 行"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:508
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6251,18 +6533,18 @@ msgstr ""
"ファイルでこの提供者を指定するには、以下の行が必要になります。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:514
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:520
msgid "the <literal>Label:</literal> line"
msgstr "<literal>Label:</literal> 行"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:521
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6274,13 +6556,13 @@ msgstr ""
"ファイルでこのラベルを指定するには、以下の行が必要になります。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:527
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:534
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6305,12 +6587,12 @@ msgstr ""
"filename> ファイルを含んでいます。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml:547
msgid "Optional Lines in an APT Preferences Record"
msgstr "APT プリファレンスレコードのオプション行"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:549
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6320,12 +6602,12 @@ msgstr ""
"literal> で始まる行を持てます。これは、コメント用の場所を確保します。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:558
msgid "Tracking Stable"
msgstr "安定版の追跡"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:566
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6349,7 +6631,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:560
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6364,8 +6646,8 @@ msgstr ""
"す。<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
-#: apt_preferences.5.xml:672
+#: apt_preferences.5.xml:583 apt_preferences.5.xml:629
+#: apt_preferences.5.xml:687
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6377,7 +6659,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml:578
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6389,13 +6671,13 @@ msgstr ""
"できます。<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:595
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:589
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6408,12 +6690,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:601
msgid "Tracking Testing or Unstable"
msgstr "テスト版や不安定版の追跡"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Package: *\n"
@@ -6441,7 +6723,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:603
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6458,7 +6740,7 @@ msgstr ""
"先度を割り当てます。<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:624
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6470,13 +6752,13 @@ msgstr ""
"ドできます。<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:644
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:635
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6495,12 +6777,12 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml:651
msgid "Tracking the evolution of a codename release"
msgstr "コード名リリースの進化の追跡"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml:665
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6534,7 +6816,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:653
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6558,7 +6840,7 @@ msgstr ""
"す。<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml:682
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6571,13 +6853,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml:702
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:693
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6596,7 +6878,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml:717
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6607,13 +6889,24 @@ msgstr "APT のデータ取得元の設定リスト"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+#, fuzzy
+#| msgid ""
+#| "The source list <filename>/etc/apt/sources.list</filename> is designed to "
+#| "support any number of active sources and a variety of source media. The "
+#| "file lists one source per line, with the most preferred source listed "
+#| "first. The information available from the configured sources is acquired "
+#| "by <command>apt-get update</command> (or by an equivalent command from "
+#| "another APT front-end)."
+msgid ""
+"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
msgstr ""
"取得元リスト <filename>/etc/apt/sources.list</filename> は、複数の取得元や"
"様々なメディアをサポートするよう設計されています。ファイルには、1 行にひとつ"
@@ -6621,36 +6914,35 @@ msgstr ""
"情報は、<command>apt-get update</command> (や、他の APT フロントエンドの同等"
"のコマンド) で取得します。"
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
-msgid ""
-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
-"literal>) followed by options and arguments for this type. Individual "
-"entries cannot be continued onto a following line. Empty lines are ignored, "
-"and a <literal>#</literal> character anywhere on a line marks the remainder "
-"of that line as a comment."
-msgstr ""
-"取得元の各行は、タイプ (例: <literal>deb-src</literal>) で始まり、そのタイプ"
-"のオプションや引数が続きます。個々のエントリは、次行に続けられません。空行は"
-"無視され、<literal>#</literal> 文字を行のどこにおいても、それ以降はコメントに"
-"なります。"
-
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml:45
msgid "sources.list.d"
msgstr "sources.list.d"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:46
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files. The format is the same as "
+#| "for the regular <filename>sources.list</filename> file. File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters. Otherwise APT will print a notice that it has ignored a "
+#| "file, unless that file matches a pattern in the <literal>Dir::Ignore-"
+#| "Files-Silently</literal> configuration list - in which case it will be "
+#| "silently ignored."
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files. The format is the same as for "
-"the regular <filename>sources.list</filename> file. File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"add sources.list entries in separate files. Two different file formats are "
+"allowed as described in the next two sections. Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format. The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters. Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."
msgstr ""
"<filename>/etc/apt/sources.list.d</filename> ディレクトリは、個別ファイルで "
"source.list エントリを追加する方法を提供します。フォーマットは、通常の "
@@ -6662,16 +6954,106 @@ msgstr ""
"APT が出力します。一致する場合は黙って無視します。"
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml:58
+msgid "one line style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:60
+msgid ""
+"Files in this format have the extension <filename>.list</filename>. Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"
+"literal>) followed by options and arguments for this type. Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line. If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>) included in the line after the type separated from "
+"it with a space. If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by a equal sign (<literal>=</literal>). "
+"Multivalue options have also <literal>-=</literal> and <literal>+=</literal> "
+"as separator which instead of replacing the default with the given value(s) "
+"modify the default value(s) to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:79
+msgid ""
+"This is the traditional format and supported by all apt versions. Note that "
+"not all options as described below are supported by all apt versions. Note "
+"also that some older applications parsing this format on its own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:87
+msgid "deb822 style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:89
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>. The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, like the metadata itself apt will download from the configured "
+"sources or the <filename>debian/control</filename> file in a Debian source "
+"package. Individual entries are separated by an empty line, additional "
+"empty lines are ignored, and a <literal>#</literal> character at the start "
+"of the line marks the entire line as a comment. An entry can hence be "
+"disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it. Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s). Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:108
+msgid ""
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier. It "
+"is intended to make this format gradually the default format and deprecating "
+"the previously described one line style format as it is easier to create, "
+"extend and modify by humans and machines alike especially if a lot of "
+"sources and/or options are involved. Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but could encounter problems with software not "
+"supporting the format yet."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:123
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: General Format"
msgstr "deb タイプと deb-src タイプ"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml:124
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type references a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. The "
+#| "<literal>distribution</literal> is generally an archive name like "
+#| "<literal>stable</literal> or <literal>testing</literal> or a codename "
+#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</"
+#| "literal> while component is one of <literal>main</literal>, "
+#| "<literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "<literal>deb-src</literal> type references a Debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type references a typical two-level Debian "
"archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
"<literal>stable</literal> or <literal>testing</literal> or a codename like "
"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
"literal> while component is one of <literal>main</literal>, "
@@ -6692,80 +7074,73 @@ msgstr ""
"です。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:135
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one line style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
msgstr ""
"<literal>deb</literal> タイプと <literal>deb-src</literal> タイプで使用する "
"<filename>sources.list</filename> エントリのフォーマットは、以下のようになり"
"ます。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
+#: sources.list.5.xml:138
#, no-wrap
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ オプション ] uri スイート [コンポーネント1] [コンポーネント2] [...]"
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
+msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:143
#, no-wrap
msgid ""
" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
+" URIs: uri\n"
+" Suites: suite\n"
+" Components: [component1] [component2] [...]\n"
+" option1: value1\n"
+" option2: value2\n"
" "
msgstr ""
-" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-" "
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:141
+#, fuzzy
+#| msgid ""
+#| "Alternatively a rfc822 style format is also supported: <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
"他に rfc822 形式の表記もサポートしています: <placeholder type=\"literallayout"
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml:152
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>suite</literal> can specify an exact path, in which case the "
+#| "components must be omitted and <literal>suite</literal> must end with a "
+#| "slash (<literal>/</literal>). This is useful for the case when only a "
+#| "particular sub-section of the archive denoted by the URI is of interest. "
+#| "If <literal>suite</literal> does not specify an exact path, at least one "
+#| "<literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>suite</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>suite</literal> must end with a "
"slash (<literal>/</literal>). This is useful for the case when only a "
-"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest. "
+"If <literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう"
@@ -6778,7 +7153,7 @@ msgstr ""
"なければなりません。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml:161
msgid ""
"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
"literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -6797,19 +7172,32 @@ msgstr ""
"チャで URI を自動的に生成します。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
-msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+#: sources.list.5.xml:169
+#, fuzzy
+#| msgid ""
+#| "In the traditional style sources.list format since only one distribution "
+#| "can be specified per line it may be necessary to have multiple lines for "
+#| "the same URI, if a subset of all available distributions or components at "
+#| "that location is desired. APT will sort the URI list after it has "
+#| "generated a complete set internally, and will collapse multiple "
+#| "references to the same Internet host, for instance, into a single "
+#| "connection, so that it does not inefficiently establish an FTP "
+#| "connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"Especially in the one line style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "
"location is desired. APT will sort the URI list after it has generated a "
"complete set internally, and will collapse multiple references to the same "
"Internet host, for instance, into a single connection, so that it does not "
-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
msgstr ""
"古い形式の sources.list の記法では有効なディストリビューションやコンポーネン"
"トの場所全てから、一部が必要な場合、1 行につき 1 つのディストリビューションし"
@@ -6822,29 +7210,73 @@ msgstr ""
"続を並行して行うようにもしています。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:181
+msgid ""
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+"最優先する取得元を最初に記述するというように、優先順に取得元を記述するのは重"
+"要です。一般的には、スピードの速い順に並べることになる (例えば、CD-ROM に続い"
+"てローカルネットワークのホスト、さらに続いて彼方のインターネットホスト) で"
+"しょう。"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:188
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:190
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:186
+msgid ""
+"As an example, the sources for your distribution could look like this in one "
+"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:193
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: Options"
+msgstr "deb タイプと deb-src タイプ"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:194
msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>. Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
+"Each source entry can have options specified modifying which and how the "
+"source is accessed and data acquired from it. Format, syntax and names of "
+"the options varies between the two formats one line and deb822 style as "
+"described, but they have both the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one line name in brackets. "
+"Remember that beside setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
msgstr ""
-"<literal>オプション</literal> は、常に省略可能で、角カッコで囲む必要がありま"
-"す。複数の設定を <literal><replaceable>設定</replaceable>=<replaceable>値</"
-"replaceable></literal> の形式で定義できます。複数の設定は空白で区切ります。以"
-"下の設定は APT がサポートしているものです (未サポートのものは黙って無視しま"
-"す)。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:205
+#, fuzzy
+#| msgid ""
+#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#| "replaceable>,…</literal> can be used to specify for which architectures "
+#| "information should be downloaded. If this option is not set all "
+#| "architectures defined by the <literal>APT::Architectures</literal> option "
+#| "will be downloaded."
msgid ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
msgstr ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> により、どのアーキテクチャ情報をダウンロードするか指"
@@ -6852,77 +7284,93 @@ msgstr ""
"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:212
msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information like translated package "
+"descriptions should be downloaded. If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
msgstr ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> あるいは <literal>arch-=<replaceable>arch1</"
-"replaceable>,<replaceable>arch2</replaceable>,…</literal> を使って、ダウン"
-"ロードするアーキテクチャを追加、削除できます。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:220
msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope."
msgstr ""
-"<literal>trusted=yes</literal> により、<filename>Release</filename> ファイル"
-"が未署名だったり、署名がチェックできなかったりしても、この取得元からのパッ"
-"ケージを常に認証すると指定します。これは &apt-secure; の一部を無効にしてしま"
-"うため、ローカルで信頼できる場合にのみ、使用するようにしてください。"
-"<literal>trusted=no</literal> は反対に、正しく認証された取得元であっても、未"
-"認証として扱います。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:228
msgid ""
-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
msgstr ""
-"最優先する取得元を最初に記述するというように、優先順に取得元を記述するのは重"
-"要です。一般的には、スピードの速い順に並べることになる (例えば、CD-ROM に続い"
-"てローカルネットワークのホスト、さらに続いて彼方のインターネットホスト) で"
-"しょう。"
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-msgid "Some examples:"
-msgstr "例:"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:235
+msgid ""
+"<option>Signed-By</option> (<option>signed-by</option>) is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key in either the <filename>trusted.gpg</"
+"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set only the key(s) in this keyring or only the key with this "
+"fingerprint is used for the &apt-secure; verification of this repository. "
+"Otherwise all keys in the trusted keyrings are considered valid signers for "
+"this repository."
+msgstr ""
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:249
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare until then the data provided in the "
+"repository should be considered valid and if this time is reached, but no "
+"new data is provided the data is considered expired and an error is raised. "
+"Beside increasing security as a malicious attacker can't sent old data "
+"forever denying a user to be able to upgrade to a new version, this also "
+"helps users identify mirrors which are no longer updated. Some repositories "
+"like historic archives aren't updated anymore by design through, so this "
+"check can be disabled by setting this option to <literal>no</literal>. "
+"Defaults to the value of configuration option <option>Acquire::Check-Valid-"
+"Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:266
+msgid ""
+"<option>Valid-Until-Min</option> (<option>check-valid-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldomly updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely. Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:288
msgid "URI specification"
msgstr "URI の仕様"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml:290
msgid "The currently recognized URI types are:"
msgstr "現在認識できる URI タイプは以下のとおりです。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:294
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6932,7 +7380,7 @@ msgstr ""
"にします。これは NFS マウントやローカルミラーで便利です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml:301
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6942,7 +7390,7 @@ msgstr ""
"グラムを使用してください。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:308
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6958,7 +7406,7 @@ msgstr ""
"指定してください。この認証方法は安全ではないことに注意してください。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:319
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6977,7 +7425,7 @@ msgstr ""
"す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:331
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6989,7 +7437,7 @@ msgstr ""
"用していて、APT でコピーを行う場合に便利です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:338
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7003,12 +7451,12 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:345
msgid "adding more recognizable URI types"
msgstr "さらに認識できる URI タイプの追加"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:347
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7026,44 +7474,84 @@ msgstr ""
"transport-debtorrent; を参照してください。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian "
+#| "for stable/main, stable/contrib, and stable/non-free."
msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
"/home/jason/debian に格納されている stable/main, stable/contrib, stable/non-"
"free 用のローカル (または NFS) アーカイブを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
-#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+#: sources.list.5.xml:361
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr "deb file:/home/jason/debian stable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:362
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:367
msgid "As above, except this uses the unstable (development) distribution."
msgstr "上記と同様ですが、不安定版 (開発版) を使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
-#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:368
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:369
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:374
msgid "Source line for the above"
msgstr "上記のソース行は以下のようになります。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
-#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:375
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:376
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:382
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7074,17 +7562,41 @@ msgstr ""
"<literal>armel</literal> アーキテクチャのパッケージ情報を取得します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
-#, no-wrap
+#: sources.list.5.xml:384
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgid ""
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:386
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml:398
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7093,13 +7605,24 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:400
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "deb http://archive.debian.org/debian-archive hamm main"
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr "deb http://archive.debian.org/debian-archive hamm main"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml:406
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7108,13 +7631,24 @@ msgstr ""
"&stable-codename;/contrib のみを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:408
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:409
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:414
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7127,19 +7661,49 @@ msgstr ""
"つだけになります。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:418
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:419
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml:431
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:432
+#, fuzzy, no-wrap
+#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:424
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
+#| "directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</"
+#| "filename> on amd64, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; "
+#| "official debian archives are not structured like this] <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7147,7 +7711,7 @@ msgid ""
"amd64, and so forth for other supported architectures. [Note this example "
"only illustrates how to use the substitution variable; official debian "
"archives are not structured like this] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
msgstr ""
"ftp.tlh.debian.org のアーカイブに HTTP アクセスし、universe ディレクトリ以下"
"を使用します。また、i386 マシンでは <filename>unstable/binary-i386</"
@@ -7158,8 +7722,39 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml:437
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:439
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:445
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:454
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;, &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
#. type: Content of: <refentry><refmeta><manvolnum>
@@ -9747,3 +10342,158 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
#: offline.dbk:242
msgid "Which will use the already fetched archives on the disc."
msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
+
+#~ msgid ""
+#~ "No action; perform a simulation of events that would occur but do not "
+#~ "actually change the system. Configuration Item: <literal>APT::Get::"
+#~ "Simulate</literal>."
+#~ msgstr ""
+#~ "動作なし - なにが起こるのかのシミュレーションを行い、実際にはシステムの変"
+#~ "更を行いません。設定項目: <literal>APT::Get::Simulate</literal>"
+
+#~ msgid ""
+#~ "Simulated runs performed as a user will automatically deactivate locking "
+#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
+#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
+#~ "notice will also be displayed indicating that this is only a simulation. "
+#~ "Runs performed as root do not trigger either NoLocking or the notice - "
+#~ "superusers should know what they are doing without further warnings from "
+#~ "<literal>apt-get</literal>."
+#~ msgstr ""
+#~ "ユーザとしてシミュレーションを実行すると、自動ではロックを行いません "
+#~ "(<literal>Debug::NoLocking</literal>)。また、<literal>APT::Get::Show-User-"
+#~ "Simulation-Note</literal> オプションが設定されている (デフォルト) と、これ"
+#~ "がシミュレーションであるという注意を表示します。root 権限で実行すると、"
+#~ "NoLocking も 注意も行われません (スーパーユーザは <literal>apt-get</"
+#~ "literal> による警告などなくても、何をしているのか知っていなければなりませ"
+#~ "ん)。"
+
+#~ msgid ""
+#~ "Ignore if packages can't be authenticated and don't prompt about it. "
+#~ "This is useful for tools like pbuilder. Configuration Item: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+#~ msgstr ""
+#~ "パッケージを確認できない場合に無視し、それについて質問しません。pbuilder "
+#~ "のようなツールで便利です。設定項目: <literal>APT::Get::"
+#~ "AllowUnauthenticated</literal>"
+
+#~ msgid ""
+#~ "Version 2 of this protocol dumps more information, including the protocol "
+#~ "version, the APT configuration space and the packages, files and versions "
+#~ "being changed. Version 3 adds the architecture and <literal>MultiArch</"
+#~ "literal> flag to each version being dumped."
+#~ msgstr ""
+#~ "このプロトコルのバージョン 2 では、(プロトコルのバージョンや APT 設定ス"
+#~ "ペース、パッケージを含む) 詳細情報やファイル、変更されているバージョンを出"
+#~ "力します。バージョン 3 では出力の各バージョンにアーキテクチャと "
+#~ "<literal>MultiArch</literal> フラグが追加されています。"
+
+#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr ""
+#~ "インストールされておらず、ターゲットリリースに含まれないバージョン。"
+
+#~ msgid ""
+#~ "Each line specifying a source starts with type (e.g. <literal>deb-src</"
+#~ "literal>) followed by options and arguments for this type. Individual "
+#~ "entries cannot be continued onto a following line. Empty lines are "
+#~ "ignored, and a <literal>#</literal> character anywhere on a line marks "
+#~ "the remainder of that line as a comment."
+#~ msgstr ""
+#~ "取得元の各行は、タイプ (例: <literal>deb-src</literal>) で始まり、そのタイ"
+#~ "プのオプションや引数が続きます。個々のエントリは、次行に続けられません。空"
+#~ "行は無視され、<literal>#</literal> 文字を行のどこにおいても、それ以降はコ"
+#~ "メントになります。"
+
+#~ msgid "deb [ options ] uri suite [component1] [component2] [...]"
+#~ msgstr "deb [ オプション ] uri スイート [コンポーネント1] [コンポーネント2] [...]"
+
+#~ msgid ""
+#~ " Types: deb deb-src\n"
+#~ " URIs: http://example.com\n"
+#~ " Suites: stable testing\n"
+#~ " Sections: component1 component2\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ "\n"
+#~ " Types: deb\n"
+#~ " URIs: http://another.example.com\n"
+#~ " Suites: experimental\n"
+#~ " Sections: component1 component2\n"
+#~ " Enabled: no\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ " "
+#~ msgstr ""
+#~ " Types: deb deb-src\n"
+#~ " URIs: http://example.com\n"
+#~ " Suites: stable testing\n"
+#~ " Sections: component1 component2\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ "\n"
+#~ " Types: deb\n"
+#~ " URIs: http://another.example.com\n"
+#~ " Suites: experimental\n"
+#~ " Sections: component1 component2\n"
+#~ " Enabled: no\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ " "
+
+#~ msgid ""
+#~ "<literal>options</literal> is always optional and needs to be surrounded "
+#~ "by square brackets. It can consist of multiple settings in the form "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>. Multiple settings are separated by spaces. The "
+#~ "following settings are supported by APT (note however that unsupported "
+#~ "settings will be ignored silently):"
+#~ msgstr ""
+#~ "<literal>オプション</literal> は、常に省略可能で、角カッコで囲む必要があり"
+#~ "ます。複数の設定を <literal><replaceable>設定</replaceable>=<replaceable>"
+#~ "値</replaceable></literal> の形式で定義できます。複数の設定は空白で区切り"
+#~ "ます。以下の設定は APT がサポートしているものです (未サポートのものは黙っ"
+#~ "て無視します)。"
+
+#~ msgid ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> which can be "
+#~ "used to add/remove architectures from the set which will be downloaded."
+#~ msgstr ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> あるいは <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> を使って、ダウン"
+#~ "ロードするアーキテクチャを追加、削除できます。"
+
+#~ msgid ""
+#~ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+#~ "this source are always authenticated even if the <filename>Release</"
+#~ "filename> file is not signed or the signature can't be checked. This "
+#~ "disables parts of &apt-secure; and should therefore only be used in a "
+#~ "local and trusted context. <literal>trusted=no</literal> is the opposite "
+#~ "which handles even correctly authenticated sources as not authenticated."
+#~ msgstr ""
+#~ "<literal>trusted=yes</literal> により、<filename>Release</filename> ファイ"
+#~ "ルが未署名だったり、署名がチェックできなかったりしても、この取得元からの"
+#~ "パッケージを常に認証すると指定します。これは &apt-secure; の一部を無効にし"
+#~ "てしまうため、ローカルで信頼できる場合にのみ、使用するようにしてください。"
+#~ "<literal>trusted=no</literal> は反対に、正しく認証された取得元であっても、"
+#~ "未認証として扱います。"
+
+#~ msgid "Some examples:"
+#~ msgstr "例:"
+
+#~ msgid ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+#~ msgstr ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 229ac02c1..9d448a13d 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-08-21 06:12-0400\n"
"PO-Revision-Date: 2014-07-04 02:13+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -658,17 +658,15 @@ msgstr ""
#. type: Content of: <refentry><refmeta><manvolnum>
#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
-#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
-#: apt-config.8.xml:22
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21 apt-config.8.xml:22
msgid "8"
msgstr "8"
#. type: Content of: <refentry><refmeta><refmiscinfo>
#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
-#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
-#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
-#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
-#: apt-ftparchive.1.xml:23
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22 apt-config.8.xml:23
+#: apt.conf.5.xml:28 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23 apt-ftparchive.1.xml:23
msgid "APT"
msgstr "APT"
@@ -679,10 +677,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
-#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
-#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
-#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
-#: apt-ftparchive.1.xml:34
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33 apt-config.8.xml:34
+#: apt.conf.5.xml:37 apt_preferences.5.xml:32 sources.list.5.xml:32
+#: apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34 apt-ftparchive.1.xml:34
msgid "Description"
msgstr "Opis"
@@ -700,12 +697,12 @@ msgstr ""
msgid ""
"<literal>list</literal> is used to display a list of packages. It supports "
"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option> are supported."
+"<option>--installed</option>, <option>--upgradable</option>, <option>--"
+"upgradeable</option>, <option>--all-versions</option> are supported."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml:55
msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
@@ -713,7 +710,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml:61
#, fuzzy
#| msgid ""
#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
@@ -726,7 +723,7 @@ msgstr ""
"danego pakietu."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml:68
msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
@@ -734,7 +731,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml:72 apt-get.8.xml:112
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -752,7 +749,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml:82 apt-get.8.xml:147
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note that removing a package "
@@ -765,15 +762,36 @@ msgstr ""
"zostanie poprzedzona znakiem plusa (bez rozdzielającej spacji), wskazany "
"pakiet zostanie zainstalowany zamiast zostać usunięty."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "alias since 1.1)"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml:90 apt-get.8.xml:228
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> jest używane do usuwania pakietów, które "
+"zostały zainstalowane automatycznie, żeby rozwiązać zależności w innych "
+"pakietach, i nie są już potrzebne."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:95
msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml:101
#, fuzzy
#| msgid ""
#| "<literal>showhold</literal> is used to print a list of packages on hold "
@@ -786,7 +804,7 @@ msgstr ""
"pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml:107
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -795,7 +813,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml:116
msgid ""
"<literal>full-upgrade</literal> performs the function of upgrade but may "
"also remove installed packages if that is required in order to resolve a "
@@ -803,19 +821,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt.8.xml:126 apt-get.8.xml:262 apt-cache.8.xml:246 apt-mark.8.xml:104
#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
#: apt-ftparchive.1.xml:500
msgid "options"
msgstr "opcje"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
+#: apt.8.xml:136
msgid "Script usage"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml:138
msgid ""
"The &apt; commandline is designed as a end-user tool and it may change the "
"output between versions. While it tries to not break backward compatibility "
@@ -825,12 +843,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
+#: apt.8.xml:146
msgid "Differences to &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
+#: apt.8.xml:147
msgid ""
"The <command>apt</command> command is meant to be pleasant for end users and "
"does not need to be backward compatible like &apt-get;. Therefore some "
@@ -838,28 +856,28 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
+#: apt.8.xml:153
#, fuzzy
#| msgid "the <literal>Package:</literal> line"
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
msgstr "linia <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:157
#, fuzzy
#| msgid "the <literal>Component:</literal> line"
msgid "The option <literal>APT::Color</literal> is enabled."
msgstr "linia <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:161
msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml:166
#, fuzzy
#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgid ""
@@ -868,17 +886,17 @@ msgid ""
msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt.8.xml:176 apt-get.8.xml:597 apt-cache.8.xml:359 apt-key.8.xml:191
#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
-#: apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701
-#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-config.8.xml:105 apt.conf.5.xml:1319 apt_preferences.5.xml:716
+#: sources.list.5.xml:453 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
#: apt-ftparchive.1.xml:603
msgid "See Also"
msgstr "Zobacz także"
#
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml:177
#, fuzzy
#| msgid ""
#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -893,7 +911,7 @@ msgstr ""
"&apt-preferences;, APT Howto."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt.8.xml:182 apt-get.8.xml:603 apt-cache.8.xml:364 apt-mark.8.xml:131
#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "Diagnostics"
@@ -901,7 +919,7 @@ msgstr "Diagnostyka"
#
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml:183
#, fuzzy
#| msgid ""
#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
@@ -1309,28 +1327,23 @@ msgstr ""
"zawierających zainstalowane pakiety."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
-msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
-msgstr ""
-"<literal>autoremove</literal> jest używane do usuwania pakietów, które "
-"zostały zainstalowane automatycznie, żeby rozwiązać zależności w innych "
-"pakietach, i nie są już potrzebne."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:233
-msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu). By default it displays the changelog for the version that is "
-"installed. However, you can specify the same options as for the "
-"<option>install</option> command."
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
+#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
+#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "changelogs</ulink> for Ubuntu). By default it displays the changelog for "
+#| "the version that is installed. However, you can specify the same options "
+#| "as for the <option>install</option> command."
+msgid ""
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>. By default it "
+"displays the changelog for the version that is installed. However, you can "
+"specify the same options as for the <option>install</option> command."
msgstr ""
"<literal>changelog</literal> pobiera dziennik zmian pakietu i wyświetla go, "
"używając polecenia <command>sensible-pager</command>. Nazwa serwera i "
@@ -1343,7 +1356,21 @@ msgstr ""
"te dla polecenia <option>install</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml:243
+msgid ""
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:267
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1352,7 +1379,7 @@ msgstr ""
"Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml:272
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -1362,7 +1389,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:277
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1373,7 +1400,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:282
#, fuzzy
#| msgid ""
#| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -1414,7 +1441,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml:297
msgid ""
"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -1434,7 +1461,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -1446,7 +1473,7 @@ msgstr ""
"Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:315
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1465,40 +1492,22 @@ msgstr ""
"gdyż APT może zadecydować o zrobieniu czegoś, czego użytkownik się nie "
"spodziewa. Pozycja w pliku konfiguracyjnym: <literal>quiet</literal>."
-#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:330
msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system. Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-"Brak akcji; wykonuje symulację zdarzeń, które mogłyby się przytrafić, ale "
-"nic nie zmienia w systemie. Pozycja w pliku konfiguracyjnym: <literal>APT::"
-"Get::Simulate</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
-msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>) so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation. A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>). Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."
msgstr ""
-"Symulowane uruchomienia przeprowadzane przez przez zwykłego użytkownika "
-"automatycznie wyłączą blokady (<literal>Debug::NoLocking</literal>). Jeżeli "
-"jest ustawiona opcja <literal>APT::Get::Show-User-Simulation-Note</literal> "
-"(a domyślnie jest ona ustawiona), to zostanie wyświetlona informacja o tym, "
-"że to jest tylko symulacja. Symulacje przeprowadzane przez administratora "
-"systemu nie powodują wyłączenia blokad ani nie pokazują informacji - "
-"administratorzy powinni wiedzieć, co robią, bez dodatkowych ostrzeżeń ze "
-"strony <literal>apt-get</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:340
msgid ""
"Simulated runs print out a series of lines, each representing a "
"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1515,7 +1524,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:348
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -1531,7 +1540,7 @@ msgstr ""
"Assume-Yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:356
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
"Assume-No</literal>."
@@ -1541,7 +1550,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:361
msgid ""
"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1552,7 +1561,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:367
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -1561,7 +1570,7 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:373
#, fuzzy
#| msgid ""
#| "This option controls the architecture packages are built for by "
@@ -1587,7 +1596,7 @@ msgstr ""
"Host-Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml:383
#, fuzzy
#| msgid ""
#| "This option controls the architecture packages are built for by "
@@ -1613,7 +1622,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:394
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -1623,7 +1632,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml:399
msgid ""
"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -1637,7 +1646,7 @@ msgstr ""
"<literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml:406
msgid ""
"Allow installing new packages when used in conjunction with "
"<literal>upgrade</literal>. This is useful if the update of a installed "
@@ -1650,7 +1659,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:418
msgid ""
"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1663,7 +1672,7 @@ msgstr ""
"<literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:425
msgid ""
"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1677,13 +1686,93 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml:433
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+"Wymuszenie. Jest to niebezpieczna opcja, która powoduje, że apt-get "
+"kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
+"jeśli robi coś, co może być szkodliwe. Nie powinna być używana, z wyjątkiem "
+"bardzo szczególnych sytuacji. Używanie <literal>force-yes</literal> może "
+"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
+"force-yes</literal>."
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+"Wymuszenie. Jest to niebezpieczna opcja, która powoduje, że apt-get "
+"kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
+"jeśli robi coś, co może być szkodliwe. Nie powinna być używana, z wyjątkiem "
+"bardzo szczególnych sytuacji. Używanie <literal>force-yes</literal> może "
+"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
+"force-yes</literal>."
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+"Wymuszenie. Jest to niebezpieczna opcja, która powoduje, że apt-get "
+"kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
+"jeśli robi coś, co może być szkodliwe. Nie powinna być używana, z wyjątkiem "
+"bardzo szczególnych sytuacji. Używanie <literal>force-yes</literal> może "
+"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
+"force-yes</literal>."
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:457
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
msgid ""
"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
-"<literal>APT::Get::force-yes</literal>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."
msgstr ""
"Wymuszenie. Jest to niebezpieczna opcja, która powoduje, że apt-get "
"kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
@@ -1694,7 +1783,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:465
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected MD5 "
@@ -1717,7 +1806,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:476
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1732,7 +1821,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:484
msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1741,7 +1830,7 @@ msgstr ""
"Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:489
msgid ""
"This option is on by default; use <literal>--no-list-cleanup</literal> to "
"turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1759,7 +1848,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:499
msgid ""
"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -1783,7 +1872,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:514
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1798,7 +1887,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml:521
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1808,7 +1897,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:527
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running the <literal>autoremove</"
@@ -1823,7 +1912,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml:534
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -1843,7 +1932,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:545
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1855,7 +1944,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:551
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -1866,18 +1955,18 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:556
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
-"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself. "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override. Configuration Item: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
-"Ignorowanie sytuacji, w których nie powiedzie się autentykacja pakietów i "
-"nieostrzeganie o tym. Jest to użyteczne dla programów typu pbuilder. Pozycja "
-"w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:566
msgid ""
"Forbid the update command to acquire unverifiable data from configured "
"sources. Apt will fail at the update command for repositories without valid "
@@ -1886,7 +1975,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1896,14 +1985,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
-#: apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml:587 apt-cache.8.xml:352 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1313 apt_preferences.5.xml:709
msgid "Files"
msgstr "Pliki"
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
#, fuzzy
#| msgid ""
#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1920,7 +2009,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml:604
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1958,9 +2047,9 @@ msgstr ""
"istnieje lub jest przestarzały."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
-#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
-#: apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml:49 apt-cache.8.xml:137 apt-cache.8.xml:161
+#: apt-cache.8.xml:183 apt-cache.8.xml:188 apt-cache.8.xml:204
+#: apt-cache.8.xml:222 apt-cache.8.xml:234
msgid "&synopsis-pkg;"
msgstr "&synopsis-pkg;"
@@ -2132,10 +2221,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:124
+#, fuzzy
+#| msgid ""
+#| "<literal>Total distinct</literal> versions is the number of package "
+#| "versions found in the cache; this value is therefore at least equal to "
+#| "the number of total package names. If more than one distribution is being "
+#| "accessed (for instance, \"stable\" and \"unstable\"), this value can be "
+#| "considerably larger than the number of total package names."
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
"instance, \"stable\" and \"unstable\"), this value can be considerably "
"larger than the number of total package names."
msgstr ""
@@ -2148,7 +2243,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:130
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
@@ -2157,11 +2252,17 @@ msgstr ""
"więzów zależności wymaganych przez wszystkie pakiety w buforze."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:138
+#, fuzzy
+#| msgid ""
+#| "<literal>showsrc</literal> displays all the source package records that "
+#| "match the given package names. All versions are shown, as well as all "
+#| "records that declare the name to be a binary package."
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."
msgstr ""
"<literal>showsrc</literal> wyświetla wszystkie pakiety źródłowe, które "
"odpowiadają podanym nazwom pakietów. Wyświetlone zostaną wszystkie wersje "
@@ -2170,7 +2271,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:147
msgid ""
"<literal>dump</literal> shows a short listing of every package in the cache. "
"It is primarily for debugging."
@@ -2180,7 +2281,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml:152
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2191,7 +2292,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml:157
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
@@ -2201,7 +2302,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml:162
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg --print-"
"avail</command>; it displays the package records for the named packages."
@@ -2210,12 +2311,22 @@ msgstr ""
"avail</command>; pokazuje szczegółowe informacje o podanych pakietach."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:167
msgid "&synopsis-regex;"
msgstr "&synopsis-regex;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:168
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see &regex;. It "
+#| "searches the package names and the descriptions for an occurrence of the "
+#| "regular expression and prints out the package name and the short "
+#| "description, including virtual package names. If <option>--full</option> "
+#| "is given then output identical to <literal>show</literal> is produced for "
+#| "each matched package, and if <option>--names-only</option> is given then "
+#| "the long description is not searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see &regex;. It searches "
@@ -2224,7 +2335,7 @@ msgid ""
"including virtual package names. If <option>--full</option> is given then "
"output identical to <literal>show</literal> is produced for each matched "
"package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."
msgstr ""
"<literal>search</literal> wykonuje pełne wyszukiwanie podanego wzorca "
"będącego wyrażeniem regularnym POSIX (patrz &regex;) we wszystkich "
@@ -2238,7 +2349,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:179
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -2248,7 +2359,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:184
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -2258,7 +2369,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:189
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -2267,13 +2378,13 @@ msgstr ""
"danego pakietu."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:193
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:194
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -2288,7 +2399,7 @@ msgstr ""
"używać z opcją <option>--generate</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:199
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -2301,7 +2412,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:205
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2322,7 +2433,7 @@ msgstr ""
"Cache::GivenOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml:214
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2337,12 +2448,12 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:219
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:223
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2352,13 +2463,13 @@ msgstr ""
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:227
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:228
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -2372,7 +2483,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml:235
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -2391,7 +2502,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:251
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -2403,7 +2514,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:257
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2420,7 +2531,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:265
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2434,7 +2545,7 @@ msgstr ""
"pliku konfiguracyjnym: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:272
msgid ""
"Print only important dependencies; for use with <literal>unmet</literal> and "
"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2446,9 +2557,16 @@ msgstr ""
"Cache::Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml:286
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be tweaked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
@@ -2460,9 +2578,21 @@ msgstr ""
"<literal>APT::Cache::Show<replaceable>TypZależności</replaceable></literal>, "
"na przykład <literal>APT::Cache::ShowRecommends</literal>."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:294
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data. A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture. Configuration Item: <literal>APT::Cache::ShowImplicit</"
+"literal>."
+msgstr ""
+
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:304
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -2471,7 +2601,7 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:309
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -2490,7 +2620,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml:318
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2503,17 +2633,21 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:324
+#, fuzzy
+#| msgid ""
+#| "Only search on the package names, not the long descriptions. "
+#| "Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgid ""
-"Only search on the package names, not the long descriptions. Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
"Przeszukaj tylko nazwy pakietów, pomijając szczegółowe opisy. Pozycja w "
"pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:329
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -2526,7 +2660,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -2539,7 +2673,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:342
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -2551,13 +2685,13 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:360
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:365
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3898,11 +4032,13 @@ msgid ""
"user system. Archive maintainers are encouraged to create Release files with "
"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
"value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used. The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:308
+#: apt.conf.5.xml:310
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3910,11 +4046,13 @@ msgid ""
"<literal>Valid-Until</literal> header the earlier date of the two is used as "
"the expiration date. The default value is <literal>0</literal> which stands "
"for \"valid forever\". Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml:323
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3922,11 +4060,13 @@ msgid ""
"(local) mirror of a more frequently updated archive with a <literal>Valid-"
"Until</literal> header instead of completely disabling the expiration date "
"checking. Archive specific settings can and should be used by appending the "
-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:336
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3934,7 +4074,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:339
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 "
@@ -3945,7 +4085,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:349
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3955,21 +4095,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:357
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:358
+#: apt.conf.5.xml:362
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:363
+#: apt.conf.5.xml:367
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]/</"
@@ -3981,7 +4121,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:375
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 "
@@ -3993,14 +4133,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381 apt.conf.5.xml:469
+#: apt.conf.5.xml:385 apt.conf.5.xml:473
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:384
+#: apt.conf.5.xml:388
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."
@@ -4012,14 +4152,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:395
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:394
+#: apt.conf.5.xml:398
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes per second. The default "
@@ -4029,7 +4169,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:405
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 "
@@ -4037,7 +4177,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:409
msgid ""
"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
"an external command to discover the http proxy to use. Apt expects the "
@@ -4051,7 +4191,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:427
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4062,7 +4202,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:435
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4084,7 +4224,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:456
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]/</"
@@ -4103,7 +4243,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: apt.conf.5.xml:476
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, "
@@ -4113,7 +4253,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:483
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 "
@@ -4122,7 +4262,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:488
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4132,13 +4272,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:502
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:497
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4151,20 +4291,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:510
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:517
+#: apt.conf.5.xml:521
#, 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:512
+#: apt.conf.5.xml:516
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4176,19 +4316,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:526
#, 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:525
+#: apt.conf.5.xml:529
#, 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:518
+#: apt.conf.5.xml:522
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 "
@@ -4206,13 +4346,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:536
#, 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:527
+#: apt.conf.5.xml:531
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4227,7 +4367,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:541
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4235,7 +4375,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:548
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4244,7 +4384,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:556
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4256,13 +4396,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:573
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:561
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4284,7 +4424,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:574
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4293,24 +4433,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:583
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:589
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:595
msgid ""
"The maximum file size of Release/Release.gpg/InRelease files. The default "
"is 10MB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:602
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to. The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:611
msgid ""
"Allow the update operation to load data files from a repository without a "
"trusted signature. If enabled this option no data files will be loaded and "
@@ -4319,7 +4467,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:622
msgid ""
"Allow that a repository that was previously gpg signed to become unsigned "
"durign a update operation. When there is no valid signature of a perviously "
@@ -4329,13 +4477,46 @@ msgid ""
"source untrusted and warn about them if you try to install them."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:634
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:636
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them. Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>. The value should be a "
+"normal URI to a text file, expect that package specific data is replaced "
+"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"if the package is from a component (e.g. <literal>main</literal>) this is "
+"the first part otherwise it is omitted, 2. the first letter of source "
+"package name, expect if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version. "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>') and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>'). The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:664
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:666
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4347,7 +4528,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:673
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4361,7 +4542,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:683
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4371,7 +4552,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:689
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 "
@@ -4379,7 +4560,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:693
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4390,20 +4571,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:701
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>. So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>. If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:715
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 "
@@ -4414,12 +4595,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:724
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:726
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4427,7 +4608,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:731
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4440,40 +4621,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:745
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:709
+#: apt.conf.5.xml:750
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:714
+#: apt.conf.5.xml:755
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:720
+#: apt.conf.5.xml:761
msgid "How APT calls &dpkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:762
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:726
+#: apt.conf.5.xml:767
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 "
@@ -4481,7 +4662,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:773
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 "
@@ -4490,7 +4671,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:780
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 "
@@ -4501,16 +4682,51 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:787
msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:792
+msgid ""
+"Each configuration directive line has the form <literal>key=value</"
+"literal>. Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:800
+msgid ""
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:810
+msgid ""
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
+"\" is an incorrect typename which is just kept to remain compatible, it "
+"should be read as \"no\" and users are encouraged to support both."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:816
msgid ""
"The version of the protocol to be used for the command "
"<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4521,7 +4737,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:823
msgid ""
"The file descriptor to be used to send the information can be requested with "
"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4532,26 +4748,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:833
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:773
+#: apt.conf.5.xml:838
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:778
+#: apt.conf.5.xml:843
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:779
+#: apt.conf.5.xml:844
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 "
@@ -4566,7 +4782,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:859
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4580,7 +4796,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:853
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 "
@@ -4594,7 +4810,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:866
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 "
@@ -4607,7 +4823,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:874
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4624,7 +4840,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:889
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4635,7 +4851,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:896
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4645,7 +4861,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:909
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4663,7 +4879,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:902
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 "
@@ -4677,12 +4893,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:922
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:923
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4691,13 +4907,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:931
#, fuzzy
msgid "Debug options"
msgstr "opcje"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:933
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4708,7 +4924,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:944
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4716,7 +4932,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:952
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4724,7 +4940,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:961
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4734,7 +4950,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:904
+#: apt.conf.5.xml:969
#, fuzzy
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -4744,59 +4960,59 @@ msgstr ""
"in CDROM IDs."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:914
+#: apt.conf.5.xml:979
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:923
+#: apt.conf.5.xml:988
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:999
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:1010
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1021
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:967
+#: apt.conf.5.xml:1032
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:978
+#: apt.conf.5.xml:1043
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:988
+#: apt.conf.5.xml:1053
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:998
+#: apt.conf.5.xml:1063
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:1008
+#: apt.conf.5.xml:1073
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 "
@@ -4804,53 +5020,53 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1084
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:1031
+#: apt.conf.5.xml:1096
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:1041
+#: apt.conf.5.xml:1106
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:1051
+#: apt.conf.5.xml:1116
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:1063
+#: apt.conf.5.xml:1128
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:1074
+#: apt.conf.5.xml:1139
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:1085
+#: apt.conf.5.xml:1150
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:1095
+#: apt.conf.5.xml:1160
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -4860,7 +5076,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml:1174
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -4878,46 +5094,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1130
+#: apt.conf.5.xml:1195
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:1141
+#: apt.conf.5.xml:1206
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:1152
+#: apt.conf.5.xml:1217
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:1164
+#: apt.conf.5.xml:1229
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:1175
+#: apt.conf.5.xml:1240
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1185
+#: apt.conf.5.xml:1250
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:1196
+#: apt.conf.5.xml:1261
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 "
@@ -4925,14 +5141,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1208
+#: apt.conf.5.xml:1273
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml:1283
msgid ""
"Display the external commands that are called by apt hooks. This includes e."
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -4940,13 +5156,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt.conf.5.xml:1307 apt_preferences.5.xml:556 sources.list.5.xml:358
#: apt-ftparchive.1.xml:592
msgid "Examples"
msgstr "Przykłady"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml:1308
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -4954,7 +5170,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml:1320
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5158,10 +5374,11 @@ msgstr "priorytet 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:118
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
-msgstr "wersjom niezainstalowanym i nienależącym do wydania docelowego."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that do not belong to the target release."
+msgstr "wersjom niezainstalowanym i należącym do wydania docelowego."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:122
@@ -5170,12 +5387,21 @@ msgstr "priorytet 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:123
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
msgstr "wersjom niezainstalowanym i należącym do wydania docelowego."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:127
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:131
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5192,7 +5418,7 @@ msgstr ""
"100, jeśli dodatkowo są oznaczone jako \"ButAutomaticUpgrades: yes\"."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml:138
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -5201,7 +5427,7 @@ msgstr ""
"następujące reguły wymienione w kolejności, w jakiej są stosowane."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml:141
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5216,12 +5442,12 @@ msgstr ""
"Instalowanie wcześniejszych wersji pakietów może być ryzykowną operacją)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid "Install the highest priority version."
msgstr "Instaluje wersję o najwyższym priorytecie."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:148
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -5230,7 +5456,7 @@ msgstr ""
"wersja nowsza (czyli z większym numerem wersji)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml:151
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5242,7 +5468,7 @@ msgstr ""
"niezainstalowany."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:157
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5257,7 +5483,7 @@ msgstr ""
"upgrade</command> zaktualizują ten pakiet."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:164
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5271,7 +5497,7 @@ msgstr ""
"wersją."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5289,12 +5515,12 @@ msgstr ""
"wersji ma większy priorytet niż wersja zainstalowana."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:178
msgid "The Effect of APT Preferences"
msgstr "Efekt stosowania preferencji APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:180
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5307,7 +5533,7 @@ msgstr ""
"przyjmować jedną z dwóch postaci: szczegółową i ogólną."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:186
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages with a specified version or version range. For example, "
@@ -5324,7 +5550,7 @@ msgstr ""
"rozdzielając je od siebie spacjami."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5336,7 +5562,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:199
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5350,7 +5576,7 @@ msgstr ""
"strony internetowej identyfikowanej przez pełną nazwę domenową strony."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:205
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5361,7 +5587,7 @@ msgstr ""
"wszystkim wersjom pakietów dostępnych na lokalnym komputerze."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:210
#, no-wrap
msgid ""
"Package: *\n"
@@ -5373,7 +5599,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml:215
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
"which can be used to match a hostname. The following record will assign a "
@@ -5386,7 +5612,7 @@ msgstr ""
"identyfikowanym przez nazwę komputera \"ftp.de.debian.org\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:219
#, no-wrap
msgid ""
"Package: *\n"
@@ -5398,7 +5624,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:223
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -5413,7 +5639,7 @@ msgstr ""
"lub \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml:228
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5424,7 +5650,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:232
#, no-wrap
msgid ""
"Package: *\n"
@@ -5436,7 +5662,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:237
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5447,7 +5673,7 @@ msgstr ""
"\"<literal>&testing-codename;</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
#, no-wrap
msgid ""
"Package: *\n"
@@ -5459,7 +5685,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5472,7 +5698,7 @@ msgstr ""
"\"<literal>&stable-version;</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, no-wrap
msgid ""
"Package: *\n"
@@ -5483,13 +5709,22 @@ msgstr ""
"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:258
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:266
msgid "Regular expressions and &glob; syntax"
msgstr "Składnia wyrażeń regularnych i &glob;"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:268
msgid ""
"APT also supports pinning by &glob; expressions, and regular expressions "
"surrounded by slashes. For example, the following example assigns the "
@@ -5505,7 +5740,7 @@ msgstr ""
"POSIX otoczone ukośnikami)."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
@@ -5517,7 +5752,7 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -5528,7 +5763,7 @@ msgstr ""
"pakietom z wydania o nazwie zaczynającej się od &ubuntu-codename;."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
#, no-wrap
msgid ""
"Package: *\n"
@@ -5540,7 +5775,7 @@ msgstr ""
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
@@ -5559,12 +5794,12 @@ msgstr ""
"<literal>Package</literal> nie jest uznawany za wyrażenie &glob;."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid "How APT Interprets Priorities"
msgstr "Jak APT interpretuje priorytety"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:314
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking):"
@@ -5574,12 +5809,12 @@ msgstr ""
"rzecz biorąc):"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:319
msgid "P &gt;= 1000"
msgstr "P &gt;= 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -5588,12 +5823,12 @@ msgstr ""
"zastąpienie pakietu jego wcześniejszą wersją."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml:324
msgid "990 &lt;= P &lt; 1000"
msgstr "990 &lt;= P &lt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -5602,12 +5837,12 @@ msgstr ""
"wydania docelowego, chyba że zainstalowana wersja jest nowsza."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:330
msgid "500 &lt;= P &lt; 990"
msgstr "500 &lt;= P &lt; 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:331
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -5617,12 +5852,12 @@ msgstr ""
"zainstalowana."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "100 &lt;= P &lt; 500"
msgstr "100 &lt;= P &lt; 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:337
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -5631,12 +5866,12 @@ msgstr ""
"należąca do innej dystrybucji lub nowsza wersja jest zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:342
msgid "0 &lt; P &lt; 100"
msgstr "0 &lt; P &lt; 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:343
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -5645,22 +5880,40 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:347
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:348
msgid "prevents the version from being installed"
msgstr "zapobiega instalowaniu wersji"
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:351
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:352
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
-msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version. Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+#: apt_preferences.5.xml:358
+#, fuzzy
+#| msgid ""
+#| "If any specific-form records match an available package version then the "
+#| "first such record determines the priority of the package version. "
+#| "Failing that, if any general-form records match an available package "
+#| "version then the first such record determines the priority of the package "
+#| "version."
+msgid ""
+"The first specific-form record matching an available package version "
+"determines the priority of the package version. Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version. Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
msgstr ""
"Jeśli jakiekolwiek rekordy w postaci szczegółowej pasują do dostępnej wersji "
"pakietu, to priorytet tej wersji jest określany na podstawie pierwszego z "
@@ -5669,7 +5922,7 @@ msgstr ""
"określany na podstawie pierwszego z takich rekordów."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:366
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -5678,7 +5931,7 @@ msgstr ""
"wcześniej rekordy:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:370
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5706,12 +5959,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:383
msgid "Then:"
msgstr "Wtedy:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -5727,7 +5980,7 @@ msgstr ""
"&good-perl;*."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:390
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -5738,7 +5991,7 @@ msgstr ""
"pakietu, włączając w to wersję należącą do wydania docelowego."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:394
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -5752,12 +6005,12 @@ msgstr ""
"nie jest jeszcze zainstalowana."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml:404
msgid "Determination of Package Version and Distribution Properties"
msgstr "Określanie wersji pakietu i właściwości dystrybucji"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:406
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -5768,7 +6021,7 @@ msgstr ""
"pakiety dostępne w danej lokalizacji."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:410
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -5787,27 +6040,27 @@ msgstr ""
"priorytetów APT bierze pod uwagę tylko dwie linie z każdego rekordu:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:418
msgid "the <literal>Package:</literal> line"
msgstr "linia <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml:419
msgid "gives the package name"
msgstr "podaje nazwę pakietu"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml:422 apt_preferences.5.xml:472
msgid "the <literal>Version:</literal> line"
msgstr "linia <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:423
msgid "gives the version number for the named package"
msgstr "podaje numer wersji danego pakietu"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:428
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -5830,12 +6083,12 @@ msgstr ""
"priorytetów APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:439
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:440
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -5852,18 +6105,18 @@ msgstr ""
"następujący sposób:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:450
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:456
msgid "the <literal>Codename:</literal> line"
msgstr "linia <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml:457
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -5880,13 +6133,13 @@ msgstr ""
"następujący sposób:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:466
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:473
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian release version &stable-version;. Note that there is "
@@ -5903,7 +6156,7 @@ msgstr ""
"sposób:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
#, no-wrap
msgid ""
"Pin: release v=&stable-version;\n"
@@ -5915,12 +6168,12 @@ msgstr ""
"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:491
msgid "the <literal>Component:</literal> line"
msgstr "linia <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml:492
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -5938,18 +6191,18 @@ msgstr ""
"następujący sposób:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:507
msgid "the <literal>Origin:</literal> line"
msgstr "linia <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:508
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -5961,18 +6214,18 @@ msgstr ""
"można podać w pliku preferencji APT w następujący sposób:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:514
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:520
msgid "the <literal>Label:</literal> line"
msgstr "linia <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:521
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -5984,13 +6237,13 @@ msgstr ""
"podać w pliku preferencji APT w następujący sposób:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:527
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:534
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6015,12 +6268,12 @@ msgstr ""
"dystrybucji <literal>unstable</literal> ."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml:547
msgid "Optional Lines in an APT Preferences Record"
msgstr "Opcjonalne linie w rekordzie preferencji APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:549
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6031,12 +6284,12 @@ msgstr ""
"literal> (tj. objaśnienie). Pozwala to na dodawanie komentarzy do rekordów."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:558
msgid "Tracking Stable"
msgstr "Śledzenie dystrybucji stabilnej"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:566
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6060,7 +6313,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:560
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6075,8 +6328,8 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
-#: apt_preferences.5.xml:672
+#: apt_preferences.5.xml:583 apt_preferences.5.xml:629
+#: apt_preferences.5.xml:687
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6088,7 +6341,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml:578
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6101,13 +6354,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:595
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:589
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6120,12 +6373,12 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:601
msgid "Tracking Testing or Unstable"
msgstr "Śledzenie dystrybucji testowej lub niestabilnej"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Package: *\n"
@@ -6153,7 +6406,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:603
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6170,7 +6423,7 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:624
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6183,13 +6436,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:644
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:635
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6209,12 +6462,12 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml:651
msgid "Tracking the evolution of a codename release"
msgstr "Śledzenie ewolucji wydania o danej nazwie kodowej"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml:665
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6248,7 +6501,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:653
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6274,7 +6527,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml:682
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6287,13 +6540,13 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml:702
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:693
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6313,7 +6566,7 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml:717
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6324,13 +6577,24 @@ msgstr "Lista skonfigurowanych źródeł danych APT"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+#, fuzzy
+#| msgid ""
+#| "The source list <filename>/etc/apt/sources.list</filename> is designed to "
+#| "support any number of active sources and a variety of source media. The "
+#| "file lists one source per line, with the most preferred source listed "
+#| "first. The information available from the configured sources is acquired "
+#| "by <command>apt-get update</command> (or by an equivalent command from "
+#| "another APT front-end)."
+msgid ""
+"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
msgstr ""
"Plik źródeł <filename>/etc/apt/sources.list</filename> został zaprojektowany "
"tak, by obsłużyć dowolną liczbę aktywnych źródeł i różne nośniki źródeł. W "
@@ -6340,37 +6604,35 @@ msgstr ""
"<command>apt-get update</command> (lub przez podobne polecenie innego "
"programu użytkowego będącego interfejsem do systemu APT)."
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
-msgid ""
-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
-"literal>) followed by options and arguments for this type. Individual "
-"entries cannot be continued onto a following line. Empty lines are ignored, "
-"and a <literal>#</literal> character anywhere on a line marks the remainder "
-"of that line as a comment."
-msgstr ""
-"Każda linia określająca źródło rozpoczyna się od typu (np. <literal>deb-src</"
-"literal>), po którym następują opcje i argumenty dla tego typu. Wpisy nie "
-"mogą być kontynuowane w nowych liniach. Puste linie są ignorowane, a znak "
-"\"<literal>#</literal> \" występujący gdziekolwiek w linii oznacza, że "
-"dalsza część linii stanowi komentarz."
-
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml:45
msgid "sources.list.d"
msgstr "sources.list.d"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:46
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files. The format is the same as "
+#| "for the regular <filename>sources.list</filename> file. File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters. Otherwise APT will print a notice that it has ignored a "
+#| "file, unless that file matches a pattern in the <literal>Dir::Ignore-"
+#| "Files-Silently</literal> configuration list - in which case it will be "
+#| "silently ignored."
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files. The format is the same as for "
-"the regular <filename>sources.list</filename> file. File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"add sources.list entries in separate files. Two different file formats are "
+"allowed as described in the next two sections. Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format. The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters. Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."
msgstr ""
"Katalog <filename>/etc/apt/sources.list.d</filename> umożliwia podzielenie "
"pliku źródeł na osobne pliki. Format jest dokładnie taki sam, jak w "
@@ -6383,16 +6645,106 @@ msgstr ""
"wypisze odpowiedni komunikat."
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml:58
+msgid "one line style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:60
+msgid ""
+"Files in this format have the extension <filename>.list</filename>. Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"
+"literal>) followed by options and arguments for this type. Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line. If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>) included in the line after the type separated from "
+"it with a space. If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by a equal sign (<literal>=</literal>). "
+"Multivalue options have also <literal>-=</literal> and <literal>+=</literal> "
+"as separator which instead of replacing the default with the given value(s) "
+"modify the default value(s) to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:79
+msgid ""
+"This is the traditional format and supported by all apt versions. Note that "
+"not all options as described below are supported by all apt versions. Note "
+"also that some older applications parsing this format on its own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:87
+msgid "deb822 style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:89
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>. The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, like the metadata itself apt will download from the configured "
+"sources or the <filename>debian/control</filename> file in a Debian source "
+"package. Individual entries are separated by an empty line, additional "
+"empty lines are ignored, and a <literal>#</literal> character at the start "
+"of the line marks the entire line as a comment. An entry can hence be "
+"disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it. Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s). Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:108
+msgid ""
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier. It "
+"is intended to make this format gradually the default format and deprecating "
+"the previously described one line style format as it is easier to create, "
+"extend and modify by humans and machines alike especially if a lot of "
+"sources and/or options are involved. Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but could encounter problems with software not "
+"supporting the format yet."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:123
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: General Format"
msgstr "Typy deb i deb-src"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml:124
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type references a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. The "
+#| "<literal>distribution</literal> is generally an archive name like "
+#| "<literal>stable</literal> or <literal>testing</literal> or a codename "
+#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</"
+#| "literal> while component is one of <literal>main</literal>, "
+#| "<literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "<literal>deb-src</literal> type references a Debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type references a typical two-level Debian "
"archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
"<literal>stable</literal> or <literal>testing</literal> or a codename like "
"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
"literal> while component is one of <literal>main</literal>, "
@@ -6414,53 +6766,48 @@ msgstr ""
"źródłowych."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:135
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one line style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
msgstr ""
"Formaty wpisu w <filename>sources.list</filename> używającego typów "
"<literal>deb</literal> i <literal>deb-src</literal> jest następujący:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
-#, fuzzy, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ opcje ] uri dystrybucja [komponent1] [komponent2] [...]"
+#: sources.list.5.xml:138
+#, no-wrap
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
+msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:143
#, no-wrap
msgid ""
" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
+" URIs: uri\n"
+" Suites: suite\n"
+" Components: [component1] [component2] [...]\n"
+" option1: value1\n"
+" option2: value2\n"
" "
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:141
msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml:152
#, fuzzy
#| msgid ""
#| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -6477,8 +6824,8 @@ msgid ""
"<literal>suite</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>suite</literal> must end with a "
"slash (<literal>/</literal>). This is useful for the case when only a "
-"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest. "
+"If <literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"URI typu <literal>deb</literal> musi podawać bazową lokalizację dystrybucji "
@@ -6491,7 +6838,7 @@ msgstr ""
"<literal>komponent</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml:161
#, fuzzy
#| msgid ""
#| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -6520,7 +6867,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
+#: sources.list.5.xml:169
#, fuzzy
#| msgid ""
#| "Since only one distribution can be specified per line it may be necessary "
@@ -6535,17 +6882,16 @@ msgstr ""
#| "also parallelizes connections to different hosts to more effectively deal "
#| "with sites with low bandwidth."
msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+"Especially in the one line style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "
"location is desired. APT will sort the URI list after it has generated a "
"complete set internally, and will collapse multiple references to the same "
"Internet host, for instance, into a single connection, so that it does not "
-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
msgstr ""
"Ponieważ w pojedynczej linii można podać tylko jedną dystrybucję, może być "
"potrzebne wymienienie tego samego URI w wielu liniach, jeżeli pożądany jest "
@@ -6561,39 +6907,62 @@ msgstr ""
"sieciach o niskiej przepustowości łączy."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
-msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>. Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
-msgstr ""
-"<literal>opcje</literal> nigdy nie są wymagane i powinny być otoczone przez "
-"nawiasy kwadratowe. Mogą się składać z wielu ustawień w formacie "
-"<literal><replaceable>ustawienie</replaceable>=<replaceable>wartość</"
-"replaceable></literal> oddzielonych od siebie znakami spacji. APT obsługuje "
-"następujące ustawienia (a ustawienia nieobsługiwane są ignorowane bez "
-"wypisywania żadnego ostrzeżenia):"
+#: sources.list.5.xml:181
+msgid ""
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+"Ważne jest, aby źródła pakietów były wymienione w kolejności preferencji "
+"użytkownika, zaczynając od tego najbardziej preferowanego. Zazwyczaj "
+"wynikiem tego będzie sortowanie od najszybszego do najwolniejszego (na "
+"przykład CD-ROM przed komputerami w lokalnej sieci przed odległymi "
+"komputerami w Internecie)."
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:188
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:190
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:186
msgid ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
+"As an example, the sources for your distribution could look like this in one "
+"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:193
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: Options"
+msgstr "Typy deb i deb-src"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:194
+msgid ""
+"Each source entry can have options specified modifying which and how the "
+"source is accessed and data acquired from it. Format, syntax and names of "
+"the options varies between the two formats one line and deb822 style as "
+"described, but they have both the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one line name in brackets. "
+"Remember that beside setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
msgstr ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> może zostać użyte do podania architektur, dla "
-"których będą pobierane informacje o pakietach. Jeśli ta opcja nie jest "
-"ustawiona, będą pobierane informacje dla wszystkich architektur określonych "
-"w opcji konfiguracji <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:205
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6602,10 +6971,10 @@ msgstr ""
#| "architectures defined by the <literal>APT::Architectures</literal> option "
#| "will be downloaded."
msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
msgstr ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> może zostać użyte do podania architektur, dla "
@@ -6614,66 +6983,93 @@ msgstr ""
"w opcji konfiguracji <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:212
msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
-msgstr ""
-"<literal>trusted=yes</literal> może być użyte do wskazania, że pakiety z "
-"tego źródła są zawsze zautentykowane, nawet jeśli plik <filename>Release</"
-"filename> nie jest podpisany lub nie można sprawdzić podpisu. Wyłącza to "
-"częściowo &apt-secure; i dlatego powinno być używane tylko dla źródeł "
-"lokalnych i zaufanych. Przeciwieństwem tej opcji jest <literal>trusted=no</"
-"literal>, która obsługuje nawet poprawnie zautentykowane źródła jako "
-"niezautentykowane."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information like translated package "
+"descriptions should be downloaded. If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
+msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:220
msgid ""
-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope."
msgstr ""
-"Ważne jest, aby źródła pakietów były wymienione w kolejności preferencji "
-"użytkownika, zaczynając od tego najbardziej preferowanego. Zazwyczaj "
-"wynikiem tego będzie sortowanie od najszybszego do najwolniejszego (na "
-"przykład CD-ROM przed komputerami w lokalnej sieci przed odległymi "
-"komputerami w Internecie)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-msgid "Some examples:"
-msgstr "Kilka przykładów:"
+#: sources.list.5.xml:228
+msgid ""
+"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
+msgstr ""
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:235
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"<option>Signed-By</option> (<option>signed-by</option>) is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key in either the <filename>trusted.gpg</"
+"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set only the key(s) in this keyring or only the key with this "
+"fingerprint is used for the &apt-secure; verification of this repository. "
+"Otherwise all keys in the trusted keyrings are considered valid signers for "
+"this repository."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:249
+msgid ""
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare until then the data provided in the "
+"repository should be considered valid and if this time is reached, but no "
+"new data is provided the data is considered expired and an error is raised. "
+"Beside increasing security as a malicious attacker can't sent old data "
+"forever denying a user to be able to upgrade to a new version, this also "
+"helps users identify mirrors which are no longer updated. Some repositories "
+"like historic archives aren't updated anymore by design through, so this "
+"check can be disabled by setting this option to <literal>no</literal>. "
+"Defaults to the value of configuration option <option>Acquire::Check-Valid-"
+"Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:266
+msgid ""
+"<option>Valid-Until-Min</option> (<option>check-valid-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldomly updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely. Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:288
msgid "URI specification"
msgstr "Określanie URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml:290
msgid "The currently recognized URI types are:"
msgstr "Obecnie rozpoznawane są następujące typy URI:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:294
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6684,7 +7080,7 @@ msgstr ""
"archiwów."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml:301
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6694,7 +7090,7 @@ msgstr ""
"list."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:308
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6711,7 +7107,7 @@ msgstr ""
"bezpieczny."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:319
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6731,7 +7127,7 @@ msgstr ""
"konfiguracyjnym serwery proxy używające HTTP zostaną zignorowane."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:331
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6744,7 +7140,7 @@ msgstr ""
"do skopiowania plików przy użyciu APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:338
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6758,12 +7154,12 @@ msgstr ""
"przetransferowania plików ze zdalnego komputera."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:345
msgid "adding more recognizable URI types"
msgstr "dodawanie innych rozpoznawanych typów URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:347
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6782,45 +7178,85 @@ msgstr ""
"zobaczyć &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian "
+#| "for stable/main, stable/contrib, and stable/non-free."
msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
"Użycie archiwum lokalnego (lub montowanego przez NFS) w katalogu /home/jason/"
"debian dla zasobów stable/main, stable/contrib i stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
-#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+#: sources.list.5.xml:361
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr "deb file:/home/jason/debian stable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:362
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:367
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
-#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:368
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:369
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:374
msgid "Source line for the above"
msgstr "Linie źródeł dla powyższego przykładu"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
-#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:375
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:376
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:382
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6831,17 +7267,41 @@ msgstr ""
"literal> i <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
-#, no-wrap
+#: sources.list.5.xml:384
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgid ""
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:386
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml:398
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -6850,13 +7310,24 @@ msgstr ""
"org i dystrybucji hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:400
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "deb http://archive.debian.org/debian-archive hamm main"
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr "deb http://archive.debian.org/debian-archive hamm main"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml:406
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -6865,13 +7336,24 @@ msgstr ""
"katalogu debian i używa tylko dystrybucji &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:408
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:409
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:414
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -6884,19 +7366,49 @@ msgstr ""
"to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:418
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:419
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml:431
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:432
+#, fuzzy, no-wrap
+#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:424
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
+#| "directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</"
+#| "filename> on amd64, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; "
+#| "official debian archives are not structured like this] <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -6904,7 +7416,7 @@ msgid ""
"amd64, and so forth for other supported architectures. [Note this example "
"only illustrates how to use the substitution variable; official debian "
"archives are not structured like this] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
msgstr ""
"Użycie HTTP do uzyskania dostępu do archiwum na komputerze ftp.tlh.debian."
"org, w katalogu universe. Dla komputerów i386 używa tylko plików "
@@ -6915,8 +7427,39 @@ msgstr ""
"nie zawiera takiej struktury). <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml:437
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:439
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:445
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:454
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;, &apt-conf;"
msgstr "&apt-cache;, &apt-conf;"
#. type: Content of: <refentry><refmeta><manvolnum>
@@ -9402,6 +9945,129 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
msgid "Which will use the already fetched archives on the disc."
msgstr "Które użyje pobranych uprzednio archiwów z dysku."
+#
+#~ msgid ""
+#~ "No action; perform a simulation of events that would occur but do not "
+#~ "actually change the system. Configuration Item: <literal>APT::Get::"
+#~ "Simulate</literal>."
+#~ msgstr ""
+#~ "Brak akcji; wykonuje symulację zdarzeń, które mogłyby się przytrafić, ale "
+#~ "nic nie zmienia w systemie. Pozycja w pliku konfiguracyjnym: "
+#~ "<literal>APT::Get::Simulate</literal>."
+
+#~ msgid ""
+#~ "Simulated runs performed as a user will automatically deactivate locking "
+#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
+#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
+#~ "notice will also be displayed indicating that this is only a simulation. "
+#~ "Runs performed as root do not trigger either NoLocking or the notice - "
+#~ "superusers should know what they are doing without further warnings from "
+#~ "<literal>apt-get</literal>."
+#~ msgstr ""
+#~ "Symulowane uruchomienia przeprowadzane przez przez zwykłego użytkownika "
+#~ "automatycznie wyłączą blokady (<literal>Debug::NoLocking</literal>). "
+#~ "Jeżeli jest ustawiona opcja <literal>APT::Get::Show-User-Simulation-Note</"
+#~ "literal> (a domyślnie jest ona ustawiona), to zostanie wyświetlona "
+#~ "informacja o tym, że to jest tylko symulacja. Symulacje przeprowadzane "
+#~ "przez administratora systemu nie powodują wyłączenia blokad ani nie "
+#~ "pokazują informacji - administratorzy powinni wiedzieć, co robią, bez "
+#~ "dodatkowych ostrzeżeń ze strony <literal>apt-get</literal>."
+
+#~ msgid ""
+#~ "Ignore if packages can't be authenticated and don't prompt about it. "
+#~ "This is useful for tools like pbuilder. Configuration Item: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+#~ msgstr ""
+#~ "Ignorowanie sytuacji, w których nie powiedzie się autentykacja pakietów i "
+#~ "nieostrzeganie o tym. Jest to użyteczne dla programów typu pbuilder. "
+#~ "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</"
+#~ "literal>."
+
+#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr "wersjom niezainstalowanym i nienależącym do wydania docelowego."
+
+#~ msgid ""
+#~ "Each line specifying a source starts with type (e.g. <literal>deb-src</"
+#~ "literal>) followed by options and arguments for this type. Individual "
+#~ "entries cannot be continued onto a following line. Empty lines are "
+#~ "ignored, and a <literal>#</literal> character anywhere on a line marks "
+#~ "the remainder of that line as a comment."
+#~ msgstr ""
+#~ "Każda linia określająca źródło rozpoczyna się od typu (np. <literal>deb-"
+#~ "src</literal>), po którym następują opcje i argumenty dla tego typu. "
+#~ "Wpisy nie mogą być kontynuowane w nowych liniach. Puste linie są "
+#~ "ignorowane, a znak \"<literal>#</literal> \" występujący gdziekolwiek w "
+#~ "linii oznacza, że dalsza część linii stanowi komentarz."
+
+#, fuzzy
+#~| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#~ msgid "deb [ options ] uri suite [component1] [component2] [...]"
+#~ msgstr "deb [ opcje ] uri dystrybucja [komponent1] [komponent2] [...]"
+
+#~ msgid ""
+#~ "<literal>options</literal> is always optional and needs to be surrounded "
+#~ "by square brackets. It can consist of multiple settings in the form "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>. Multiple settings are separated by spaces. The "
+#~ "following settings are supported by APT (note however that unsupported "
+#~ "settings will be ignored silently):"
+#~ msgstr ""
+#~ "<literal>opcje</literal> nigdy nie są wymagane i powinny być otoczone "
+#~ "przez nawiasy kwadratowe. Mogą się składać z wielu ustawień w formacie "
+#~ "<literal><replaceable>ustawienie</replaceable>=<replaceable>wartość</"
+#~ "replaceable></literal> oddzielonych od siebie znakami spacji. APT "
+#~ "obsługuje następujące ustawienia (a ustawienia nieobsługiwane są "
+#~ "ignorowane bez wypisywania żadnego ostrzeżenia):"
+
+#, fuzzy
+#~| msgid ""
+#~| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~| "replaceable>,…</literal> can be used to specify for which architectures "
+#~| "information should be downloaded. If this option is not set all "
+#~| "architectures defined by the <literal>APT::Architectures</literal> "
+#~| "option will be downloaded."
+#~ msgid ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> which can be "
+#~ "used to add/remove architectures from the set which will be downloaded."
+#~ msgstr ""
+#~ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> może zostać użyte do podania architektur, dla "
+#~ "których będą pobierane informacje o pakietach. Jeśli ta opcja nie jest "
+#~ "ustawiona, będą pobierane informacje dla wszystkich architektur "
+#~ "określonych w opcji konfiguracji <literal>APT::Architectures</literal>."
+
+#~ msgid ""
+#~ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+#~ "this source are always authenticated even if the <filename>Release</"
+#~ "filename> file is not signed or the signature can't be checked. This "
+#~ "disables parts of &apt-secure; and should therefore only be used in a "
+#~ "local and trusted context. <literal>trusted=no</literal> is the opposite "
+#~ "which handles even correctly authenticated sources as not authenticated."
+#~ msgstr ""
+#~ "<literal>trusted=yes</literal> może być użyte do wskazania, że pakiety z "
+#~ "tego źródła są zawsze zautentykowane, nawet jeśli plik <filename>Release</"
+#~ "filename> nie jest podpisany lub nie można sprawdzić podpisu. Wyłącza to "
+#~ "częściowo &apt-secure; i dlatego powinno być używane tylko dla źródeł "
+#~ "lokalnych i zaufanych. Przeciwieństwem tej opcji jest "
+#~ "<literal>trusted=no</literal>, która obsługuje nawet poprawnie "
+#~ "zautentykowane źródła jako niezautentykowane."
+
+#~ msgid "Some examples:"
+#~ msgstr "Kilka przykładów:"
+
+#~ msgid ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+#~ msgstr ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+
#~ msgid "apt"
#~ msgstr "apt"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 35efdfe30..066db33c8 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-08-21 06:12-0400\n"
"PO-Revision-Date: 2014-08-29 00:34+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -661,17 +661,15 @@ msgstr ""
#. type: Content of: <refentry><refmeta><manvolnum>
#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
-#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
-#: apt-config.8.xml:22
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21 apt-config.8.xml:22
msgid "8"
msgstr "8"
#. type: Content of: <refentry><refmeta><refmiscinfo>
#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
-#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
-#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
-#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
-#: apt-ftparchive.1.xml:23
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22 apt-config.8.xml:23
+#: apt.conf.5.xml:28 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23 apt-ftparchive.1.xml:23
msgid "APT"
msgstr "APT"
@@ -682,10 +680,9 @@ msgstr "interface de linha de comandos"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
-#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
-#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
-#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
-#: apt-ftparchive.1.xml:34
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33 apt-config.8.xml:34
+#: apt.conf.5.xml:37 apt_preferences.5.xml:32 sources.list.5.xml:32
+#: apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34 apt-ftparchive.1.xml:34
msgid "Description"
msgstr "Descrição"
@@ -707,8 +704,8 @@ msgstr ""
msgid ""
"<literal>list</literal> is used to display a list of packages. It supports "
"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option> are supported."
+"<option>--installed</option>, <option>--upgradable</option>, <option>--"
+"upgradeable</option>, <option>--all-versions</option> are supported."
msgstr ""
"<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
"padrões da shell para corresponder aos nomes de pacotes e são suportadas as "
@@ -716,7 +713,7 @@ msgstr ""
"option>, <option>--all-versions</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml:55
msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
@@ -725,7 +722,7 @@ msgstr ""
"pacotes correspondentes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml:61
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
@@ -734,7 +731,7 @@ msgstr ""
"determinado(s)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml:68
msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
@@ -743,7 +740,7 @@ msgstr ""
"deseja instalar ou actualizar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml:72 apt-get.8.xml:112
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -760,7 +757,7 @@ msgstr ""
"versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml:82 apt-get.8.xml:147
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note that removing a package "
@@ -774,8 +771,29 @@ msgstr ""
"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
"pacote identificado será instalado em vez de removido."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "alias since 1.1)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:90 apt-get.8.xml:228
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+"<literal>autoremove</literal> é usado para remover pacotes que foram "
+"instalados automaticamente para satisfazer dependências de outros pacotes e "
+"que já não são necessários."
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml:95
msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
@@ -784,7 +802,7 @@ msgstr ""
"list e disponibiliza verificações de sanidade básicas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml:101
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
@@ -793,7 +811,7 @@ msgstr ""
"partir das suas fontes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml:107
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -806,7 +824,7 @@ msgstr ""
"novos pacotes, mas pacotes existentes nunca serão removidos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml:116
msgid ""
"<literal>full-upgrade</literal> performs the function of upgrade but may "
"also remove installed packages if that is required in order to resolve a "
@@ -817,19 +835,19 @@ msgstr ""
"conflito de pacotes."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt.8.xml:126 apt-get.8.xml:262 apt-cache.8.xml:246 apt-mark.8.xml:104
#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
#: apt-ftparchive.1.xml:500
msgid "options"
msgstr "opções"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
+#: apt.8.xml:136
msgid "Script usage"
msgstr "Utilização de script"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml:138
msgid ""
"The &apt; commandline is designed as a end-user tool and it may change the "
"output between versions. While it tries to not break backward compatibility "
@@ -845,12 +863,12 @@ msgstr ""
"seus scripts."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
+#: apt.8.xml:146
msgid "Differences to &apt-get;"
msgstr "Diferenças para o &apt-get;"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
+#: apt.8.xml:147
msgid ""
"The <command>apt</command> command is meant to be pleasant for end users and "
"does not need to be backward compatible like &apt-get;. Therefore some "
@@ -861,17 +879,17 @@ msgstr ""
"anteriores como o &apt-get;. Por isso algumas opções são diferentes."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
+#: apt.8.xml:153
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
msgstr "A opção <literal>DPkg::Progress-Fancy</literal> está activada."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:157
msgid "The option <literal>APT::Color</literal> is enabled."
msgstr "A opção <literal>APT::Color</literal> está activada."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:161
msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
@@ -880,7 +898,7 @@ msgstr ""
"<literal>dpkg --list</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml:166
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
"enabled by default."
@@ -889,16 +907,16 @@ msgstr ""
"activado por predefinição."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt.8.xml:176 apt-get.8.xml:597 apt-cache.8.xml:359 apt-key.8.xml:191
#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
-#: apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701
-#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-config.8.xml:105 apt.conf.5.xml:1319 apt_preferences.5.xml:716
+#: sources.list.5.xml:453 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
#: apt-ftparchive.1.xml:603
msgid "See Also"
msgstr "Veja também"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml:177
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
@@ -907,14 +925,14 @@ msgstr ""
"utilizadores do The APT em &guidesdir;, &apt-preferences;, o Howto do APT."
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt.8.xml:182 apt-get.8.xml:603 apt-cache.8.xml:364 apt-mark.8.xml:131
#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "Diagnostics"
msgstr "Diagnóstico"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml:183
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1280,28 +1298,23 @@ msgstr ""
"pacotes instalados sejam apagados se estiver definida para 'off'."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
-msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
-msgstr ""
-"<literal>autoremove</literal> é usado para remover pacotes que foram "
-"instalados automaticamente para satisfazer dependências de outros pacotes e "
-"que já não são necessários."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:233
-msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu). By default it displays the changelog for the version that is "
-"installed. However, you can specify the same options as for the "
-"<option>install</option> command."
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
+#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
+#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "changelogs</ulink> for Ubuntu). By default it displays the changelog for "
+#| "the version that is installed. However, you can specify the same options "
+#| "as for the <option>install</option> command."
+msgid ""
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>. By default it "
+"displays the changelog for the version that is installed. However, you can "
+"specify the same options as for the <option>install</option> command."
msgstr ""
"<literal>changelog</literal> descarrega o registo de alterações de um pacote "
"e mostra-o através do <command>sensible-pager</command>. O nome do servidor "
@@ -1314,7 +1327,21 @@ msgstr ""
"para o comando <option>install</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml:243
+msgid ""
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:267
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1323,7 +1350,7 @@ msgstr ""
"de Configuração: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml:272
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -1332,7 +1359,7 @@ msgstr ""
"Configuração: <literal>APT::Install-Suggests</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:277
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1342,7 +1369,7 @@ msgstr ""
"Download-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:282
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -1370,7 +1397,7 @@ msgstr ""
"<literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml:297
msgid ""
"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -1389,7 +1416,7 @@ msgstr ""
"de Configuração: <literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -1400,7 +1427,7 @@ msgstr ""
"descarregados. Item de Configuração: <literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:315
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1420,37 +1447,21 @@ msgstr ""
"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
-msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system. Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-"Nenhuma acção; executa uma simulação dos eventos que irão ocorrer mas na "
-"realidade não altera o sistema. Item de Configuração: <literal>APT::Get::"
-"Simulate</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:330
msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>) so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation. A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>). Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."
msgstr ""
-"As simulações executadas como um utilizador irão desactivar automaticamente "
-"o bloqueio (<literal>Debug::NoLocking</literal>), e se a opção <literal>APT::"
-"Get::Show-User-Simulation-Note</literal> estiver definida (como está por "
-"predefinição) será também mostrado um aviso indicando que é apenas uma "
-"simulação. As execuções executadas pelo root não accionam nem o NoLocking "
-"nem o aviso - os super-utilizadores devem saber o que estão a fazer sem mais "
-"avisos do <literal>apt-get</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:340
msgid ""
"Simulated runs print out a series of lines, each representing a "
"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1465,7 +1476,7 @@ msgstr ""
"indicam quebras que não têm consequência (raro)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:348
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -1481,7 +1492,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:356
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
"Assume-No</literal>."
@@ -1490,7 +1501,7 @@ msgstr ""
"<literal>APT::Get::Assume-No</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:361
msgid ""
"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1500,7 +1511,7 @@ msgstr ""
"Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:367
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -1509,7 +1520,7 @@ msgstr ""
"Configuração: <literal>APT::Get::Show-Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:373
msgid ""
"This option controls the architecture packages are built for by <command>apt-"
"get source --compile</command> and how cross-builddependencies are "
@@ -1526,7 +1537,7 @@ msgstr ""
"item de Configuração: <literal>APT::Get::Host-Architecture</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml:383
msgid ""
"This option controls the activated build profiles for which a source package "
"is built by <command>apt-get source --compile</command> and how build "
@@ -1542,7 +1553,7 @@ msgstr ""
"<literal>APT::Build-Profiles</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:394
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -1551,7 +1562,7 @@ msgstr ""
"<literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml:399
msgid ""
"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -1564,7 +1575,7 @@ msgstr ""
"Item de Configuração: <literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml:406
msgid ""
"Allow installing new packages when used in conjunction with "
"<literal>upgrade</literal>. This is useful if the update of a installed "
@@ -1583,7 +1594,7 @@ msgstr ""
"<literal>APT::Get::Upgrade-Allow-New</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:418
msgid ""
"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1596,7 +1607,7 @@ msgstr ""
"Configuração: <literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:425
msgid ""
"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1609,13 +1620,87 @@ msgstr ""
"Item de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml:433
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+"Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue "
+"sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser "
+"usado excepto em situações muito especiais. Usar o <literal>force-yes</"
+"literal> pode destruir potencialmente o seu sistema! Item de Configuração: "
+"<literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+"Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue "
+"sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser "
+"usado excepto em situações muito especiais. Usar o <literal>force-yes</"
+"literal> pode destruir potencialmente o seu sistema! Item de Configuração: "
+"<literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+"Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue "
+"sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser "
+"usado excepto em situações muito especiais. Usar o <literal>force-yes</"
+"literal> pode destruir potencialmente o seu sistema! Item de Configuração: "
+"<literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:457
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>."
msgid ""
"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
-"<literal>APT::Get::force-yes</literal>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."
msgstr ""
"Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue "
"sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser "
@@ -1624,7 +1709,7 @@ msgstr ""
"<literal>APT::Get::force-yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:465
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected MD5 "
@@ -1645,7 +1730,7 @@ msgstr ""
"Configuração: <literal>APT::Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:476
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1658,7 +1743,7 @@ msgstr ""
"option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:484
msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1667,7 +1752,7 @@ msgstr ""
"Configuração: <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:489
msgid ""
"This option is on by default; use <literal>--no-list-cleanup</literal> to "
"turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1684,7 +1769,7 @@ msgstr ""
"fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:499
msgid ""
"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -1707,7 +1792,7 @@ msgstr ""
"Release</literal>; veja também o manual &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:514
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1721,7 +1806,7 @@ msgstr ""
"Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml:521
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1731,7 +1816,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:527
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running the <literal>autoremove</"
@@ -1744,7 +1829,7 @@ msgstr ""
"Configuração: <literal>APT::Get::AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml:534
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -1763,7 +1848,7 @@ msgstr ""
"<literal>APT::Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:545
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1774,7 +1859,7 @@ msgstr ""
"Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:551
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -1783,18 +1868,18 @@ msgstr ""
"de Configuração: <literal>APT::Get::Arch-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:556
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
-"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself. "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override. Configuration Item: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
-"Ignora se os pacotes não podem ser autenticados e não avisa sobre isso. Isto "
-"é útil para ferramentas como o pbuilder. Item de Configuração: <literal>APT::"
-"Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:566
msgid ""
"Forbid the update command to acquire unverifiable data from configured "
"sources. Apt will fail at the update command for repositories without valid "
@@ -1803,7 +1888,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1818,13 +1903,13 @@ msgstr ""
"Progress</literal> e <literal>Dpkg::Progress-Fancy</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
-#: apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml:587 apt-cache.8.xml:352 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1313 apt_preferences.5.xml:709
msgid "Files"
msgstr "Ficheiros"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1835,7 +1920,7 @@ msgstr ""
"preferences;, o Howto do APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml:604
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1872,9 +1957,9 @@ msgstr ""
"estiver em falta ou desactualizada."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
-#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
-#: apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml:49 apt-cache.8.xml:137 apt-cache.8.xml:161
+#: apt-cache.8.xml:183 apt-cache.8.xml:188 apt-cache.8.xml:204
+#: apt-cache.8.xml:222 apt-cache.8.xml:234
msgid "&synopsis-pkg;"
msgstr "&synopsis-pkg;"
@@ -2039,10 +2124,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:124
+#, fuzzy
+#| msgid ""
+#| "<literal>Total distinct</literal> versions is the number of package "
+#| "versions found in the cache; this value is therefore at least equal to "
+#| "the number of total package names. If more than one distribution is being "
+#| "accessed (for instance, \"stable\" and \"unstable\"), this value can be "
+#| "considerably larger than the number of total package names."
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
"instance, \"stable\" and \"unstable\"), this value can be considerably "
"larger than the number of total package names."
msgstr ""
@@ -2053,7 +2144,7 @@ msgstr ""
"consideravelmente maior que o número do total de nomes de pacotes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:130
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
@@ -2062,11 +2153,17 @@ msgstr ""
"dependências reivindicadas por todos os pacotes na cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:138
+#, fuzzy
+#| msgid ""
+#| "<literal>showsrc</literal> displays all the source package records that "
+#| "match the given package names. All versions are shown, as well as all "
+#| "records that declare the name to be a binary package."
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."
msgstr ""
"<literal>showsrc</literal> mostra todos os registos de pacotes fonte que "
"correspondem aos nomes de pacotes fornecidos. Todas as versões são "
@@ -2074,7 +2171,7 @@ msgstr ""
"pacote binário."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:147
msgid ""
"<literal>dump</literal> shows a short listing of every package in the cache. "
"It is primarily for debugging."
@@ -2083,7 +2180,7 @@ msgstr ""
"cache. É principalmente para depuração."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml:152
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
@@ -2093,7 +2190,7 @@ msgstr ""
"&dselect;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml:157
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
@@ -2102,7 +2199,7 @@ msgstr ""
"insatisfeitas na cache do pacote."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml:162
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg --print-"
"avail</command>; it displays the package records for the named packages."
@@ -2111,12 +2208,22 @@ msgstr ""
"print-avail</command>; mostra os registos do pacote para os pacotes nomeados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:167
msgid "&synopsis-regex;"
msgstr "&synopsis-regex;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:168
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see &regex;. It "
+#| "searches the package names and the descriptions for an occurrence of the "
+#| "regular expression and prints out the package name and the short "
+#| "description, including virtual package names. If <option>--full</option> "
+#| "is given then output identical to <literal>show</literal> is produced for "
+#| "each matched package, and if <option>--names-only</option> is given then "
+#| "the long description is not searched, only the package name is."
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see &regex;. It searches "
@@ -2125,7 +2232,7 @@ msgid ""
"including virtual package names. If <option>--full</option> is given then "
"output identical to <literal>show</literal> is produced for each matched "
"package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."
msgstr ""
"<literal>search</literal> executa uma busca de texto completo em todas as "
"listas de pacotes disponíveis para o padrão POSIX regex fornecido, veja "
@@ -2137,7 +2244,7 @@ msgstr ""
"então não há procura na descrição longa, apenas no nome do pacote."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:179
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -2146,7 +2253,7 @@ msgstr ""
"busca os quais são lidados em conjunto."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:184
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -2156,7 +2263,7 @@ msgstr ""
"dependência."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:189
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -2165,12 +2272,12 @@ msgstr ""
"que um pacote tem."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:193
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:194
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -2185,7 +2292,7 @@ msgstr ""
"opção <option>--generate</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:199
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -2196,7 +2303,7 @@ msgstr ""
"também são listados na lista gerada."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:205
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2217,7 +2324,7 @@ msgstr ""
"defina a opção <literal>APT::Cache::GivenOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml:214
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2231,14 +2338,14 @@ msgstr ""
"dependências, linhas verdes são conflitos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:219
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
"Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de "
"pacotes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:223
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -2248,12 +2355,12 @@ msgstr ""
"VCG</ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:227
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:228
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -2266,7 +2373,7 @@ msgstr ""
"acerca da selecção de prioridade do pacote nomeado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml:235
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -2285,7 +2392,7 @@ msgstr ""
"Architecture</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:251
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -2296,7 +2403,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:257
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -2311,7 +2418,7 @@ msgstr ""
"pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:265
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -2325,7 +2432,7 @@ msgstr ""
"Configuração: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:272
msgid ""
"Print only important dependencies; for use with <literal>unmet</literal> and "
"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2337,9 +2444,16 @@ msgstr ""
"Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml:286
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be tweaked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
@@ -2352,7 +2466,19 @@ msgstr ""
"replaceable></literal> ex. <literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:294
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data. A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture. Configuration Item: <literal>APT::Cache::ShowImplicit</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:304
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -2361,7 +2487,7 @@ msgstr ""
"<literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:309
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -2378,7 +2504,7 @@ msgstr ""
"Configuração: <literal>APT::Cache::AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml:318
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2390,16 +2516,20 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:324
+#, fuzzy
+#| msgid ""
+#| "Only search on the package names, not the long descriptions. "
+#| "Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgid ""
-"Only search on the package names, not the long descriptions. Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
"Apenas procura nos nomes dos pacotes, e não nas descrições longas. Item de "
"Configuração: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:329
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -2410,7 +2540,7 @@ msgstr ""
"<literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -2421,7 +2551,7 @@ msgstr ""
"Configuração <literal>APT::Cache::RecurseDepends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:342
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -2432,12 +2562,12 @@ msgstr ""
"<literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:360
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:365
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3900,6 +4030,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:295
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true, as giving a Release file's "
+#| "validation an expiration date prevents replay attacks over a long "
+#| "timescale, and can also for example help users to identify mirrors that "
+#| "are no longer updated - but the feature depends on the correctness of the "
+#| "clock on the user system. Archive maintainers are encouraged to create "
+#| "Release files with the <literal>Valid-Until</literal> header, but if they "
+#| "don't or a stricter value is desired the <literal>Max-ValidTime</literal> "
+#| "option below can be used."
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3908,7 +4048,9 @@ msgid ""
"user system. Archive maintainers are encouraged to create Release files with "
"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
"value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used. The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
msgstr ""
"Opção relacionada com segurança com predefinição a 'verdadeiro', como dar a "
"um ficheiros Release uma data de expiração previne ataques repetidos durante "
@@ -3921,7 +4063,16 @@ msgstr ""
"seguinte."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:308
+#: apt.conf.5.xml:310
+#, fuzzy
+#| msgid ""
+#| "Maximum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. If the Release file itself includes a "
+#| "<literal>Valid-Until</literal> header the earlier date of the two is used "
+#| "as the expiration date. The default value is <literal>0</literal> which "
+#| "stands for \"valid forever\". Archive specific settings can be made by "
+#| "appending the label of the archive to the option name."
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3929,7 +4080,9 @@ msgid ""
"<literal>Valid-Until</literal> header the earlier date of the two is used as "
"the expiration date. The default value is <literal>0</literal> which stands "
"for \"valid forever\". Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."
msgstr ""
"O tempo máximo (em segundos) após a sua criação (como indicado pelo "
"cabeçalho <literal>Date</literal>) que o ficheiro <filename>Release</"
@@ -3941,7 +4094,16 @@ msgstr ""
"nome da opção."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml:323
+#, fuzzy
+#| msgid ""
+#| "Minimum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid. Use this if you need to use a seldom "
+#| "updated (local) mirror of a more frequently updated archive with a "
+#| "<literal>Valid-Until</literal> header instead of completely disabling the "
+#| "expiration date checking. Archive specific settings can and should be "
+#| "used by appending the label of the archive to the option name."
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3949,7 +4111,9 @@ msgid ""
"(local) mirror of a more frequently updated archive with a <literal>Valid-"
"Until</literal> header instead of completely disabling the expiration date "
"checking. Archive specific settings can and should be used by appending the "
-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."
msgstr ""
"O tempo mínimo (em segundos) após a sua criação (como indicado no cabeçalho "
"<literal>Date</literal>) que o ficheiro <filename>Release</filename> deve "
@@ -3961,7 +4125,7 @@ msgstr ""
"arquivo ao nome da opção."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:336
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3972,7 +4136,7 @@ msgstr ""
"por inteiro. Verdadeiro por predefinição."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:339
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 "
@@ -3990,7 +4154,7 @@ msgstr ""
"completo em vez das patches."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:349
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4005,7 +4169,7 @@ msgstr ""
"aberta uma ligação por tipo de URI."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:357
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -4014,7 +4178,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:358
+#: apt.conf.5.xml:362
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."
@@ -4024,7 +4188,7 @@ msgstr ""
"A predefinição é verdadeiro."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:367
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]/</"
@@ -4043,7 +4207,7 @@ msgstr ""
"variável de ambiente <envar>http_proxy</envar>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:375
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 "
@@ -4063,7 +4227,7 @@ msgstr ""
"(grandes) ficheiros .deb."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381 apt.conf.5.xml:469
+#: apt.conf.5.xml:385 apt.conf.5.xml:473
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."
@@ -4073,7 +4237,7 @@ msgstr ""
"dados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:384
+#: apt.conf.5.xml:388
#, fuzzy
#| msgid ""
#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
@@ -4101,7 +4265,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:391
+#: apt.conf.5.xml:395
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -4110,7 +4274,7 @@ msgstr ""
"os redireccionamentos, o que está activo por predefinição."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml:398
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes per second. The default "
@@ -4125,7 +4289,7 @@ msgstr ""
"partir de múltiplos servidores ao mesmo tempo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:405
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 "
@@ -4137,7 +4301,7 @@ msgstr ""
"identificador conhecido."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:409
msgid ""
"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
"an external command to discover the http proxy to use. Apt expects the "
@@ -4160,7 +4324,7 @@ msgstr ""
"<literal>ProxyAutoDetect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:427
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4177,7 +4341,7 @@ msgstr ""
"literal> ainda não é suportada."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:435
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4216,7 +4380,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:452
+#: apt.conf.5.xml:456
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]/</"
@@ -4250,7 +4414,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: apt.conf.5.xml:476
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, "
@@ -4266,7 +4430,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:479
+#: apt.conf.5.xml:483
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 "
@@ -4280,7 +4444,7 @@ msgstr ""
"eficiência."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:488
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4295,13 +4459,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:498
+#: apt.conf.5.xml:502
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:497
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4322,7 +4486,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:506
+#: apt.conf.5.xml:510
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4331,13 +4495,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:517
+#: apt.conf.5.xml:521
#, 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:512
+#: apt.conf.5.xml:516
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4356,19 +4520,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:522
+#: apt.conf.5.xml:526
#, 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:525
+#: apt.conf.5.xml:529
#, 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:518
+#: apt.conf.5.xml:522
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 "
@@ -4400,13 +4564,13 @@ msgstr ""
"automaticamente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:536
#, 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:527
+#: apt.conf.5.xml:531
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4432,7 +4596,7 @@ msgstr ""
"prefixar a lista com este tipo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:541
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4444,7 +4608,7 @@ msgstr ""
"maioritariamente apenas para mirrors locais."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:548
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4457,7 +4621,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:552
+#: apt.conf.5.xml:556
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4477,13 +4641,13 @@ msgstr ""
"especialmenteraros."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:573
#, 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:557
+#: apt.conf.5.xml:561
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4522,7 +4686,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:574
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4536,24 +4700,32 @@ msgstr ""
"literal>\" implícito)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:583
msgid "When downloading, force to use only the IPv4 protocol."
msgstr "Ao descarregar, força o uso exclusivo do protocolo IPv4."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:589
msgid "When downloading, force to use only the IPv6 protocol."
msgstr "Ao descarregar, força o uso exclusivo do protocolo IPv6."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:595
msgid ""
"The maximum file size of Release/Release.gpg/InRelease files. The default "
"is 10MB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:602
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to. The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:611
msgid ""
"Allow the update operation to load data files from a repository without a "
"trusted signature. If enabled this option no data files will be loaded and "
@@ -4562,7 +4734,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:622
msgid ""
"Allow that a repository that was previously gpg signed to become unsigned "
"durign a update operation. When there is no valid signature of a perviously "
@@ -4572,13 +4744,46 @@ msgid ""
"source untrusted and warn about them if you try to install them."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:634
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:636
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them. Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>. The value should be a "
+"normal URI to a text file, expect that package specific data is replaced "
+"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"if the package is from a component (e.g. <literal>main</literal>) this is "
+"the first part otherwise it is omitted, 2. the first letter of source "
+"package name, expect if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version. "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>') and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>'). The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:664
msgid "Directories"
msgstr "Directórios"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:666
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4597,7 +4802,7 @@ msgstr ""
"items que não começam com <filename>/</filename> ou <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:673
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4620,7 +4825,7 @@ msgstr ""
"literal> o directório predefinido é contido em <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:683
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4635,7 +4840,7 @@ msgstr ""
"ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:689
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 "
@@ -4646,7 +4851,7 @@ msgstr ""
"estar feito então é carregado o ficheiro de configuração principal."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:693
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4664,16 +4869,26 @@ msgstr ""
"respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:701
+#, fuzzy
+#| msgid ""
+#| "The configuration item <literal>RootDir</literal> has a special meaning. "
+#| "If set, all paths in <literal>Dir::</literal> will be relative to "
+#| "<literal>RootDir</literal>, <emphasis>even paths that are specified "
+#| "absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> "
+#| "is set to <filename>/tmp/staging</filename> and <literal>Dir::State::"
+#| "status</literal> is set to <filename>/var/lib/dpkg/status</filename>, "
+#| "then the status file will be looked up in <filename>/tmp/staging/var/lib/"
+#| "dpkg/status</filename>."
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>. So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>. If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."
msgstr ""
"O item de configuração <literal>RootDir</literal> tem um significado "
"especial. Se definido, todos os caminhos em <literal>Dir::</literal> serão "
@@ -4685,7 +4900,7 @@ msgstr ""
"procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:715
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 "
@@ -4703,12 +4918,12 @@ msgstr ""
"expressão regular."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:724
msgid "APT in DSelect"
msgstr "APT em DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:726
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4719,7 +4934,7 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:731
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4741,7 +4956,7 @@ msgstr ""
"pacotes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:745
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4750,7 +4965,7 @@ msgstr ""
"comandos quando é corrido para a fase de instalação."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:750
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4759,7 +4974,7 @@ msgstr ""
"comandos quando é executado para a fase de actualização."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:755
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4768,12 +4983,12 @@ msgstr ""
"continuar. A predefinição é avisar apenas em caso de erro."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:761
msgid "How APT calls &dpkg;"
msgstr "Como o APT chama o &dpkg;"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:762
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4782,7 +4997,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:726
+#: apt.conf.5.xml:767
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 "
@@ -4793,7 +5008,7 @@ msgstr ""
"um argumento único ao &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:773
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 "
@@ -4806,7 +5021,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:739
+#: apt.conf.5.xml:780
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 "
@@ -4824,20 +5039,51 @@ msgstr ""
"predefinição a entrada standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:787
msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
msgstr ""
-"A versão 2 deste protocolo despeja mais informação, incluindo a versão de "
-"protocolo, o espaço de configuração do APT e os pacotes, ficheiros e versões "
-"que foram alteradas. A versão 3 adiciona a arquitectura e a bandeira "
-"<literal>MultiArch</literal> a cada versão a ser despejada."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:792
+msgid ""
+"Each configuration directive line has the form <literal>key=value</"
+"literal>. Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:800
+msgid ""
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:810
+msgid ""
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
+"\" is an incorrect typename which is just kept to remain compatible, it "
+"should be read as \"no\" and users are encouraged to support both."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:816
msgid ""
"The version of the protocol to be used for the command "
"<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4853,7 +5099,7 @@ msgstr ""
"irá então enviar a informação na versão mais alta que suporta."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:823
msgid ""
"The file descriptor to be used to send the information can be requested with "
"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4871,7 +5117,7 @@ msgstr ""
"descritor de ficheiro usado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:833
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4880,7 +5126,7 @@ msgstr ""
"predefinição é <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:838
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4889,12 +5135,12 @@ msgstr ""
"predefinição é desactivar a assinatura e produzir todos os binários."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:843
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:779
+#: apt.conf.5.xml:844
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 "
@@ -4920,7 +5166,7 @@ msgstr ""
"100% enquanto na realidade está a configurar todos os pacotes."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:859
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4934,7 +5180,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:853
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 "
@@ -4958,7 +5204,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:866
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 "
@@ -4980,7 +5226,7 @@ msgstr ""
"chamadas unpack e remove."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:874
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -5010,7 +5256,7 @@ msgstr ""
"arrancar."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:889
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5028,7 +5274,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:831
+#: apt.conf.5.xml:896
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -5044,7 +5290,7 @@ msgstr ""
"configurar este pacote."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:909
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5062,7 +5308,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:902
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 "
@@ -5086,12 +5332,12 @@ msgstr ""
"predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:922
msgid "Periodic and Archives options"
msgstr "Opções Periodic e Archives"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:923
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -5104,12 +5350,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:866
+#: apt.conf.5.xml:931
msgid "Debug options"
msgstr "Opções de depuração"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:933
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5126,7 +5372,7 @@ msgstr ""
"interesse para o utilizador normal, mas algumas podem ter:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:944
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5137,7 +5383,7 @@ msgstr ""
"remove, purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:952
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5148,7 +5394,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:896
+#: apt.conf.5.xml:961
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5160,7 +5406,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:904
+#: apt.conf.5.xml:969
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -5169,12 +5415,12 @@ msgstr ""
"IDs de CD-ROM."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:914
+#: apt.conf.5.xml:979
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:923
+#: apt.conf.5.xml:988
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -5182,25 +5428,25 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:999
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:945
+#: apt.conf.5.xml:1010
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:956
+#: apt.conf.5.xml:1021
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:967
+#: apt.conf.5.xml:1032
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -5209,7 +5455,7 @@ msgstr ""
"criptográficas usando <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:978
+#: apt.conf.5.xml:1043
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -5218,13 +5464,13 @@ msgstr ""
"armazenados em CD-ROMs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:988
+#: apt.conf.5.xml:1053
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:998
+#: apt.conf.5.xml:1063
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -5233,7 +5479,7 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1008
+#: apt.conf.5.xml:1073
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 "
@@ -5244,7 +5490,7 @@ msgstr ""
"para um CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1084
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."
@@ -5254,14 +5500,14 @@ msgstr ""
"literal></quote> ao mesmo tempo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1031
+#: apt.conf.5.xml:1096
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:1041
+#: apt.conf.5.xml:1106
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -5270,7 +5516,7 @@ msgstr ""
"checksums e assinaturas criptográficas dos ficheiros descarregados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1116
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -5280,7 +5526,7 @@ msgstr ""
"pacote."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1063
+#: apt.conf.5.xml:1128
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -5289,7 +5535,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:1074
+#: apt.conf.5.xml:1139
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -5297,7 +5543,7 @@ msgstr ""
"downloads."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1085
+#: apt.conf.5.xml:1150
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5306,7 +5552,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:1095
+#: apt.conf.5.xml:1160
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5321,7 +5567,7 @@ msgstr ""
"literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml:1174
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5352,7 +5598,7 @@ msgstr ""
"pacote aparece."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1130
+#: apt.conf.5.xml:1195
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5362,7 +5608,7 @@ msgstr ""
"único."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1141
+#: apt.conf.5.xml:1206
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5371,7 +5617,7 @@ msgstr ""
"estado e quaisquer erros encontrados enquanto os analisa."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1152
+#: apt.conf.5.xml:1217
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5380,7 +5626,7 @@ msgstr ""
"literal> deve passar os pacotes ao &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1164
+#: apt.conf.5.xml:1229
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5388,12 +5634,12 @@ msgstr ""
"&dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1240
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:1185
+#: apt.conf.5.xml:1250
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5402,7 +5648,7 @@ msgstr ""
"acontece quando é encontrado um problema de dependências complexo)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1196
+#: apt.conf.5.xml:1261
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 "
@@ -5413,7 +5659,7 @@ msgstr ""
"mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1208
+#: apt.conf.5.xml:1273
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5422,7 +5668,7 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml:1283
msgid ""
"Display the external commands that are called by apt hooks. This includes e."
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5433,13 +5679,13 @@ msgstr ""
"literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt.conf.5.xml:1307 apt_preferences.5.xml:556 sources.list.5.xml:358
#: apt-ftparchive.1.xml:592
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml:1308
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5449,7 +5695,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml:1320
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5651,12 +5897,12 @@ msgstr "priority 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:118
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that do not belong to the target release."
msgstr ""
-"para as versões que não estão instaladas e não pertencem ao lançamento "
-"destinado."
+"para as versões que não estão instaladas e pertencem ao lançamento destinado."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:122
@@ -5665,13 +5911,22 @@ msgstr "priority 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:123
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
msgstr ""
"para as versões que não estão instaladas e pertencem ao lançamento destinado."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:127
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:131
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5689,7 +5944,7 @@ msgstr ""
"yes\"."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml:138
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -5698,7 +5953,7 @@ msgstr ""
"para determinar qual versão de um pacote deve instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml:141
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5714,12 +5969,12 @@ msgstr ""
"arriscado.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid "Install the highest priority version."
msgstr "Instala a versão de prioridade mais alta."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:148
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -5728,7 +5983,7 @@ msgstr ""
"(isto é, aquela com o número de versão mais alto)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml:151
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5739,7 +5994,7 @@ msgstr ""
"reinstall</literal> é fornecida, instala a que foi desinstalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:157
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5754,7 +6009,7 @@ msgstr ""
"replaceable></command> ou <command>apt-get upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:164
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5768,7 +6023,7 @@ msgstr ""
"get upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5787,12 +6042,12 @@ msgstr ""
"prioridade mais alta que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:178
msgid "The Effect of APT Preferences"
msgstr "O Efeito das Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:180
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5805,7 +6060,7 @@ msgstr ""
"um ou dois formatos, um formato específico e um formato geral."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:186
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages with a specified version or version range. For example, "
@@ -5822,7 +6077,7 @@ msgstr ""
"por espaços."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5834,7 +6089,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:199
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5849,7 +6104,7 @@ msgstr ""
"nome de domínio totalmente qualificado do site."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:205
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5861,7 +6116,7 @@ msgstr ""
"local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:210
#, no-wrap
msgid ""
"Package: *\n"
@@ -5873,7 +6128,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml:215
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
"which can be used to match a hostname. The following record will assign a "
@@ -5886,7 +6141,7 @@ msgstr ""
"servidor identificadas pelo nome de máquina \"ftp.de.debian.org\""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:219
#, no-wrap
msgid ""
"Package: *\n"
@@ -5898,7 +6153,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:223
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -5913,7 +6168,7 @@ msgstr ""
"como \"Debian\" ou \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml:228
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5924,7 +6179,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:232
#, no-wrap
msgid ""
"Package: *\n"
@@ -5936,7 +6191,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:237
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5947,7 +6202,7 @@ msgstr ""
"\"<literal>&testing-codename;</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
#, no-wrap
msgid ""
"Package: *\n"
@@ -5959,7 +6214,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5971,7 +6226,7 @@ msgstr ""
"version;</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, no-wrap
msgid ""
"Package: *\n"
@@ -5982,13 +6237,22 @@ msgstr ""
"Pin: release a=stable, v=&stable-version;\n"
"Pin-Priority: 500\n"
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:258
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:266
msgid "Regular expressions and &glob; syntax"
msgstr "Expressões regulares e sintaxe &glob;"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:268
msgid ""
"APT also supports pinning by &glob; expressions, and regular expressions "
"surrounded by slashes. For example, the following example assigns the "
@@ -6003,7 +6267,7 @@ msgstr ""
"regular extensa do POSIX rodeada de barras)."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
@@ -6015,7 +6279,7 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6026,7 +6290,7 @@ msgstr ""
"a todos os pacotes de um lançamento que começa com &ubuntu-codename;."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
#, no-wrap
msgid ""
"Package: *\n"
@@ -6038,7 +6302,7 @@ msgstr ""
"Pin-Priority: 990\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
@@ -6056,12 +6320,12 @@ msgstr ""
"considerado uma expressão &glob; em si próprio."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta as Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:314
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking):"
@@ -6071,12 +6335,12 @@ msgstr ""
"(falando grosso):"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:319
msgid "P &gt;= 1000"
msgstr "P &gt;= 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -6085,12 +6349,12 @@ msgstr ""
"na versão do pacote (downgrade)"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml:324
msgid "990 &lt;= P &lt; 1000"
msgstr "990 &lt;= P &lt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -6099,12 +6363,12 @@ msgstr ""
"destino, a menos que a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:330
msgid "500 &lt;= P &lt; 990"
msgstr "500 &lt;= P &lt; 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:331
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -6114,12 +6378,12 @@ msgstr ""
"mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "100 &lt;= P &lt; 500"
msgstr "100 &lt;= P &lt; 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:337
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -6129,12 +6393,12 @@ msgstr ""
"recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:342
msgid "0 &lt; P &lt; 100"
msgstr "0 &lt; P &lt; 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:343
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -6143,22 +6407,40 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:347
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:348
msgid "prevents the version from being installed"
msgstr "previne a instalação da versão"
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:351
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:352
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
-msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version. Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+#: apt_preferences.5.xml:358
+#, fuzzy
+#| msgid ""
+#| "If any specific-form records match an available package version then the "
+#| "first such record determines the priority of the package version. "
+#| "Failing that, if any general-form records match an available package "
+#| "version then the first such record determines the priority of the package "
+#| "version."
+msgid ""
+"The first specific-form record matching an available package version "
+"determines the priority of the package version. Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version. Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
msgstr ""
"Se quaisquer registos de formato específico corresponder a uma versão de "
"pacote disponível então o primeiro tal registo determina a prioridade da "
@@ -6167,7 +6449,7 @@ msgstr ""
"determina a prioridade da versão de pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:366
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -6176,7 +6458,7 @@ msgstr ""
"registos apresentados atrás:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:370
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6204,12 +6486,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:383
msgid "Then:"
msgstr "Então:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6224,7 +6506,7 @@ msgstr ""
"perl;*, então será feito um downgrade ao <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:390
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6235,7 +6517,7 @@ msgstr ""
"versões, mesmo versões que pertencem ao lançamento de destino."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:394
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6248,12 +6530,12 @@ msgstr ""
"instalação e se nenhuma versão do pacote já estiver instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml:404
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:406
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6264,7 +6546,7 @@ msgstr ""
"descrever os pacotes disponíveis nessa localização."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:410
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6284,27 +6566,27 @@ msgstr ""
"definir prioridades do APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:418
msgid "the <literal>Package:</literal> line"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml:419
msgid "gives the package name"
msgstr "fornece o nome do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml:422 apt_preferences.5.xml:472
msgid "the <literal>Version:</literal> line"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:423
msgid "gives the version number for the named package"
msgstr "fornece o número de versão do pacote nomeado"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:428
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6326,12 +6608,12 @@ msgstr ""
"APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:439
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:440
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6348,18 +6630,18 @@ msgstr ""
"requerer a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:450
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:456
msgid "the <literal>Codename:</literal> line"
msgstr "a linha <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml:457
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6376,13 +6658,13 @@ msgstr ""
"preferências do APT requer a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:466
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:473
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian release version &stable-version;. Note that there is "
@@ -6399,7 +6681,7 @@ msgstr ""
"seguintes linhas:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
#, no-wrap
msgid ""
"Pin: release v=&stable-version;\n"
@@ -6411,12 +6693,12 @@ msgstr ""
"Pin: release &stable-version;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:491
msgid "the <literal>Component:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml:492
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6434,18 +6716,18 @@ msgstr ""
"a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:507
msgid "the <literal>Origin:</literal> line"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:508
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6458,18 +6740,18 @@ msgstr ""
"linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:514
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:520
msgid "the <literal>Label:</literal> line"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:521
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6482,13 +6764,13 @@ msgstr ""
"linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:527
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:534
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6513,12 +6795,12 @@ msgstr ""
"literal> da distribuição <literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml:547
msgid "Optional Lines in an APT Preferences Record"
msgstr "Linhas Opcionais num Registo de Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:549
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6529,12 +6811,12 @@ msgstr ""
"literal>. Isto disponibiliza um espaço para comentários."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:558
msgid "Tracking Stable"
msgstr "Acompanhando Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:566
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6558,7 +6840,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:560
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6574,8 +6856,8 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
-#: apt_preferences.5.xml:672
+#: apt_preferences.5.xml:583 apt_preferences.5.xml:629
+#: apt_preferences.5.xml:687
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6587,7 +6869,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml:578
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6600,13 +6882,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:595
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:589
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6619,12 +6901,12 @@ msgstr ""
"outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:601
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Package: *\n"
@@ -6652,7 +6934,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:603
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6669,7 +6951,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:624
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6682,13 +6964,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:644
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:635
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6707,12 +6989,12 @@ msgstr ""
"versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml:651
msgid "Tracking the evolution of a codename release"
msgstr "Acompanhando a evolução de um nome de código de lançamento"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml:665
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6746,7 +7028,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:653
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6772,7 +7054,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml:682
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6785,13 +7067,13 @@ msgstr ""
"codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml:702
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:693
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6810,7 +7092,7 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml:717
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6821,13 +7103,24 @@ msgstr "Lista das fontes de dados APT configuradas"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+#, fuzzy
+#| msgid ""
+#| "The source list <filename>/etc/apt/sources.list</filename> is designed to "
+#| "support any number of active sources and a variety of source media. The "
+#| "file lists one source per line, with the most preferred source listed "
+#| "first. The information available from the configured sources is acquired "
+#| "by <command>apt-get update</command> (or by an equivalent command from "
+#| "another APT front-end)."
+msgid ""
+"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
msgstr ""
"A lista de fontes <filename>/etc/apt/sources.list</filename> está desenhada "
"a suportar qualquer número de fontes activas e uma variedade de meios de "
@@ -6836,37 +7129,35 @@ msgstr ""
"configuradas é obtida pelo <command>apt-get update</command> (ou por um "
"comando equivalente de outra interface \"front-end\" do APT)."
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
-msgid ""
-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
-"literal>) followed by options and arguments for this type. Individual "
-"entries cannot be continued onto a following line. Empty lines are ignored, "
-"and a <literal>#</literal> character anywhere on a line marks the remainder "
-"of that line as a comment."
-msgstr ""
-"Cada linha que especifica uma fonte começa com o tipo (ex. <literal>deb-src</"
-"literal>) seguido das opções e argumentos para esse tipo. As entradas "
-"individuais não podem ser continuadas para a linha seguinte. As linhas "
-"vazias são ignoradas, e um caracter <literal>#</literal> em qualquer ponto "
-"numa linha marca o restante dessa linha como um comentário."
-
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml:45
msgid "sources.list.d"
msgstr "sources.list.d"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:46
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files. The format is the same as "
+#| "for the regular <filename>sources.list</filename> file. File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters. Otherwise APT will print a notice that it has ignored a "
+#| "file, unless that file matches a pattern in the <literal>Dir::Ignore-"
+#| "Files-Silently</literal> configuration list - in which case it will be "
+#| "silently ignored."
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files. The format is the same as for "
-"the regular <filename>sources.list</filename> file. File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"add sources.list entries in separate files. Two different file formats are "
+"allowed as described in the next two sections. Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format. The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters. Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."
msgstr ""
"O directório <filename>/etc/apt/sources.list.d</filename> disponibiliza um "
"modo de adicionar entradas na sources.list em ficheiros separados. O formato "
@@ -6879,16 +7170,106 @@ msgstr ""
"neste caso serão ignorados em silêncio."
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml:58
+msgid "one line style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:60
+msgid ""
+"Files in this format have the extension <filename>.list</filename>. Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"
+"literal>) followed by options and arguments for this type. Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line. If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>) included in the line after the type separated from "
+"it with a space. If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by a equal sign (<literal>=</literal>). "
+"Multivalue options have also <literal>-=</literal> and <literal>+=</literal> "
+"as separator which instead of replacing the default with the given value(s) "
+"modify the default value(s) to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:79
+msgid ""
+"This is the traditional format and supported by all apt versions. Note that "
+"not all options as described below are supported by all apt versions. Note "
+"also that some older applications parsing this format on its own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:87
+msgid "deb822 style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:89
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>. The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, like the metadata itself apt will download from the configured "
+"sources or the <filename>debian/control</filename> file in a Debian source "
+"package. Individual entries are separated by an empty line, additional "
+"empty lines are ignored, and a <literal>#</literal> character at the start "
+"of the line marks the entire line as a comment. An entry can hence be "
+"disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it. Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s). Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:108
+msgid ""
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier. It "
+"is intended to make this format gradually the default format and deprecating "
+"the previously described one line style format as it is easier to create, "
+"extend and modify by humans and machines alike especially if a lot of "
+"sources and/or options are involved. Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but could encounter problems with software not "
+"supporting the format yet."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:123
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: General Format"
msgstr "Os tipos deb e deb-src"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml:124
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type references a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. The "
+#| "<literal>distribution</literal> is generally an archive name like "
+#| "<literal>stable</literal> or <literal>testing</literal> or a codename "
+#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</"
+#| "literal> while component is one of <literal>main</literal>, "
+#| "<literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "<literal>deb-src</literal> type references a Debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type references a typical two-level Debian "
"archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
"<literal>stable</literal> or <literal>testing</literal> or a codename like "
"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
"literal> while component is one of <literal>main</literal>, "
@@ -6909,79 +7290,72 @@ msgstr ""
"linha <literal>deb-src</literal> para obter índices das fontes."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:135
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one line style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
msgstr ""
"O formato para uma entrada na <filename>sources.list</filename> usando os "
"tipos <literal>deb</literal> e <literal>deb-src</literal> é:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
+#: sources.list.5.xml:138
#, no-wrap
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ opções ] uri suite [componente1] [componente2] [...]"
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
+msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:143
#, no-wrap
msgid ""
" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
+" URIs: uri\n"
+" Suites: suite\n"
+" Components: [component1] [component2] [...]\n"
+" option1: value1\n"
+" option2: value2\n"
" "
msgstr ""
-" Tipos: deb deb-src\n"
-" URIs: http://exemplo.com\n"
-" Suites: stable testing\n"
-" Secções: component1 component2\n"
-" Descrição: curta\n"
-" longa longa longa\n"
-" [opção1]: [opção1-valor]\n"
-"\n"
-" Tipos: deb\n"
-" URIs: http://outro.exemlo.com\n"
-" Suites: experimental\n"
-" Secções: component1 component2\n"
-" Activo: não\n"
-" Descrição: curta\n"
-" longa longa longa\n"
-" [opção1]: [opção1-valor]\n"
-" "
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:141
+#, fuzzy
+#| msgid ""
+#| "Alternatively a rfc822 style format is also supported: <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
"Em alternativa, é também suportado um formato estilo rfc822: <placeholder "
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml:152
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>suite</literal> can specify an exact path, in which case the "
+#| "components must be omitted and <literal>suite</literal> must end with a "
+#| "slash (<literal>/</literal>). This is useful for the case when only a "
+#| "particular sub-section of the archive denoted by the URI is of interest. "
+#| "If <literal>suite</literal> does not specify an exact path, at least one "
+#| "<literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>suite</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>suite</literal> must end with a "
"slash (<literal>/</literal>). This is useful for the case when only a "
-"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest. "
+"If <literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"O URI para o tipo <literal>deb</literal> tem de especificar a base da "
@@ -6994,7 +7368,7 @@ msgstr ""
"menos um <literal>component</literal> tem de estar presente."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml:161
msgid ""
"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
"literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7013,19 +7387,32 @@ msgstr ""
"automaticamente um URI com a arquitectura actual."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
-msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+#: sources.list.5.xml:169
+#, fuzzy
+#| msgid ""
+#| "In the traditional style sources.list format since only one distribution "
+#| "can be specified per line it may be necessary to have multiple lines for "
+#| "the same URI, if a subset of all available distributions or components at "
+#| "that location is desired. APT will sort the URI list after it has "
+#| "generated a complete set internally, and will collapse multiple "
+#| "references to the same Internet host, for instance, into a single "
+#| "connection, so that it does not inefficiently establish an FTP "
+#| "connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"Especially in the one line style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "
"location is desired. APT will sort the URI list after it has generated a "
"complete set internally, and will collapse multiple references to the same "
"Internet host, for instance, into a single connection, so that it does not "
-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
msgstr ""
"No estilo tradicional, o formato do sources.list, como apenas pode ser "
"especificada por linha uma distribuição, pode ser necessário ter várias "
@@ -7041,30 +7428,74 @@ msgstr ""
"banda baixa."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
-msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>. Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
-msgstr ""
-"<literal>options</literal> é sempre opcional e precisa de ser rodeado por "
-"parênteses rectos. Pode consistir um múltiplas definições no formato "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>. As múltiplas definições são separadas por espaços. "
-"As seguinte definições são suportadas pelo APT (no entanto note que as "
-"definições não suportadas serão ignoradas em silêncio):"
+#: sources.list.5.xml:181
+msgid ""
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+"É importante listar as fontes por ordem de preferência, com a fonte mais "
+"preferida listada em primeiro lugar. Tipicamente isto irá resultar numa "
+"ordenação por velocidades desde o mais rápido até ao mais lento (CD-ROM "
+"seguido por máquinas numa rede local, seguido por máquinas distantes na "
+"Internet, por exemplo)."
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:188
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:190
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:186
+msgid ""
+"As an example, the sources for your distribution could look like this in one "
+"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:193
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: Options"
+msgstr "Os tipos deb e deb-src"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:194
+msgid ""
+"Each source entry can have options specified modifying which and how the "
+"source is accessed and data acquired from it. Format, syntax and names of "
+"the options varies between the two formats one line and deb822 style as "
+"described, but they have both the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one line name in brackets. "
+"Remember that beside setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
+msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:205
+#, fuzzy
+#| msgid ""
+#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#| "replaceable>,…</literal> can be used to specify for which architectures "
+#| "information should be downloaded. If this option is not set all "
+#| "architectures defined by the <literal>APT::Architectures</literal> option "
+#| "will be downloaded."
msgid ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
msgstr ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> pode ser usado para especificar para quais "
@@ -7073,78 +7504,93 @@ msgstr ""
"<literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:212
msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information like translated package "
+"descriptions should be downloaded. If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
msgstr ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> e <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> que podem ser usadas para "
-"adicionar/remover arquitecturas do conjunto que será descarregado."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:220
msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope."
msgstr ""
-"<literal>trusted=yes</literal> pode ser definido para indicar que os pacotes "
-"desta fonte são sempre autênticos mesmo que o ficheiro <filename>Release</"
-"filename> não esteja assinado ou a assinatura não possa ser verificada. Isto "
-"desactiva partes do &apt-secure; e deve por isso ser usado apenas num "
-"contexto local e de confiança. <literal>trusted=no</literal> é o oposto que "
-"lida com fontes mesmo actualmente autenticadas como não sendo autênticas."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:228
msgid ""
-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
msgstr ""
-"É importante listar as fontes por ordem de preferência, com a fonte mais "
-"preferida listada em primeiro lugar. Tipicamente isto irá resultar numa "
-"ordenação por velocidades desde o mais rápido até ao mais lento (CD-ROM "
-"seguido por máquinas numa rede local, seguido por máquinas distantes na "
-"Internet, por exemplo)."
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-msgid "Some examples:"
-msgstr "Alguns exemplos:"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:235
+msgid ""
+"<option>Signed-By</option> (<option>signed-by</option>) is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key in either the <filename>trusted.gpg</"
+"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set only the key(s) in this keyring or only the key with this "
+"fingerprint is used for the &apt-secure; verification of this repository. "
+"Otherwise all keys in the trusted keyrings are considered valid signers for "
+"this repository."
+msgstr ""
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:249
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare until then the data provided in the "
+"repository should be considered valid and if this time is reached, but no "
+"new data is provided the data is considered expired and an error is raised. "
+"Beside increasing security as a malicious attacker can't sent old data "
+"forever denying a user to be able to upgrade to a new version, this also "
+"helps users identify mirrors which are no longer updated. Some repositories "
+"like historic archives aren't updated anymore by design through, so this "
+"check can be disabled by setting this option to <literal>no</literal>. "
+"Defaults to the value of configuration option <option>Acquire::Check-Valid-"
+"Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:266
+msgid ""
+"<option>Valid-Until-Min</option> (<option>check-valid-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldomly updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely. Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."
msgstr ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:288
msgid "URI specification"
msgstr "Especificação da URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml:290
msgid "The currently recognized URI types are:"
msgstr "Os tipos de URI actualmente reconhecidos são:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:294
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7155,7 +7601,7 @@ msgstr ""
"arquivos locais."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml:301
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7165,7 +7611,7 @@ msgstr ""
"fontes."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:308
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7182,7 +7628,7 @@ msgstr ""
"método de autenticação seguro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:319
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7203,7 +7649,7 @@ msgstr ""
"configuração serão ignorados."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:331
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -7216,7 +7662,7 @@ msgstr ""
"ficheiros com o APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:338
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7230,12 +7676,12 @@ msgstr ""
"ficheiros a partir da máquina remota."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:345
msgid "adding more recognizable URI types"
msgstr "adicionando mais tipos de URI reconhecíveis"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:347
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7254,45 +7700,85 @@ msgstr ""
"exemplo o debtorrent - veja &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian "
+#| "for stable/main, stable/contrib, and stable/non-free."
msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
"Usa o arquivo armazenado localmente (ou montagem NFS) em /home/jason/debian "
"para stable/main, stable/contrib, e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
-#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+#: sources.list.5.xml:361
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr "deb file:/home/jason/debian stable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:362
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:367
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
-#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:368
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:369
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:374
msgid "Source line for the above"
msgstr "Linha de fonte para o referido acima"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
-#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml:375
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:376
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:382
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7303,17 +7789,41 @@ msgstr ""
"<literal>amd64</literal> e <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
-#, no-wrap
+#: sources.list.5.xml:384
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
msgid ""
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:386
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml:398
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7322,13 +7832,24 @@ msgstr ""
"hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:400
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "deb http://archive.debian.org/debian-archive hamm main"
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr "deb http://archive.debian.org/debian-archive hamm main"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml:406
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7337,13 +7858,24 @@ msgstr ""
"usa apenas a área &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:408
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:409
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:414
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7356,19 +7888,49 @@ msgstr ""
"uma única sessão FTP para ambas linhas de recurso."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:418
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:419
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml:431
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:432
+#, fuzzy, no-wrap
+#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:424
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
+#| "directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</"
+#| "filename> on amd64, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; "
+#| "official debian archives are not structured like this] <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7376,7 +7938,7 @@ msgid ""
"amd64, and so forth for other supported architectures. [Note this example "
"only illustrates how to use the substitution variable; official debian "
"archives are not structured like this] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
msgstr ""
"Usa HTTP para aceder ao arquivo em ftp.tlh.debian.org, sob o directório "
"universe, e usa apenas os ficheiros encontrados sob <filename>unstable/"
@@ -7387,8 +7949,39 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml:437
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:439
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:445
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:454
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;, &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
#. type: Content of: <refentry><refmeta><manvolnum>
@@ -10051,3 +10644,164 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
#: offline.dbk:242
msgid "Which will use the already fetched archives on the disc."
msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
+
+#~ msgid ""
+#~ "No action; perform a simulation of events that would occur but do not "
+#~ "actually change the system. Configuration Item: <literal>APT::Get::"
+#~ "Simulate</literal>."
+#~ msgstr ""
+#~ "Nenhuma acção; executa uma simulação dos eventos que irão ocorrer mas na "
+#~ "realidade não altera o sistema. Item de Configuração: <literal>APT::Get::"
+#~ "Simulate</literal>."
+
+#~ msgid ""
+#~ "Simulated runs performed as a user will automatically deactivate locking "
+#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
+#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
+#~ "notice will also be displayed indicating that this is only a simulation. "
+#~ "Runs performed as root do not trigger either NoLocking or the notice - "
+#~ "superusers should know what they are doing without further warnings from "
+#~ "<literal>apt-get</literal>."
+#~ msgstr ""
+#~ "As simulações executadas como um utilizador irão desactivar "
+#~ "automaticamente o bloqueio (<literal>Debug::NoLocking</literal>), e se a "
+#~ "opção <literal>APT::Get::Show-User-Simulation-Note</literal> estiver "
+#~ "definida (como está por predefinição) será também mostrado um aviso "
+#~ "indicando que é apenas uma simulação. As execuções executadas pelo root "
+#~ "não accionam nem o NoLocking nem o aviso - os super-utilizadores devem "
+#~ "saber o que estão a fazer sem mais avisos do <literal>apt-get</literal>."
+
+#~ msgid ""
+#~ "Ignore if packages can't be authenticated and don't prompt about it. "
+#~ "This is useful for tools like pbuilder. Configuration Item: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+#~ msgstr ""
+#~ "Ignora se os pacotes não podem ser autenticados e não avisa sobre isso. "
+#~ "Isto é útil para ferramentas como o pbuilder. Item de Configuração: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+
+#~ msgid ""
+#~ "Version 2 of this protocol dumps more information, including the protocol "
+#~ "version, the APT configuration space and the packages, files and versions "
+#~ "being changed. Version 3 adds the architecture and <literal>MultiArch</"
+#~ "literal> flag to each version being dumped."
+#~ msgstr ""
+#~ "A versão 2 deste protocolo despeja mais informação, incluindo a versão de "
+#~ "protocolo, o espaço de configuração do APT e os pacotes, ficheiros e "
+#~ "versões que foram alteradas. A versão 3 adiciona a arquitectura e a "
+#~ "bandeira <literal>MultiArch</literal> a cada versão a ser despejada."
+
+#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr ""
+#~ "para as versões que não estão instaladas e não pertencem ao lançamento "
+#~ "destinado."
+
+#~ msgid ""
+#~ "Each line specifying a source starts with type (e.g. <literal>deb-src</"
+#~ "literal>) followed by options and arguments for this type. Individual "
+#~ "entries cannot be continued onto a following line. Empty lines are "
+#~ "ignored, and a <literal>#</literal> character anywhere on a line marks "
+#~ "the remainder of that line as a comment."
+#~ msgstr ""
+#~ "Cada linha que especifica uma fonte começa com o tipo (ex. <literal>deb-"
+#~ "src</literal>) seguido das opções e argumentos para esse tipo. As "
+#~ "entradas individuais não podem ser continuadas para a linha seguinte. As "
+#~ "linhas vazias são ignoradas, e um caracter <literal>#</literal> em "
+#~ "qualquer ponto numa linha marca o restante dessa linha como um comentário."
+
+#~ msgid "deb [ options ] uri suite [component1] [component2] [...]"
+#~ msgstr "deb [ opções ] uri suite [componente1] [componente2] [...]"
+
+#~ msgid ""
+#~ " Types: deb deb-src\n"
+#~ " URIs: http://example.com\n"
+#~ " Suites: stable testing\n"
+#~ " Sections: component1 component2\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ "\n"
+#~ " Types: deb\n"
+#~ " URIs: http://another.example.com\n"
+#~ " Suites: experimental\n"
+#~ " Sections: component1 component2\n"
+#~ " Enabled: no\n"
+#~ " Description: short\n"
+#~ " long long long\n"
+#~ " [option1]: [option1-value]\n"
+#~ " "
+#~ msgstr ""
+#~ " Tipos: deb deb-src\n"
+#~ " URIs: http://exemplo.com\n"
+#~ " Suites: stable testing\n"
+#~ " Secções: component1 component2\n"
+#~ " Descrição: curta\n"
+#~ " longa longa longa\n"
+#~ " [opção1]: [opção1-valor]\n"
+#~ "\n"
+#~ " Tipos: deb\n"
+#~ " URIs: http://outro.exemlo.com\n"
+#~ " Suites: experimental\n"
+#~ " Secções: component1 component2\n"
+#~ " Activo: não\n"
+#~ " Descrição: curta\n"
+#~ " longa longa longa\n"
+#~ " [opção1]: [opção1-valor]\n"
+#~ " "
+
+#~ msgid ""
+#~ "<literal>options</literal> is always optional and needs to be surrounded "
+#~ "by square brackets. It can consist of multiple settings in the form "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>. Multiple settings are separated by spaces. The "
+#~ "following settings are supported by APT (note however that unsupported "
+#~ "settings will be ignored silently):"
+#~ msgstr ""
+#~ "<literal>options</literal> é sempre opcional e precisa de ser rodeado por "
+#~ "parênteses rectos. Pode consistir um múltiplas definições no formato "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>. As múltiplas definições são separadas por "
+#~ "espaços. As seguinte definições são suportadas pelo APT (no entanto note "
+#~ "que as definições não suportadas serão ignoradas em silêncio):"
+
+#~ msgid ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> which can be "
+#~ "used to add/remove architectures from the set which will be downloaded."
+#~ msgstr ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> e <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> que podem ser "
+#~ "usadas para adicionar/remover arquitecturas do conjunto que será "
+#~ "descarregado."
+
+#~ msgid ""
+#~ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+#~ "this source are always authenticated even if the <filename>Release</"
+#~ "filename> file is not signed or the signature can't be checked. This "
+#~ "disables parts of &apt-secure; and should therefore only be used in a "
+#~ "local and trusted context. <literal>trusted=no</literal> is the opposite "
+#~ "which handles even correctly authenticated sources as not authenticated."
+#~ msgstr ""
+#~ "<literal>trusted=yes</literal> pode ser definido para indicar que os "
+#~ "pacotes desta fonte são sempre autênticos mesmo que o ficheiro "
+#~ "<filename>Release</filename> não esteja assinado ou a assinatura não "
+#~ "possa ser verificada. Isto desactiva partes do &apt-secure; e deve por "
+#~ "isso ser usado apenas num contexto local e de confiança. "
+#~ "<literal>trusted=no</literal> é o oposto que lida com fontes mesmo "
+#~ "actualmente autenticadas como não sendo autênticas."
+
+#~ msgid "Some examples:"
+#~ msgstr "Alguns exemplos:"
+
+#~ msgid ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
+#~ msgstr ""
+#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#~ " "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 9a9f8ec56..92f9118f2 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-08-21 06:12-0400\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -480,17 +480,15 @@ msgstr ""
#. type: Content of: <refentry><refmeta><manvolnum>
#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
-#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
-#: apt-config.8.xml:22
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21 apt-config.8.xml:22
msgid "8"
msgstr ""
#. type: Content of: <refentry><refmeta><refmiscinfo>
#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
-#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
-#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
-#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
-#: apt-ftparchive.1.xml:23
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22 apt-config.8.xml:23
+#: apt.conf.5.xml:28 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23 apt-ftparchive.1.xml:23
msgid "APT"
msgstr ""
@@ -501,10 +499,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
-#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
-#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
-#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
-#: apt-ftparchive.1.xml:34
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33 apt-config.8.xml:34
+#: apt.conf.5.xml:37 apt_preferences.5.xml:32 sources.list.5.xml:32
+#: apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34 apt-ftparchive.1.xml:34
#, fuzzy
msgid "Description"
msgstr "Descrição"
@@ -523,33 +520,33 @@ msgstr ""
msgid ""
"<literal>list</literal> is used to display a list of packages. It supports "
"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option> are supported."
+"<option>--installed</option>, <option>--upgradable</option>, <option>--"
+"upgradeable</option>, <option>--all-versions</option> are supported."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml:55
msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml:61
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml:68
msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml:72 apt-get.8.xml:112
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -560,7 +557,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml:82 apt-get.8.xml:147
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note that removing a package "
@@ -569,22 +566,40 @@ msgid ""
"installed instead of removed."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "alias since 1.1)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:90 apt-get.8.xml:228
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml:95
msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml:101
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml:107
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -593,7 +608,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml:116
msgid ""
"<literal>full-upgrade</literal> performs the function of upgrade but may "
"also remove installed packages if that is required in order to resolve a "
@@ -601,19 +616,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt.8.xml:126 apt-get.8.xml:262 apt-cache.8.xml:246 apt-mark.8.xml:104
#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
#: apt-ftparchive.1.xml:500
msgid "options"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
+#: apt.8.xml:136
msgid "Script usage"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml:138
msgid ""
"The &apt; commandline is designed as a end-user tool and it may change the "
"output between versions. While it tries to not break backward compatibility "
@@ -623,12 +638,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
+#: apt.8.xml:146
msgid "Differences to &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
+#: apt.8.xml:147
msgid ""
"The <command>apt</command> command is meant to be pleasant for end users and "
"does not need to be backward compatible like &apt-get;. Therefore some "
@@ -636,26 +651,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
+#: apt.8.xml:153
#, fuzzy
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:157
#, fuzzy
msgid "The option <literal>APT::Color</literal> is enabled."
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:161
msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml:166
#, fuzzy
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
@@ -663,31 +678,31 @@ msgid ""
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt.8.xml:176 apt-get.8.xml:597 apt-cache.8.xml:359 apt-key.8.xml:191
#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
-#: apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701
-#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-config.8.xml:105 apt.conf.5.xml:1319 apt_preferences.5.xml:716
+#: sources.list.5.xml:453 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
#: apt-ftparchive.1.xml:603
#, fuzzy
msgid "See Also"
msgstr "Consulte também"
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml:177
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt.8.xml:182 apt-get.8.xml:603 apt-cache.8.xml:364 apt-mark.8.xml:131
#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "Diagnostics"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml:183
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -929,50 +944,51 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:233
msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>. By default it "
+"displays the changelog for the version that is installed. However, you can "
+"specify the same options as for the <option>install</option> command."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:243
msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu). By default it displays the changelog for the version that is "
-"installed. However, you can specify the same options as for the "
-"<option>install</option> command."
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml:267
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml:272
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:277
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:282
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -988,7 +1004,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml:297
msgid ""
"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -1000,7 +1016,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -1008,7 +1024,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:315
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1020,27 +1036,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
-msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system. Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:330
msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>) so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation. A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>). Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:340
msgid ""
"Simulated runs print out a series of lines, each representing a "
"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1050,7 +1060,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:348
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -1060,28 +1070,28 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:356
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
"Assume-No</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:361
msgid ""
"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:367
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:373
msgid ""
"This option controls the architecture packages are built for by <command>apt-"
"get source --compile</command> and how cross-builddependencies are "
@@ -1092,7 +1102,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml:383
msgid ""
"This option controls the activated build profiles for which a source package "
"is built by <command>apt-get source --compile</command> and how build "
@@ -1102,14 +1112,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:394
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml:399
msgid ""
"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -1118,7 +1128,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml:406
msgid ""
"Allow installing new packages when used in conjunction with "
"<literal>upgrade</literal>. This is useful if the update of a installed "
@@ -1130,7 +1140,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:418
msgid ""
"Do not upgrade packages; when used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1139,7 +1149,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:425
msgid ""
"Do not install new packages; when used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1148,17 +1158,48 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml:433
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:457
msgid ""
"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using <literal>force-yes</"
"literal> can potentially destroy your system! Configuration Item: "
-"<literal>APT::Get::force-yes</literal>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:465
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected MD5 "
@@ -1171,7 +1212,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:476
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1180,14 +1221,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:484
msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:489
msgid ""
"This option is on by default; use <literal>--no-list-cleanup</literal> to "
"turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1198,7 +1239,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:499
msgid ""
"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -1212,7 +1253,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:514
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1221,14 +1262,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml:521
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:527
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running the <literal>autoremove</"
@@ -1237,7 +1278,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml:534
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -1249,7 +1290,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:545
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1257,22 +1298,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:551
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:556
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
-"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself. "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override. Configuration Item: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:566
msgid ""
"Forbid the update command to acquire unverifiable data from configured "
"sources. Apt will fail at the update command for repositories without valid "
@@ -1281,7 +1325,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1291,13 +1335,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
-#: apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml:587 apt-cache.8.xml:352 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1313 apt_preferences.5.xml:709
msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1305,7 +1349,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml:604
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1333,9 +1377,9 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
-#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
-#: apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml:49 apt-cache.8.xml:137 apt-cache.8.xml:161
+#: apt-cache.8.xml:183 apt-cache.8.xml:188 apt-cache.8.xml:204
+#: apt-cache.8.xml:222 apt-cache.8.xml:234
msgid "&synopsis-pkg;"
msgstr ""
@@ -1447,62 +1491,62 @@ msgstr ""
#: apt-cache.8.xml:124
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
"instance, \"stable\" and \"unstable\"), this value can be considerably "
"larger than the number of total package names."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:130
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:138
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:147
msgid ""
"<literal>dump</literal> shows a short listing of every package in the cache. "
"It is primarily for debugging."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml:152
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml:157
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml:162
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg --print-"
"avail</command>; it displays the package records for the named packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:167
msgid "&synopsis-regex;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:168
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see &regex;. It searches "
@@ -1511,32 +1555,32 @@ msgid ""
"including virtual package names. If <option>--full</option> is given then "
"output identical to <literal>show</literal> is produced for each matched "
"package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:179
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:184
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:189
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:193
#, fuzzy
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr ""
@@ -1544,7 +1588,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:194
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -1554,7 +1598,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:199
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -1562,7 +1606,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:205
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1575,7 +1619,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml:214
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -1584,19 +1628,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:219
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:223
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:227
#, fuzzy
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr ""
@@ -1604,7 +1648,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:228
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1613,7 +1657,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml:235
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1625,7 +1669,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:251
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -1633,7 +1677,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:257
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1643,7 +1687,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:265
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1652,7 +1696,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:272
msgid ""
"Print only important dependencies; for use with <literal>unmet</literal> and "
"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -1660,9 +1704,9 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml:286
msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
@@ -1670,14 +1714,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:294
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data. A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture. Configuration Item: <literal>APT::Cache::ShowImplicit</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:304
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:309
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1688,7 +1744,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml:318
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1696,14 +1752,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:324
msgid ""
-"Only search on the package names, not the long descriptions. Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:329
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1711,7 +1767,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1719,7 +1775,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:342
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1727,12 +1783,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:360
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:365
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -2794,11 +2850,13 @@ msgid ""
"user system. Archive maintainers are encouraged to create Release files with "
"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
"value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used. The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:308
+#: apt.conf.5.xml:310
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2806,11 +2864,13 @@ msgid ""
"<literal>Valid-Until</literal> header the earlier date of the two is used as "
"the expiration date. The default value is <literal>0</literal> which stands "
"for \"valid forever\". Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml:323
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2818,11 +2878,13 @@ msgid ""
"(local) mirror of a more frequently updated archive with a <literal>Valid-"
"Until</literal> header instead of completely disabling the expiration date "
"checking. Archive specific settings can and should be used by appending the "
-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:336
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2830,7 +2892,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:339
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 "
@@ -2841,7 +2903,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:349
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -2851,21 +2913,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:357
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:358
+#: apt.conf.5.xml:362
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:363
+#: apt.conf.5.xml:367
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]/</"
@@ -2877,7 +2939,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:375
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 "
@@ -2889,14 +2951,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381 apt.conf.5.xml:469
+#: apt.conf.5.xml:385 apt.conf.5.xml:473
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:384
+#: apt.conf.5.xml:388
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."
@@ -2908,14 +2970,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:395
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:394
+#: apt.conf.5.xml:398
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes per second. The default "
@@ -2925,7 +2987,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:405
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 "
@@ -2933,7 +2995,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:409
msgid ""
"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
"an external command to discover the http proxy to use. Apt expects the "
@@ -2947,7 +3009,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:427
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2958,7 +3020,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:435
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2980,7 +3042,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:456
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]/</"
@@ -2999,7 +3061,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: apt.conf.5.xml:476
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, "
@@ -3009,7 +3071,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:483
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 "
@@ -3018,7 +3080,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:488
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3028,13 +3090,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:502
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:497
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3047,20 +3109,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:510
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:517
+#: apt.conf.5.xml:521
#, 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:512
+#: apt.conf.5.xml:516
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -3072,19 +3134,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:526
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:525
+#: apt.conf.5.xml:529
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:522
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 "
@@ -3102,13 +3164,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:536
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:527
+#: apt.conf.5.xml:531
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -3123,7 +3185,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:541
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -3131,7 +3193,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:548
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -3140,7 +3202,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:556
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -3152,13 +3214,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:573
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:561
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -3180,7 +3242,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:574
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -3189,24 +3251,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:583
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:589
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:595
msgid ""
"The maximum file size of Release/Release.gpg/InRelease files. The default "
"is 10MB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:602
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to. The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:611
msgid ""
"Allow the update operation to load data files from a repository without a "
"trusted signature. If enabled this option no data files will be loaded and "
@@ -3215,7 +3285,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:622
msgid ""
"Allow that a repository that was previously gpg signed to become unsigned "
"durign a update operation. When there is no valid signature of a perviously "
@@ -3225,13 +3295,46 @@ msgid ""
"source untrusted and warn about them if you try to install them."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:634
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:636
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them. Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>. The value should be a "
+"normal URI to a text file, expect that package specific data is replaced "
+"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"if the package is from a component (e.g. <literal>main</literal>) this is "
+"the first part otherwise it is omitted, 2. the first letter of source "
+"package name, expect if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version. "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>') and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>'). The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:664
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:666
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -3243,7 +3346,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:673
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3257,7 +3360,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:683
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3267,7 +3370,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:689
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 "
@@ -3275,7 +3378,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:693
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -3286,20 +3389,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:701
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>. So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>. If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:715
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 "
@@ -3310,12 +3413,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:724
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:726
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3323,7 +3426,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:731
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -3336,40 +3439,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:745
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:709
+#: apt.conf.5.xml:750
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:714
+#: apt.conf.5.xml:755
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:720
+#: apt.conf.5.xml:761
msgid "How APT calls &dpkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:762
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:726
+#: apt.conf.5.xml:767
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 "
@@ -3377,7 +3480,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:773
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 "
@@ -3386,7 +3489,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:780
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 "
@@ -3397,16 +3500,51 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:787
+msgid ""
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:792
+msgid ""
+"Each configuration directive line has the form <literal>key=value</"
+"literal>. Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:800
+msgid ""
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:810
msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
+"\" is an incorrect typename which is just kept to remain compatible, it "
+"should be read as \"no\" and users are encouraged to support both."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:816
msgid ""
"The version of the protocol to be used for the command "
"<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3417,7 +3555,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:823
msgid ""
"The file descriptor to be used to send the information can be requested with "
"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -3428,26 +3566,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:833
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:773
+#: apt.conf.5.xml:838
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:778
+#: apt.conf.5.xml:843
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:779
+#: apt.conf.5.xml:844
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 "
@@ -3462,7 +3600,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:859
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -3472,7 +3610,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:853
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 "
@@ -3486,7 +3624,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:866
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 "
@@ -3499,7 +3637,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:874
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -3516,7 +3654,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:889
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -3527,7 +3665,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:896
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -3537,7 +3675,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:909
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -3549,7 +3687,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:902
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 "
@@ -3563,12 +3701,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:922
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:923
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -3577,12 +3715,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:931
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:933
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -3593,7 +3731,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:944
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -3601,7 +3739,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:952
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -3609,7 +3747,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:961
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -3619,66 +3757,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:904
+#: apt.conf.5.xml:969
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:914
+#: apt.conf.5.xml:979
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:923
+#: apt.conf.5.xml:988
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:999
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:1010
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1021
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:967
+#: apt.conf.5.xml:1032
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:978
+#: apt.conf.5.xml:1043
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:988
+#: apt.conf.5.xml:1053
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:998
+#: apt.conf.5.xml:1063
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:1008
+#: apt.conf.5.xml:1073
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 "
@@ -3686,53 +3824,53 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1084
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:1031
+#: apt.conf.5.xml:1096
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:1041
+#: apt.conf.5.xml:1106
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:1051
+#: apt.conf.5.xml:1116
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:1063
+#: apt.conf.5.xml:1128
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:1074
+#: apt.conf.5.xml:1139
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:1085
+#: apt.conf.5.xml:1150
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:1095
+#: apt.conf.5.xml:1160
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -3742,7 +3880,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml:1174
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -3760,46 +3898,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1130
+#: apt.conf.5.xml:1195
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:1141
+#: apt.conf.5.xml:1206
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:1152
+#: apt.conf.5.xml:1217
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:1164
+#: apt.conf.5.xml:1229
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:1175
+#: apt.conf.5.xml:1240
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1185
+#: apt.conf.5.xml:1250
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:1196
+#: apt.conf.5.xml:1261
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 "
@@ -3807,14 +3945,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1208
+#: apt.conf.5.xml:1273
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml:1283
msgid ""
"Display the external commands that are called by apt hooks. This includes e."
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -3822,14 +3960,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt.conf.5.xml:1307 apt_preferences.5.xml:556 sources.list.5.xml:358
#: apt-ftparchive.1.xml:592
#, fuzzy
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml:1308
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -3837,7 +3975,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml:1320
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -4024,11 +4162,9 @@ msgstr "prioridade 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:118
#, fuzzy
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
+msgid "to the versions that do not belong to the target release."
msgstr ""
-"para as instâncias que não estã instaladas e que não pertencem a versão alvo."
+"para as instâncias que não estejam instaladas e pertençam a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:122
@@ -4039,13 +4175,19 @@ msgstr "prioridade 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:123
#, fuzzy
-msgid ""
-"to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
msgstr ""
"para as instâncias que não estejam instaladas e pertençam a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:127
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:131
#, fuzzy
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -4060,7 +4202,7 @@ msgstr ""
"prioridade 500 para todas as instâncias de pacotes não instaladas."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml:138
#, fuzzy
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
@@ -4070,7 +4212,7 @@ msgstr ""
"determinar qual instância de um pacote instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml:141
#, fuzzy
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
@@ -4087,13 +4229,13 @@ msgstr ""
"\"downgrade\" pode ser arriscado.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
#, fuzzy
msgid "Install the highest priority version."
msgstr "Instala a instância de prioridade mais alta."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:148
#, fuzzy
msgid ""
"If two or more versions have the same priority, install the most recent one "
@@ -4103,7 +4245,7 @@ msgstr ""
"mais recente (ou seja, aquela com o maior número de versão)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml:151
#, fuzzy
msgid ""
"If two or more versions have the same priority and version number but either "
@@ -4115,7 +4257,7 @@ msgstr ""
"<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:157
#, fuzzy
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
@@ -4132,7 +4274,7 @@ msgstr ""
"forem executados."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:164
#, fuzzy
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -4147,7 +4289,7 @@ msgstr ""
"upgrade</command> forem executados."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
#, fuzzy
msgid ""
"Sometimes the installed version of a package is more recent than the version "
@@ -4167,13 +4309,13 @@ msgstr ""
"disponíveis possuir uma prioridade maior do que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:178
#, fuzzy
msgid "The Effect of APT Preferences"
msgstr "O Efeito das Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:180
#, fuzzy
msgid ""
"The APT preferences file allows the system administrator to control the "
@@ -4187,7 +4329,7 @@ msgstr ""
"das duas formas, uma forma específica e uma forma geral."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:186
#, fuzzy
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -4204,7 +4346,7 @@ msgstr ""
"com \"<literal>5.8</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -4217,7 +4359,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:199
#, fuzzy
msgid ""
"The general form assigns a priority to all of the package versions in a "
@@ -4233,7 +4375,7 @@ msgstr ""
"identificado pelo nome de domínio totalmente qualificado do site Internet."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:205
#, fuzzy
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
@@ -4246,7 +4388,7 @@ msgstr ""
"no site local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:210
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -4259,7 +4401,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml:215
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
"which can be used to match a hostname. The following record will assign a "
@@ -4268,7 +4410,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:219
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -4281,7 +4423,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:223
#, fuzzy
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
@@ -4298,7 +4440,7 @@ msgstr ""
"como \"Debian\" ou \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml:228
#, fuzzy
msgid ""
"The following record assigns a low priority to all package versions "
@@ -4310,7 +4452,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:232
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -4323,7 +4465,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:237
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -4335,7 +4477,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -4348,7 +4490,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -4361,7 +4503,7 @@ msgstr ""
"literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -4373,13 +4515,22 @@ msgstr ""
"Pin: release a=unstable, v=3.0\n"
"Pin-Priority: 50\n"
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:258
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:266
msgid "Regular expressions and &glob; syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:268
msgid ""
"APT also supports pinning by &glob; expressions, and regular expressions "
"surrounded by slashes. For example, the following example assigns the "
@@ -4389,7 +4540,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, fuzzy, no-wrap
msgid ""
"Package: gnome* /kde/\n"
@@ -4402,7 +4553,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -4410,7 +4561,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -4423,7 +4574,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
@@ -4434,13 +4585,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
#, fuzzy
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:314
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -4451,12 +4602,12 @@ msgstr ""
"seguir (a grosso modo):"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:319
msgid "P &gt;= 1000"
msgstr "P &gt;= 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -4466,12 +4617,12 @@ msgstr ""
"dowgrade do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml:324
msgid "990 &lt;= P &lt; 1000"
msgstr "990 &lt;= P &lt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -4481,12 +4632,12 @@ msgstr ""
"versão alvo, a menos que a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:330
msgid "500 &lt;= P &lt; 990"
msgstr "500 &lt;= P &lt; 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:331
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -4496,12 +4647,12 @@ msgstr ""
"disponível pertencente a versão alvo ou a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "100 &lt;= P &lt; 500"
msgstr "100 &lt;= P &lt; 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:337
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -4512,12 +4663,12 @@ msgstr ""
"seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:342
msgid "0 &lt; P &lt; 100"
msgstr "0 &lt; P &lt; 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:343
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -4527,24 +4678,35 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:347
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:348
#, fuzzy
msgid "prevents the version from being installed"
msgstr "impede a versão de ser instalada"
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:351
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:352
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:358
#, fuzzy
msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version. Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+"The first specific-form record matching an available package version "
+"determines the priority of the package version. Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version. Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
msgstr ""
"Caso um dos registro de forma específica descritos acima case (match) com "
"uma versão disponível do pacote então o primeiro desses registros "
@@ -4554,7 +4716,7 @@ msgstr ""
"determinará a prioridade da versão do pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:366
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -4564,7 +4726,7 @@ msgstr ""
"registros apresentados anteriormente :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:370
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -4593,12 +4755,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:383
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -4614,7 +4776,7 @@ msgstr ""
"será feito um downgrade do <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:390
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -4626,7 +4788,7 @@ msgstr ""
"mesmo versões pertencentes a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:394
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -4641,13 +4803,13 @@ msgstr ""
"instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml:404
#, fuzzy
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:406
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -4659,7 +4821,7 @@ msgstr ""
"os pacotes disponíveis nessas localidades."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:410
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -4680,31 +4842,31 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:418
#, fuzzy
msgid "the <literal>Package:</literal> line"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml:419
#, fuzzy
msgid "gives the package name"
msgstr "informa o nome do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml:422 apt_preferences.5.xml:472
#, fuzzy
msgid "the <literal>Version:</literal> line"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:423
#, fuzzy
msgid "gives the version number for the named package"
msgstr "informa o número de versão do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:428
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -4727,13 +4889,13 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:439
#, fuzzy
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:440
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -4751,7 +4913,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:450
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -4759,13 +4921,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:456
#, fuzzy
msgid "the <literal>Codename:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml:457
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -4783,7 +4945,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:466
#, fuzzy, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr ""
@@ -4791,7 +4953,7 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:473
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -4809,7 +4971,7 @@ msgstr ""
"linhas a seguir."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
#, fuzzy, no-wrap
msgid ""
"Pin: release v=&stable-version;\n"
@@ -4822,13 +4984,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:491
#, fuzzy
msgid "the <literal>Component:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml:492
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -4847,7 +5009,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml:501
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -4855,13 +5017,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:507
#, fuzzy
msgid "the <literal>Origin:</literal> line"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:508
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -4875,7 +5037,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:514
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -4883,13 +5045,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:520
#, fuzzy
msgid "the <literal>Label:</literal> line"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:521
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -4902,7 +5064,7 @@ msgstr ""
"arquivo de preferências do APT iria requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:527
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -4910,7 +5072,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:534
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -4936,13 +5098,13 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml:547
#, fuzzy
msgid "Optional Lines in an APT Preferences Record"
msgstr "Linhas Opcionais em um Registro de Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:549
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -4954,13 +5116,13 @@ msgstr ""
"</literal>. Isto oferece um local para inserir comentários."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:558
#, fuzzy
msgid "Tracking Stable"
msgstr "Acompanhando a Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:566
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -4985,7 +5147,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:560
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -5001,8 +5163,8 @@ msgstr ""
"outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
-#: apt_preferences.5.xml:672
+#: apt_preferences.5.xml:583 apt_preferences.5.xml:629
+#: apt_preferences.5.xml:687
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -5015,7 +5177,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml:578
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -5028,7 +5190,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:595
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
@@ -5036,7 +5198,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:589
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -5049,13 +5211,13 @@ msgstr ""
"atualizado novamente a menos que esse comando seja executado novamente."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:601
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando a Testing"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:610
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -5084,7 +5246,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:603
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -5101,7 +5263,7 @@ msgstr ""
"versões de pacotes de outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:624
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -5114,7 +5276,7 @@ msgstr ""
"a(s) última(s) versão(ões) <literal>testing</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:644
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
@@ -5122,7 +5284,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:635
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -5142,12 +5304,12 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml:651
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml:665
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -5177,7 +5339,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:653
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -5192,7 +5354,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml:682
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -5205,7 +5367,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml:702
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
@@ -5213,7 +5375,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:693
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -5233,7 +5395,7 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml:717
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -5246,53 +5408,124 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:45
+msgid "sources.list.d"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:46
+msgid ""
+"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
+"add sources.list entries in separate files. Two different file formats are "
+"allowed as described in the next two sections. Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format. The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters. Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:58
+msgid "one line style format"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
+#: sources.list.5.xml:60
msgid ""
-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"Files in this format have the extension <filename>.list</filename>. Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"
"literal>) followed by options and arguments for this type. Individual "
"entries cannot be continued onto a following line. Empty lines are ignored, "
"and a <literal>#</literal> character anywhere on a line marks the remainder "
-"of that line as a comment."
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line. If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>) included in the line after the type separated from "
+"it with a space. If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by a equal sign (<literal>=</literal>). "
+"Multivalue options have also <literal>-=</literal> and <literal>+=</literal> "
+"as separator which instead of replacing the default with the given value(s) "
+"modify the default value(s) to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:79
+msgid ""
+"This is the traditional format and supported by all apt versions. Note that "
+"not all options as described below are supported by all apt versions. Note "
+"also that some older applications parsing this format on its own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
-msgid "sources.list.d"
+#: sources.list.5.xml:87
+msgid "deb822 style format"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:89
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>. The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, like the metadata itself apt will download from the configured "
+"sources or the <filename>debian/control</filename> file in a Debian source "
+"package. Individual entries are separated by an empty line, additional "
+"empty lines are ignored, and a <literal>#</literal> character at the start "
+"of the line marks the entire line as a comment. An entry can hence be "
+"disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it. Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s). Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:108
msgid ""
-"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files. The format is the same as for "
-"the regular <filename>sources.list</filename> file. File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier. It "
+"is intended to make this format gradually the default format and deprecating "
+"the previously described one line style format as it is easier to create, "
+"extend and modify by humans and machines alike especially if a lot of "
+"sources and/or options are involved. Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but could encounter problems with software not "
+"supporting the format yet."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml:123
+msgid "The deb and deb-src types: General Format"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml:124
msgid ""
"The <literal>deb</literal> type references a typical two-level Debian "
"archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
"<literal>stable</literal> or <literal>testing</literal> or a codename like "
"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
"literal> while component is one of <literal>main</literal>, "
@@ -5303,63 +5536,55 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:135
msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one line style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
+#: sources.list.5.xml:138
#, no-wrap
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:143
#, no-wrap
msgid ""
" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
+" URIs: uri\n"
+" Suites: suite\n"
+" Components: [component1] [component2] [...]\n"
+" option1: value1\n"
+" option2: value2\n"
" "
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:141
msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml:152
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>suite</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>suite</literal> must end with a "
"slash (<literal>/</literal>). This is useful for the case when only a "
-"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest. "
+"If <literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml:161
msgid ""
"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
"literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -5371,98 +5596,165 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
+#: sources.list.5.xml:169
msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+"Especially in the one line style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "
"location is desired. APT will sort the URI list after it has generated a "
"complete set internally, and will collapse multiple references to the same "
"Internet host, for instance, into a single connection, so that it does not "
-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:181
msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>. Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:188
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:190
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:186
+msgid ""
+"As an example, the sources for your distribution could look like this in one "
+"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:193
+msgid "The deb and deb-src types: Options"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:194
+msgid ""
+"Each source entry can have options specified modifying which and how the "
+"source is accessed and data acquired from it. Format, syntax and names of "
+"the options varies between the two formats one line and deb822 style as "
+"described, but they have both the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one line name in brackets. "
+"Remember that beside setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:205
msgid ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:212
msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information like translated package "
+"descriptions should be downloaded. If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:220
msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:228
msgid ""
-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-#, fuzzy
-msgid "Some examples:"
-msgstr "Exemplos"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:235
+msgid ""
+"<option>Signed-By</option> (<option>signed-by</option>) is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key in either the <filename>trusted.gpg</"
+"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set only the key(s) in this keyring or only the key with this "
+"fingerprint is used for the &apt-secure; verification of this repository. "
+"Otherwise all keys in the trusted keyrings are considered valid signers for "
+"this repository."
+msgstr ""
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:249
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-" "
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare until then the data provided in the "
+"repository should be considered valid and if this time is reached, but no "
+"new data is provided the data is considered expired and an error is raised. "
+"Beside increasing security as a malicious attacker can't sent old data "
+"forever denying a user to be able to upgrade to a new version, this also "
+"helps users identify mirrors which are no longer updated. Some repositories "
+"like historic archives aren't updated anymore by design through, so this "
+"check can be disabled by setting this option to <literal>no</literal>. "
+"Defaults to the value of configuration option <option>Acquire::Check-Valid-"
+"Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:266
+msgid ""
+"<option>Valid-Until-Min</option> (<option>check-valid-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldomly updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely. Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:288
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml:290
msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:294
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -5470,14 +5762,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml:301
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:308
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -5488,7 +5780,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:319
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -5501,7 +5793,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:331
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -5510,7 +5802,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:338
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5519,12 +5811,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:345
msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:347
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -5536,42 +5828,72 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:359
msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:361
+#, no-wrap
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:362
#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:367
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:368
#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:369
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:374
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:375
#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:376
+#, no-wrap
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:382
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5579,41 +5901,77 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:384
#, no-wrap
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:386
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml:398
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:400
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:401
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml:406
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:408
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:409
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:414
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -5622,19 +5980,38 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:418
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:419
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml:431
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:432
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:424
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -5642,13 +6019,42 @@ msgid ""
"amd64, and so forth for other supported architectures. [Note this example "
"only illustrates how to use the substitution variable; official debian "
"archives are not structured like this] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:437
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:439
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:445
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
+#: sources.list.5.xml:454
#, fuzzy
-msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;, &apt-conf;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
#. type: Content of: <refentry><refmeta><manvolnum>
@@ -7567,6 +7973,18 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr ""
+#~ "para as instâncias que não estã instaladas e que não pertencem a versão "
+#~ "alvo."
+
+#, fuzzy
+#~ msgid "Some examples:"
+#~ msgstr "Exemplos"
+
+#, fuzzy
+#~ msgid ""
#~ "See E<lt>http://bugs.debian.org/aptE<gt>. If you wish to report a bug in "
#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
#~ "B<reportbug>(1) command."