summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-05-25 15:55:05 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-05-25 15:55:05 +0200
commitff371080d8672b94ef289f1162704e74959b4ddf (patch)
treeef1009f20f84b4d53a8f837f02411c7789b89fc4 /doc
parent921a3ce01c2595e9df9ff20bdd259e14733dcb16 (diff)
parent642ebc1a04c9c7915474c57f1143a9389ee6636a (diff)
merged lp:~donkult/apt/sid
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-ftparchive.1.xml2
-rw-r--r--doc/apt-get.8.xml28
-rw-r--r--doc/apt.conf.5.xml5
-rw-r--r--doc/apt.ent10
-rw-r--r--doc/apt_preferences.5.xml30
-rw-r--r--doc/po/apt-doc.pot480
-rw-r--r--doc/po/de.po565
-rw-r--r--doc/po/es.po558
-rw-r--r--doc/po/fr.po960
-rw-r--r--doc/po/it.po482
-rw-r--r--doc/po/ja.po559
-rw-r--r--doc/po/pl.po507
-rw-r--r--doc/po/pt.po559
-rw-r--r--doc/po/pt_BR.po505
-rw-r--r--doc/sources.list.5.xml8
15 files changed, 2961 insertions, 2297 deletions
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 5bf47f32a..a3ac45bd3 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -363,7 +363,7 @@
The <literal>Tree</literal> section takes a scope tag which sets the
<literal>$(DIST)</literal> variable and defines the root of the tree
(the path is prefixed by <literal>ArchiveDir</literal>).
- Typically this is a setting such as <filename>dists/woody</filename>.</para>
+ Typically this is a setting such as <filename>dists/&stable-codename;</filename>.</para>
<para>
All of the settings defined in the <literal>TreeDefault</literal> section can be
use in a <literal>Tree</literal> section as well as three new variables.</para>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 4f8c80169..abdec96c1 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -46,18 +46,10 @@
</option>
</arg>
<arg>
- <option>-t=</option>
- <group choice='req'>
- <arg choice='plain'>
- <replaceable>target_release_name</replaceable>
- </arg>
- <arg choice='plain'>
- <replaceable>target_release_number_expression</replaceable>
- </arg>
- <arg choice='plain'>
- <replaceable>target_release_codename</replaceable>
- </arg>
- </group>
+ <option>-t=</option>
+ <arg choice='plain'>
+ <replaceable>target_release</replaceable>
+ </arg>
</arg>
<group choice="req">
@@ -73,10 +65,7 @@
=<replaceable>pkg_version_number</replaceable>
</arg>
<arg choice='plain'>
- /<replaceable>target_release_name</replaceable>
- </arg>
- <arg choice='plain'>
- /<replaceable>target_release_codename</replaceable>
+ /<replaceable>target_release</replaceable>
</arg>
</group>
</arg>
@@ -92,10 +81,7 @@
=<replaceable>pkg_version_number</replaceable>
</arg>
<arg choice='plain'>
- /<replaceable>target_release_name</replaceable>
- </arg>
- <arg choice='plain'>
- /<replaceable>target_release_codename</replaceable>
+ /<replaceable>target_release</replaceable>
</arg>
</group>
</arg>
@@ -126,7 +112,7 @@
<para><command>apt-get</command> is the command-line tool for handling packages, and may be
considered the user's "back-end" to other tools using the APT
library. Several "front-end" interfaces exist, such as &dselect;,
- &aptitude;, &synaptic;, &gnome-apt; and &wajig;.</para>
+ &aptitude;, &synaptic; and &wajig;.</para>
<para>Unless the <option>-h</option>, or <option>--help</option> option is given, one of the
commands below must be present.</para>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index c13ad4867..fe005e0f1 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -150,8 +150,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
</varlistentry>
<varlistentry><term>Default-Release</term>
- <listitem><para>Default release to install packages from if more than one
- version available. Contains release name, codename or release version. Examples: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-preferences;.</para></listitem>
+ <listitem><para>Default release to install packages from if more than one
+ version available. Contains release name, codename or release version. Examples: 'stable', 'testing',
+ 'unstable', '&stable-codename;', '&testing-codename;', '4.0', '5.0*'. See also &apt-preferences;.</para></listitem>
</varlistentry>
<varlistentry><term>Ignore-Hold</term>
diff --git a/doc/apt.ent b/doc/apt.ent
index c463f7811..494c6b02c 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -142,12 +142,6 @@
</citerefentry>"
>
-<!ENTITY gnome-apt "<citerefentry>
- <refentrytitle><command>gnome-apt</command></refentrytitle>
- <manvolnum>1</manvolnum>
- </citerefentry>"
->
-
<!ENTITY wajig "<citerefentry>
<refentrytitle><command>wajig</command></refentrytitle>
<manvolnum>1</manvolnum>
@@ -392,3 +386,7 @@
This is done on purpose, to avoid losing content when the
translation is lagging behind the original content.
">
+
+<!ENTITY oldstable-codename "etch">
+<!ENTITY stable-codename "lenny">
+<!ENTITY testing-codename "squeeze">
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 77b7776e8..abcf56744 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -98,6 +98,12 @@ algorithm to set the priorities of the versions of a package. Assign:
<variablelist>
<varlistentry>
+<term>priority 1</term>
+<listitem><simpara>to the versions coming from archives which in their <filename>Release</filename>
+files are marked as "NotAutomatic: yes" like the debian experimental archive.</simpara></listitem>
+</varlistentry>
+
+<varlistentry>
<term>priority 100</term>
<listitem><simpara>to the version that is already installed (if any).</simpara></listitem>
</varlistentry>
@@ -116,7 +122,9 @@ algorithm to set the priorities of the versions of a package. Assign:
<para>If the target release has not been specified then APT simply assigns
priority 100 to all installed package versions and priority 500 to all
-uninstalled package versions.</para>
+uninstalled package versions, expect versions coming from archives which
+in their <filename>Release</filename> files are marked as "NotAutomatic: yes" -
+these versions get the priority 1.</para>
<para>APT then applies the following rules, listed in order of precedence,
to determine which version of a package to install.
@@ -218,11 +226,11 @@ Pin-Priority: 50
</programlisting>
<simpara>The following record assigns a high priority to all package versions
-belonging to any distribution whose Codename is "<literal>squeeze</literal>".</simpara>
+belonging to any distribution whose Codename is "<literal>&testing-codename;</literal>".</simpara>
<programlisting>
Package: *
-Pin: release n=squeeze
+Pin: release n=&testing-codename;
Pin-Priority: 900
</programlisting>
@@ -355,7 +363,7 @@ APT priorities:
<para>The <filename>Release</filename> file is normally found in the directory
<filename>.../dists/<replaceable>dist-name</replaceable></filename>:
for example, <filename>.../dists/stable/Release</filename>,
-or <filename>.../dists/woody/Release</filename>.
+or <filename>.../dists/&stable-codename;/Release</filename>.
It consists of a single multi-line record which applies to <emphasis>all</emphasis> of
the packages in the directory tree below its parent. Unlike the
<filename>Packages</filename> file, nearly all of the lines in a <filename>Release</filename>
@@ -383,14 +391,14 @@ Pin: release a=stable
<term>the <literal>Codename:</literal> line</term>
<listitem><simpara>names the codename to which all the packages
in the directory tree belong. For example, the line
-"Codename: squeeze"
+"Codename: &testing-codename;"
specifies that all of the packages in the directory
tree below the parent of the <filename>Release</filename> file belong to a version named
-<literal>squeeze</literal>. Specifying this value in the APT preferences file
+<literal>&testing-codename;</literal>. Specifying this value in the APT preferences file
would require the line:
</simpara>
<programlisting>
-Pin: release n=squeeze
+Pin: release n=&testing-codename;
</programlisting>
</listitem>
</varlistentry>
@@ -590,9 +598,9 @@ the example configurations above.
<programlisting>
Explanation: Uninstall or do not install any Debian-originated package versions
-Explanation: other than those in the distribution codenamed with squeeze or sid
+Explanation: other than those in the distribution codenamed with &testing-codename; or sid
Package: *
-Pin: release n=squeeze
+Pin: release n=&testing-codename;
Pin-Priority: 900
Explanation: Debian unstable is always codenamed with sid
@@ -608,7 +616,7 @@ Pin-Priority: -10
<para>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 the release codenamed with <literal>squeeze</literal>.
+latest version(s) in the release codenamed with <literal>&testing-codename;</literal>.
<programlisting>
apt-get install <replaceable>package-name</replaceable>
@@ -620,7 +628,7 @@ apt-get dist-upgrade
<para>The following command will cause APT to upgrade the specified
package to the latest version from the <literal>sid</literal> distribution.
Thereafter, <command>apt-get upgrade</command> will upgrade
-the package to the most recent <literal>squeeze</literal> version if that is
+the package to the most recent <literal>&testing-codename;</literal> version if that is
more recent than the installed version, otherwise, to the most recent
<literal>sid</literal> version if that is more recent than the installed
version.
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 85146d4f2..a95cc87e2 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-19 11:14+0100\n"
+"POT-Creation-Date: 2010-05-04 13:41+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -588,7 +588,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:268
+#: apt.ent:270
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -597,14 +597,18 @@ msgid ""
" <listitem><para>Configuration File; Specify a configuration file to "
"use. \n"
" The program will read the default configuration file and then this \n"
-" configuration file. See &apt-conf; for syntax information. \n"
+" configuration file. If configuration settings need to be set before "
+"the\n"
+" default configuration files are parsed specify a file with the "
+"<envar>APT_CONFIG</envar>\n"
+" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
msgstr ""
#. type: Plain text
-#: apt.ent:280
+#: apt.ent:282
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -624,7 +628,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:291
+#: apt.ent:293
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -641,7 +645,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:297
+#: apt.ent:299
#, no-wrap
msgid ""
"<!ENTITY file-aptconf \"\n"
@@ -653,7 +657,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:303
+#: apt.ent:305
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -665,7 +669,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:309
+#: apt.ent:311
#, no-wrap
msgid ""
"<!ENTITY file-cachearchives \"\n"
@@ -677,7 +681,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:315
+#: apt.ent:317
#, no-wrap
msgid ""
" "
@@ -690,7 +694,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:325
+#: apt.ent:327
#, no-wrap
msgid ""
"<!ENTITY file-preferences \"\n"
@@ -706,7 +710,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:331
+#: apt.ent:333
#, no-wrap
msgid ""
" "
@@ -719,7 +723,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:337
+#: apt.ent:339
#, no-wrap
msgid ""
"<!ENTITY file-sourceslist \"\n"
@@ -731,7 +735,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:343
+#: apt.ent:345
#, no-wrap
msgid ""
" "
@@ -744,7 +748,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:350
+#: apt.ent:352
#, no-wrap
msgid ""
"<!ENTITY file-statelists \"\n"
@@ -758,7 +762,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:356
+#: apt.ent:358
#, no-wrap
msgid ""
" "
@@ -771,7 +775,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:362
+#: apt.ent:364
#, no-wrap
msgid ""
"<!ENTITY file-trustedgpg \"\n"
@@ -784,7 +788,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:369
+#: apt.ent:371
#, no-wrap
msgid ""
" "
@@ -799,7 +803,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:373
+#: apt.ent:375
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - "
@@ -810,7 +814,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:382
+#: apt.ent:384
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has "
@@ -829,7 +833,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:392
+#: apt.ent:394
#, no-wrap
msgid ""
"<!-- TRANSLATOR: As a translation is allowed to have 20% of "
@@ -1296,7 +1300,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:518 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1319,7 +1323,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr ""
@@ -1339,12 +1343,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr ""
@@ -1393,7 +1397,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
msgid "<option>-a</option>"
msgstr ""
@@ -1489,12 +1493,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 apt-sortpkgs.1.xml:64
+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561 apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:633
+#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:636
msgid "Files"
msgstr ""
@@ -1504,7 +1508,7 @@ msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 sources.list.5.xml:233
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:617 apt-get.8.xml:576 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:643 sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1514,7 +1518,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1618,7 +1622,7 @@ msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr ""
@@ -1813,7 +1817,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 apt-sortpkgs.1.xml:70
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618 apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -2240,36 +2244,60 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:228
-msgid "DeLinkLimit"
+msgid "Translation::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:230
msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:234
+msgid "DeLinkLimit"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:236
+msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section "
"<literal>External-Links</literal> setting."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:241
msgid "FileMode"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:243
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+msgid "LongDescription"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:256
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:258
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2277,12 +2305,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:263
msgid "MaxContentsChange"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:265
msgid ""
"Sets the number of kilobytes of contents files that are generated each "
"day. The contents files are round-robined so that over several days they "
@@ -2290,12 +2318,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:270
msgid "ContentsAge"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:272
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is "
@@ -2306,60 +2334,73 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:281
msgid "Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the top of the .deb directory tree. Defaults to "
"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:287
msgid "SrcDirectory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the top of the source package directory tree. Defaults to "
"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
msgid "Packages"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the output Packages file. Defaults to "
"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
msgid "Sources"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:301
msgid ""
"Sets the output Sources file. Defaults to "
"<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:305
+msgid "Translation"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:307
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:312
msgid "InternalPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:314
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to "
@@ -2367,12 +2408,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
msgid "Contents"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:321
msgid ""
"Sets the output Contents file. Defaults to "
"<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
@@ -2382,34 +2423,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:328
msgid "Contents::Header"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:311
+#: apt-ftparchive.1.xml:330
msgid "Sets header file to prepend to the contents output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
msgid "BinCacheDB"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
+#: apt-ftparchive.1.xml:335
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:339
msgid "FileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:322
+#: apt-ftparchive.1.xml:341
msgid ""
"Specifies that instead of walking the directory tree, "
"<command>apt-ftparchive</command> should read the list of files from the "
@@ -2417,12 +2458,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:346
msgid "SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:348
msgid ""
"Specifies that instead of walking the directory tree, "
"<command>apt-ftparchive</command> should read the list of files from the "
@@ -2431,12 +2472,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:356
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:358
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -2446,7 +2487,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:363
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2455,7 +2496,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
+#: apt-ftparchive.1.xml:368
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -2463,7 +2504,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:374
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -2473,7 +2514,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:352
+#: apt-ftparchive.1.xml:371
msgid ""
"When processing a <literal>Tree</literal> section "
"<command>apt-ftparchive</command> performs an operation similar to: "
@@ -2481,12 +2522,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:380
msgid "Sections"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:382
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib "
@@ -2494,12 +2535,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:387
msgid "Architectures"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:389
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -2507,56 +2548,56 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
msgid "BinOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:402
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
msgid "SrcOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:383
+#: apt-ftparchive.1.xml:408
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
msgid "ExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
+#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
msgid "SrcExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
+#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:424
msgid "BinDirectory Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:426
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -2566,64 +2607,64 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:434
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:439
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:420
+#: apt-ftparchive.1.xml:445
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:425
+#: apt-ftparchive.1.xml:450
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:430
+#: apt-ftparchive.1.xml:455
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:470
msgid "Sets the cache DB."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:473
msgid "PathPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:475
msgid "Appends a path to all the output paths."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:478
msgid "FileList, SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:480
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:487
msgid "The Binary Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:488
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -2633,19 +2674,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:494
#, no-wrap
msgid "old [// oldn]* => new"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:471
+#: apt-ftparchive.1.xml:496
#, no-wrap
msgid "new"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:493
msgid ""
"The general form of the maintainer field is: <placeholder "
"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -2656,12 +2697,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:504
msgid "The Source Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:506
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -2669,12 +2710,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:511
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:513
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -2682,12 +2723,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:522
msgid "<option>--md5</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:524
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -2695,19 +2736,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:529
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:531
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:537
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 "
@@ -2716,12 +2757,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:543
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:545
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2730,12 +2771,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:551
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:528
+#: apt-ftparchive.1.xml:553
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2745,12 +2786,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:561
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:563
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: "
@@ -2758,24 +2799,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:567
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:569
msgid ""
"Make the caching databases read only. Configuration Item: "
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:573
msgid "<option>--arch</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:574
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2784,12 +2825,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:580
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:582
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -2803,27 +2844,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:592
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:594
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with "
-"<command>apt-ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 sources.list.5.xml:193
+#: apt-ftparchive.1.xml:606 apt.conf.5.xml:1029 apt_preferences.5.xml:483 sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:612
#, no-wrap
msgid ""
"<command>apt-ftparchive</command> packages "
@@ -2832,14 +2873,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:608
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:597
+#: apt-ftparchive.1.xml:622
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -6203,15 +6244,33 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:198
msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"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 "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:202
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:206
+msgid ""
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file. What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is "
@@ -6219,7 +6278,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:215
#, no-wrap
msgid ""
"Package: *\n"
@@ -6228,7 +6287,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:220
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is "
@@ -6236,7 +6295,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:217
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -6245,7 +6304,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:229
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6253,7 +6312,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:234
#, no-wrap
msgid ""
"Package: *\n"
@@ -6262,82 +6321,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:245
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:254
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:251
+#: apt_preferences.5.xml:258
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed 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:257
+#: apt_preferences.5.xml:264
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:265
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:263
+#: apt_preferences.5.xml:270
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:271
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:269
+#: apt_preferences.5.xml:276
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:277
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:274
+#: apt_preferences.5.xml:281
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:282
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:248
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6345,7 +6404,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:280
+#: apt_preferences.5.xml:287
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6354,14 +6413,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:286
+#: apt_preferences.5.xml:293
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:290
+#: apt_preferences.5.xml:297
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6378,12 +6437,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:310
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:312
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 "
@@ -6393,7 +6452,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:317
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6401,7 +6460,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:321
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 "
@@ -6410,12 +6469,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:324
+#: apt_preferences.5.xml:331
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:333
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6423,27 +6482,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:345
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:346
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:350
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
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>: "
@@ -6455,12 +6514,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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:360
+#: apt_preferences.5.xml:367
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6471,18 +6530,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:377
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:383
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:384
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6493,13 +6552,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:386
+#: apt_preferences.5.xml:393
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6510,7 +6569,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:409
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6519,12 +6578,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:418
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:412
+#: apt_preferences.5.xml:419
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6536,18 +6595,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:428
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:434
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:435
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6556,18 +6615,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:441
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:440
+#: apt_preferences.5.xml:447
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:448
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6576,13 +6635,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:454
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6596,7 +6655,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:461
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6611,34 +6670,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:474
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:469
+#: apt_preferences.5.xml:476
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
"provides a place for comments."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional. If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release "
-"...</literal>."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:485
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:490
+#: apt_preferences.5.xml:493
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6653,7 +6703,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:487
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 "
@@ -6663,7 +6713,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 apt_preferences.5.xml:611
+#: apt_preferences.5.xml:510 apt_preferences.5.xml:556 apt_preferences.5.xml:614
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6672,7 +6722,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:505
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 "
@@ -6681,13 +6731,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:522
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:513
+#: apt_preferences.5.xml:516
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6696,12 +6746,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:528
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:537
#, no-wrap
msgid ""
"Package: *\n"
@@ -6718,7 +6768,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:527
+#: apt_preferences.5.xml:530
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6729,7 +6779,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:551
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 "
@@ -6738,13 +6788,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568
+#: apt_preferences.5.xml:571
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:562
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6756,12 +6806,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:578
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:592
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -6774,7 +6824,7 @@ msgid ""
"\n"
"Explanation: Debian unstable is always codenamed with sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -6783,7 +6833,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:580
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 "
@@ -6798,7 +6848,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:609
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 "
@@ -6807,13 +6857,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:629
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:620
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6825,12 +6875,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:638
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:644
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 5664eb780..44eda1704 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.7.24\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2010-03-19 11:14+0100\n"
+"POT-Creation-Date: 2010-05-04 13:41+0300\n"
"PO-Revision-Date: 2010-04-21 14:04+0200\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -805,15 +805,27 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:268
-#, no-wrap
+#: apt.ent:270
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry>\n"
+#| " <term><option>-c</option></term>\n"
+#| " <term><option>--config-file</option></term>\n"
+#| " <listitem><para>Configuration File; Specify a configuration file to use. \n"
+#| " The program will read the default configuration file and then this \n"
+#| " configuration file. See &apt-conf; for syntax information. \n"
+#| " </para>\n"
+#| " </listitem>\n"
+#| " </varlistentry>\n"
msgid ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
" <listitem><para>Configuration File; Specify a configuration file to use. \n"
" The program will read the default configuration file and then this \n"
-" configuration file. See &apt-conf; for syntax information. \n"
+" configuration file. If configuration settings need to be set before the\n"
+" default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
@@ -829,7 +841,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:280
+#: apt.ent:282
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -857,7 +869,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:291
+#: apt.ent:293
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -883,7 +895,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:297
+#: apt.ent:299
#, no-wrap
msgid ""
"<!ENTITY file-aptconf \"\n"
@@ -899,7 +911,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:303
+#: apt.ent:305
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -915,7 +927,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:309
+#: apt.ent:311
#, no-wrap
msgid ""
"<!ENTITY file-cachearchives \"\n"
@@ -931,7 +943,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:315
+#: apt.ent:317
#, no-wrap
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -947,7 +959,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:325
+#: apt.ent:327
#, no-wrap
msgid ""
"<!ENTITY file-preferences \"\n"
@@ -970,7 +982,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:331
+#: apt.ent:333
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -986,7 +998,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:337
+#: apt.ent:339
#, no-wrap
msgid ""
"<!ENTITY file-sourceslist \"\n"
@@ -1002,7 +1014,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:343
+#: apt.ent:345
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1018,7 +1030,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:350
+#: apt.ent:352
#, no-wrap
msgid ""
"<!ENTITY file-statelists \"\n"
@@ -1036,7 +1048,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:356
+#: apt.ent:358
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1052,7 +1064,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:362
+#: apt.ent:364
#, fuzzy, no-wrap
#| msgid ""
#| "<!ENTITY file-sourceslist \"\n"
@@ -1074,7 +1086,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:369
+#: apt.ent:371
#, fuzzy, no-wrap
#| msgid ""
#| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1097,7 +1109,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:373
+#: apt.ent:375
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1106,7 +1118,7 @@ msgid ""
msgstr "<!ENTITY translation-title \"ÜBERSETZUNG\">\n"
#. type: Plain text
-#: apt.ent:382
+#: apt.ent:384
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1124,7 +1136,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:392
+#: apt.ent:394
#, no-wrap
msgid ""
"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1757,7 +1769,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:518 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "Optionen"
@@ -1785,7 +1797,7 @@ msgstr ""
"pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1813,12 +1825,12 @@ msgstr ""
"srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1877,7 +1889,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1994,14 +2006,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:636
msgid "Files"
msgstr "Dateien"
@@ -2012,9 +2024,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:617 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:643
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Siehe auch"
@@ -2026,7 +2038,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnose"
@@ -2168,7 +2180,7 @@ msgid "Options"
msgstr "Optionen"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2411,7 +2423,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2992,11 +3004,31 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:228
+#, fuzzy
+#| msgid "Contents::Compress"
+msgid "Translation::Compress"
+msgstr "Contents::Compress"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:230
+#, fuzzy
+#| msgid ""
+#| "This is similar to <literal>Packages::Compress</literal> except that it "
+#| "controls the compression for the Contents files."
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+"Dies ist <literal>Packages::Compress</literal> ähnlich, außer dass es die "
+"Kompression der Inhaltsdateien steuert."
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:234
msgid "DeLinkLimit"
msgstr "DeLinkLimit"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:236
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -3007,12 +3039,12 @@ msgstr ""
"<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:241
msgid "FileMode"
msgstr "FileMode"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:243
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
@@ -3020,13 +3052,27 @@ msgstr ""
"Gibt die Rechte für alle erstellten Indexdateien an. Vorgabe ist 0644. Alle "
"Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#, fuzzy
+#| msgid "Description"
+msgid "LongDescription"
+msgstr "Beschreibung"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:256
msgid "TreeDefault Section"
msgstr "TreeDefault-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:258
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -3037,12 +3083,12 @@ msgstr ""
"$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:263
msgid "MaxContentsChange"
msgstr "MaxContentsChange"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:265
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -3053,12 +3099,12 @@ msgstr ""
"Tage alle neu gebildet werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:270
msgid "ContentsAge"
msgstr "ContentsAge"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:272
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3076,12 +3122,12 @@ msgstr ""
"eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:281
msgid "Directory"
msgstr "Directory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3090,12 +3136,12 @@ msgstr ""
"$(SECTION)/binary-$(ARCH)/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:287
msgid "SrcDirectory"
msgstr "SrcDirectory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
@@ -3104,12 +3150,12 @@ msgstr ""
"$(DIST)/$(SECTION)/source/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
msgid "Packages"
msgstr "Packages"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
@@ -3118,12 +3164,12 @@ msgstr ""
"binary-$(ARCH)/Packages</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
msgid "Sources"
msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:301
#, fuzzy
#| msgid ""
#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
@@ -3136,12 +3182,27 @@ msgstr ""
"source/Sources</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:305
+#, fuzzy
+#| msgid "Operation"
+msgid "Translation"
+msgstr "Betrieb"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:307
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
+"$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:312
msgid "InternalPrefix"
msgstr "InternalPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:314
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3152,12 +3213,12 @@ msgstr ""
"<filename>$(DIST)/$(SECTION)/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
msgid "Contents"
msgstr "Contents"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:321
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3171,22 +3232,22 @@ msgstr ""
"automatisch integrieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:328
msgid "Contents::Header"
msgstr "Contents::Header"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:311
+#: apt-ftparchive.1.xml:330
msgid "Sets header file to prepend to the contents output."
msgstr "Setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
msgid "BinCacheDB"
msgstr "BinCacheDB"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
+#: apt-ftparchive.1.xml:335
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
@@ -3195,12 +3256,12 @@ msgstr ""
"Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:339
msgid "FileList"
msgstr "FileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:322
+#: apt-ftparchive.1.xml:341
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3211,12 +3272,12 @@ msgstr ""
"Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:346
msgid "SourceFileList"
msgstr "SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:348
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3229,12 +3290,12 @@ msgstr ""
"benutzt, wenn Quellindizes verarbeitet werden."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:356
msgid "Tree Section"
msgstr "Tree-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:358
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3249,7 +3310,7 @@ msgstr ""
"<literal>Directory</literal>-Ersetzungsvariable definiert."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:363
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3263,7 +3324,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
+#: apt-ftparchive.1.xml:368
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3274,7 +3335,7 @@ msgstr ""
"Variablen benutzt werden."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:374
#, fuzzy, no-wrap
#| msgid ""
#| "for i in Sections do \n"
@@ -3291,7 +3352,7 @@ msgstr ""
" Generiere for DIST=Geltungsbereich SECTION=i ARCH=j\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:352
+#: apt-ftparchive.1.xml:371
#, fuzzy
#| msgid ""
#| "When processing a <literal>Tree</literal> section <command>apt-"
@@ -3305,12 +3366,12 @@ msgstr ""
"<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:380
msgid "Sections"
msgstr "Abschnitte"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:382
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3321,12 +3382,12 @@ msgstr ""
"non-free</literal>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:387
msgid "Architectures"
msgstr "Architekturen"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:389
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3337,12 +3398,12 @@ msgstr ""
"benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
msgid "BinOverride"
msgstr "BinOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:402
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
@@ -3351,12 +3412,12 @@ msgstr ""
"Priorität und Adressinformationen des Betreuers."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
msgid "SrcOverride"
msgstr "SrcOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:383
+#: apt-ftparchive.1.xml:408
msgid ""
"Sets the source override file. The override file contains section "
"information."
@@ -3365,32 +3426,32 @@ msgstr ""
"Abschnittsinformationen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
msgid "ExtraOverride"
msgstr "ExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
+#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
msgid "Sets the binary extra override file."
msgstr "Setzt die zusätzliche Programm-Override-Datei."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
+#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
msgid "Sets the source extra override file."
msgstr "Setzt die zusätzliche Quell-Override-Datei."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:424
msgid "BinDirectory Section"
msgstr "BinDirectory-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:426
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3405,12 +3466,12 @@ msgstr ""
"<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:434
msgid "Sets the Packages file output."
msgstr "Setzt die Packages-Dateiausgabe."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:439
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
@@ -3419,52 +3480,52 @@ msgstr ""
"<literal>Sources</literal> ist erforderlich."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:420
+#: apt-ftparchive.1.xml:445
msgid "Sets the Contents file output. (optional)"
msgstr "Setzt die Contents-Dateiausgabe. (optional)"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:425
+#: apt-ftparchive.1.xml:450
msgid "Sets the binary override file."
msgstr "Setzt die Programm-Override-Datei."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:430
+#: apt-ftparchive.1.xml:455
msgid "Sets the source override file."
msgstr "Setzt die Quell-Override-Datei."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:470
msgid "Sets the cache DB."
msgstr "Setzt die Zwischenspeicherdatenbank."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:473
msgid "PathPrefix"
msgstr "PathPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:475
msgid "Appends a path to all the output paths."
msgstr "Hängt einen Pfad an alle Ausgabepfade an."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:478
msgid "FileList, SourceFileList"
msgstr "FileList, SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:480
msgid "Specifies the file list file."
msgstr "Gibt die Dateilistendatei an."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:487
msgid "The Binary Override File"
msgstr "Die Programm-Override-Datei "
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:488
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3479,19 +3540,19 @@ msgstr ""
"und das letzte Feld ist das Betreuerumsetzungsfeld."
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:494
#, no-wrap
msgid "old [// oldn]* => new"
msgstr "alt [// oldn]* => neu"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:471
+#: apt-ftparchive.1.xml:496
#, no-wrap
msgid "new"
msgstr "neu"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:493
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3508,12 +3569,12 @@ msgstr ""
"bedingungslos."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:504
msgid "The Source Override File"
msgstr "Die Quell-Override-Datei"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:506
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3524,12 +3585,12 @@ msgstr ""
"Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:511
msgid "The Extra Override File"
msgstr "Die zusätzlich Override-Datei"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:513
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3541,12 +3602,12 @@ msgstr ""
"ist der neue Wert."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:522
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:524
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3557,12 +3618,12 @@ msgstr ""
"ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:529
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:531
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3572,7 +3633,7 @@ msgstr ""
"DB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:537
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 "
@@ -3586,12 +3647,12 @@ msgstr ""
"Konfigurationselement: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:543
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:545
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3605,12 +3666,12 @@ msgstr ""
"DeLinkAct</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:551
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:528
+#: apt-ftparchive.1.xml:553
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3626,12 +3687,12 @@ msgstr ""
"Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:561
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:563
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3642,12 +3703,12 @@ msgstr ""
"SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:567
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:569
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3656,14 +3717,14 @@ msgstr ""
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:573
#, fuzzy
#| msgid "<option>-a</option>"
msgid "<option>--arch</option>"
msgstr "<option>-a</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:574
#, fuzzy
#| msgid ""
#| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3683,14 +3744,14 @@ msgstr ""
"AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:580
#, fuzzy
#| msgid "<option>APT::FTPArchive::LongDescription</option>"
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:582
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3704,18 +3765,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:592
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:594
+#, fuzzy
+#| msgid ""
+#| "This configuration option defaults to \"<literal>true</literal>\" and "
+#| "should only be set to <literal>\"false\"</literal> if the Archive "
+#| "generated with &apt-ftparchive; also provides <filename>Translation</"
+#| "filename> files. Note that it is currently not possible to create these "
+#| "files with <command>apt-ftparchive</command>."
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with <command>apt-"
-"ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
msgstr ""
"Diese Konfigurationsoption ist standardmäßig »<literal>true</literal>« und "
"sollte nur auf »<literal>false</literal>« gesetzt werden, wenn das mit &apt-"
@@ -3724,19 +3792,19 @@ msgstr ""
"Dateien mit <command>apt-ftparchive</command> zu erstellen."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
+#: apt-ftparchive.1.xml:606 apt.conf.5.xml:1029 apt_preferences.5.xml:483
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Beispiele"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:612
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:608
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3746,7 +3814,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:597
+#: apt-ftparchive.1.xml:622
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -8411,11 +8479,43 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:198
msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"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 "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:202
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: origin \"\"\n"
+#| "Pin-Priority: 999\n"
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
+msgstr ""
+"Package: *\n"
+"Pin: origin \"\"\n"
+"Pin-Priority: 999\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:206
+#, fuzzy
+#| msgid ""
+#| "A note of caution: the keyword used here is \"<literal>origin</literal>"
+#| "\". This should not be confused with the Origin of a distribution as "
+#| "specified in a <filename>Release</filename> file. What follows the "
+#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
+#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
+msgid ""
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file. What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."
msgstr ""
"Ein Wort der Warnung: Das hier benutzte Schlüsselwort ist »<literal>origin</"
"literal>«. Dies sollte nicht mit der Herkunft einer Distribution verwechselt "
@@ -8425,7 +8525,7 @@ msgstr ""
"wie »Debian« oder »Ximian«."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8436,7 +8536,7 @@ msgstr ""
"Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:215
#, no-wrap
msgid ""
"Package: *\n"
@@ -8448,7 +8548,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:220
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8459,7 +8559,7 @@ msgstr ""
"zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:217
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -8471,7 +8571,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:229
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8482,7 +8582,7 @@ msgstr ""
"Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:234
#, no-wrap
msgid ""
"Package: *\n"
@@ -8494,17 +8594,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:245
msgid "How APT Interprets Priorities"
msgstr "Wie APT Prioritäten interpretiert"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:254
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8513,12 +8613,12 @@ msgstr ""
"des Pakets durchführt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
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:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8527,12 +8627,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:257
+#: apt_preferences.5.xml:264
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:258
+#: apt_preferences.5.xml:265
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"
@@ -8542,12 +8642,12 @@ msgstr ""
"neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:270
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:264
+#: apt_preferences.5.xml:271
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"
@@ -8557,12 +8657,12 @@ msgstr ""
"installierte Version neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:276
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:270
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8571,17 +8671,17 @@ msgstr ""
"installierte Version des Pakets gibt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:274
+#: apt_preferences.5.xml:281
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:282
msgid "prevents the version from being installed"
msgstr "verhindert das Installieren der Version"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:248
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8592,7 +8692,7 @@ msgstr ""
"(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:280
+#: apt_preferences.5.xml:287
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8606,7 +8706,7 @@ msgstr ""
"erste dieser Datensätze die Priorität der Paketversion fest."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:286
+#: apt_preferences.5.xml:293
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8615,7 +8715,7 @@ msgstr ""
"bereits gezeigten Datensätze:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:297
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8643,12 +8743,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:310
msgid "Then:"
msgstr "Dann:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:312
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 "
@@ -8663,7 +8763,7 @@ msgstr ""
"dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:317
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8674,7 +8774,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:314
+#: apt_preferences.5.xml:321
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</"
@@ -8688,12 +8788,12 @@ msgstr ""
"Pakets installiert ist."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:324
+#: apt_preferences.5.xml:331
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:326
+#: apt_preferences.5.xml:333
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8704,27 +8804,27 @@ msgstr ""
"bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:345
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:339
+#: apt_preferences.5.xml:346
msgid "gives the package name"
msgstr "gibt den Paketnamen an"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
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:343
+#: apt_preferences.5.xml:350
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:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8745,12 +8845,12 @@ msgstr ""
"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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:360
+#: apt_preferences.5.xml:367
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8767,18 +8867,18 @@ msgstr ""
"folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:377
#, 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:376
+#: apt_preferences.5.xml:383
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:377
+#: apt_preferences.5.xml:384
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8794,13 +8894,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:386
+#: apt_preferences.5.xml:393
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8816,7 +8916,7 @@ msgstr ""
"eine der folgenden Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:409
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8828,12 +8928,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:418
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:412
+#: apt_preferences.5.xml:419
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8851,18 +8951,18 @@ msgstr ""
"Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:428
#, 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:427
+#: apt_preferences.5.xml:434
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:428
+#: apt_preferences.5.xml:435
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8874,18 +8974,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:434
+#: apt_preferences.5.xml:441
#, 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:440
+#: apt_preferences.5.xml:447
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:441
+#: apt_preferences.5.xml:448
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8898,13 +8998,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:454
#, 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:348
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8922,11 +9022,11 @@ msgstr ""
"einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> Pakete "
"im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses zutrifft. "
"Anders als die <filename>Packages</filename>-Datei sind nahezu alle Zeilen "
-"in einer <filename>Release</filename>-Datei für das Setzen von "
-"APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
+"in einer <filename>Release</filename>-Datei für das Setzen von APT-"
+"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:461
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8952,12 +9052,12 @@ msgstr ""
"Distribution heruntergeladen wurde."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:474
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:469
+#: apt_preferences.5.xml:476
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8967,27 +9067,13 @@ msgstr ""
"mehreren Zeilen beginnen, die mit dem Wort <literal>Explanation:</literal> "
"anfangen. Dieses stellt einen Platz für Kommentare bereit."
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional. If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-"Die <literal>Pin-Priority:</literal>-Zeile in jedem APT-"
-"Einstellungsdatensatz ist optional. Wenn diese weggelassen wird, weist APT "
-"ein Priorität zu, die um 1 kleiner ist, als der letzte Wert, der in einer "
-"Zeile angegeben wurde, die mit <literal>Pin-Priority: release ...</literal> "
-"anfängt."
-
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:485
msgid "Tracking Stable"
msgstr "Stable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:490
+#: apt_preferences.5.xml:493
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9011,7 +9097,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:487
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 "
@@ -9026,8 +9112,8 @@ msgstr ""
"Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
-#: apt_preferences.5.xml:611
+#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
+#: apt_preferences.5.xml:614
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -9039,7 +9125,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:505
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 "
@@ -9052,13 +9138,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:522
#, 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:513
+#: apt_preferences.5.xml:516
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -9072,12 +9158,12 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:528
msgid "Tracking Testing or Unstable"
msgstr "Testing oder Unstable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:537
#, no-wrap
msgid ""
"Package: *\n"
@@ -9105,7 +9191,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:527
+#: apt_preferences.5.xml:530
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9122,7 +9208,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:551
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 "
@@ -9135,13 +9221,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568
+#: apt_preferences.5.xml:571
#, 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:559
+#: apt_preferences.5.xml:562
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9161,13 +9247,28 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:578
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:589
-#, no-wrap
+#: apt_preferences.5.xml:592
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
+#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
+#| "\n"
+#| "Explanation: Debian unstable is always codenamed with sid\n"
+#| "Package: *\n"
+#| "Pin: release a=sid\n"
+#| "Pin-Priority: 800\n"
+#| "\n"
+#| "Package: *\n"
+#| "Pin: release o=Debian\n"
+#| "Pin-Priority: -10\n"
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
@@ -9177,7 +9278,7 @@ msgid ""
"\n"
"Explanation: Debian unstable is always codenamed with sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -9200,7 +9301,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:580
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 "
@@ -9226,7 +9327,7 @@ msgstr ""
"benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:609
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 "
@@ -9239,13 +9340,13 @@ msgstr ""
"durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:629
#, 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:617
+#: apt_preferences.5.xml:620
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9265,12 +9366,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:638
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:644
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -11378,3 +11479,15 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
#: offline.sgml:234
msgid "Which will use the already fetched archives on the disc."
msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
+
+#~ msgid ""
+#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
+#~ "is optional. If omitted, APT assigns a priority of 1 less than the last "
+#~ "value specified on a line beginning with <literal>Pin-Priority: "
+#~ "release ...</literal>."
+#~ msgstr ""
+#~ "Die <literal>Pin-Priority:</literal>-Zeile in jedem APT-"
+#~ "Einstellungsdatensatz ist optional. Wenn diese weggelassen wird, weist "
+#~ "APT ein Priorität zu, die um 1 kleiner ist, als der letzte Wert, der in "
+#~ "einer Zeile angegeben wurde, die mit <literal>Pin-Priority: release ...</"
+#~ "literal> anfängt."
diff --git a/doc/po/es.po b/doc/po/es.po
index 784185c19..e29849b2e 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25\n"
-"POT-Creation-Date: 2010-03-19 11:14+0100\n"
+"POT-Creation-Date: 2010-05-04 13:41+0300\n"
"PO-Revision-Date: 2010-03-02 18:43+0200\n"
"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
"Language-Team: Debian Spanish l10n <debian-l10n-spanish@lists.debian.org>\n"
@@ -838,15 +838,27 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:268
-#, no-wrap
+#: apt.ent:270
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry>\n"
+#| " <term><option>-c</option></term>\n"
+#| " <term><option>--config-file</option></term>\n"
+#| " <listitem><para>Configuration File; Specify a configuration file to use. \n"
+#| " The program will read the default configuration file and then this \n"
+#| " configuration file. See &apt-conf; for syntax information. \n"
+#| " </para>\n"
+#| " </listitem>\n"
+#| " </varlistentry>\n"
msgid ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
" <listitem><para>Configuration File; Specify a configuration file to use. \n"
" The program will read the default configuration file and then this \n"
-" configuration file. See &apt-conf; for syntax information. \n"
+" configuration file. If configuration settings need to be set before the\n"
+" default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
@@ -862,7 +874,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:280
+#: apt.ent:282
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -890,7 +902,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:291
+#: apt.ent:293
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -917,7 +929,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:297
+#: apt.ent:299
#, no-wrap
msgid ""
"<!ENTITY file-aptconf \"\n"
@@ -933,7 +945,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:303
+#: apt.ent:305
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -949,7 +961,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:309
+#: apt.ent:311
#, no-wrap
msgid ""
"<!ENTITY file-cachearchives \"\n"
@@ -965,7 +977,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:315
+#: apt.ent:317
#, no-wrap
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -981,7 +993,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:325
+#: apt.ent:327
#, no-wrap
msgid ""
"<!ENTITY file-preferences \"\n"
@@ -1004,7 +1016,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:331
+#: apt.ent:333
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1020,7 +1032,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:337
+#: apt.ent:339
#, no-wrap
msgid ""
"<!ENTITY file-sourceslist \"\n"
@@ -1036,7 +1048,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:343
+#: apt.ent:345
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1052,7 +1064,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:350
+#: apt.ent:352
#, no-wrap
msgid ""
"<!ENTITY file-statelists \"\n"
@@ -1070,7 +1082,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:356
+#: apt.ent:358
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1086,7 +1098,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:362
+#: apt.ent:364
#, fuzzy, no-wrap
#| msgid ""
#| "<!ENTITY file-sourceslist \"\n"
@@ -1108,7 +1120,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:369
+#: apt.ent:371
#, fuzzy, no-wrap
#| msgid ""
#| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1131,7 +1143,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:373
+#: apt.ent:375
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1140,7 +1152,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:382
+#: apt.ent:384
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1154,7 +1166,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:392
+#: apt.ent:394
#, no-wrap
msgid ""
"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1785,7 +1797,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:518 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "Opciones"
@@ -1812,7 +1824,7 @@ msgstr ""
"configuración: <literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1838,12 +1850,12 @@ msgstr ""
"Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1902,7 +1914,7 @@ msgstr ""
"Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -2019,14 +2031,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:636
msgid "Files"
msgstr "Ficheros"
@@ -2037,9 +2049,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:617 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:643
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Véase también"
@@ -2051,7 +2063,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnósticos"
@@ -2193,7 +2205,7 @@ msgid "Options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2438,7 +2450,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Sólo muestra el contenido del espacio de configuración."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -3019,11 +3031,31 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:228
+#, fuzzy
+#| msgid "Contents::Compress"
+msgid "Translation::Compress"
+msgstr "Contents::Compress"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:230
+#, fuzzy
+#| msgid ""
+#| "This is similar to <literal>Packages::Compress</literal> except that it "
+#| "controls the compression for the Contents files."
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+"Esta opción es similar a <literal>Packages::Compress</literal> excepto que "
+"controla la compresión para los ficheros «Contents»."
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:234
msgid "DeLinkLimit"
msgstr "DeLinkLimit"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:236
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -3034,12 +3066,12 @@ msgstr ""
"cada sección."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:241
msgid "FileMode"
msgstr "FileMode"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:243
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
@@ -3048,13 +3080,27 @@ msgstr ""
"predeterminado es 0644. Todos los ficheros de índice se ajustan a este modo "
"sin tener en cuenta la máscara de usuario («umask»)."
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#, fuzzy
+#| msgid "Description"
+msgid "LongDescription"
+msgstr "Descripción"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:256
msgid "TreeDefault Section"
msgstr "Sección TreeDefault"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:258
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -3065,12 +3111,12 @@ msgstr ""
"$(DIST), $(SECTION) y $(ARCH) con sus valores respectivos."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:263
msgid "MaxContentsChange"
msgstr "MaxContentsChange"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:265
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -3081,12 +3127,12 @@ msgstr ""
"que durante varios días todos se regenerarán."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:270
msgid "ContentsAge"
msgstr "ContentsAge"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:272
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3105,12 +3151,12 @@ msgstr ""
"unidades usadas son días."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:281
msgid "Directory"
msgstr "Directory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3119,12 +3165,12 @@ msgstr ""
"$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:287
msgid "SrcDirectory"
msgstr "SrcDirectory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
@@ -3133,12 +3179,12 @@ msgstr ""
"predeterminado es <filename>$(DIST)/$(SECTION)/source/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
msgid "Packages"
msgstr "Packages"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
@@ -3147,12 +3193,12 @@ msgstr ""
"$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
msgid "Sources"
msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:301
#, fuzzy
#| msgid ""
#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
@@ -3165,12 +3211,27 @@ msgstr ""
"$(DIST)/$(SECTION)/source/Sources</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:305
+#, fuzzy
+#| msgid "Operation"
+msgid "Translation"
+msgstr "Operación"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:307
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
+"$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:312
msgid "InternalPrefix"
msgstr "InternalPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:314
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3181,12 +3242,12 @@ msgstr ""
"<filename>$(DIST)/$(SECTION)/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
msgid "Contents"
msgstr "Contents"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:321
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3200,22 +3261,22 @@ msgstr ""
"esos ficheros de paquete juntos."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:328
msgid "Contents::Header"
msgstr "Contents::Header"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:311
+#: apt-ftparchive.1.xml:330
msgid "Sets header file to prepend to the contents output."
msgstr "Define el fichero de cabecera a añadir al fichero «Contents» de salida."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
msgid "BinCacheDB"
msgstr "BinCacheDB"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
+#: apt-ftparchive.1.xml:335
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
@@ -3224,12 +3285,12 @@ msgstr ""
"Varias secciones pueden compartir la misma base de datos."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:339
msgid "FileList"
msgstr "FileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:322
+#: apt-ftparchive.1.xml:341
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3241,12 +3302,12 @@ msgstr ""
"como prefijo el directorio del archivo."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:346
msgid "SourceFileList"
msgstr "SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:348
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3260,12 +3321,12 @@ msgstr ""
"índices de fuentes."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:356
msgid "Tree Section"
msgstr "Sección Tree"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:358
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3280,7 +3341,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:363
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3293,7 +3354,7 @@ msgstr ""
"valor como <filename>dists/woody</filename>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
+#: apt-ftparchive.1.xml:368
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3304,7 +3365,7 @@ msgstr ""
"variables."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:374
#, fuzzy, no-wrap
#| msgid ""
#| "for i in Sections do \n"
@@ -3321,7 +3382,7 @@ msgstr ""
" Generar con DIST=scope SECTION=i ARCH=j\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:352
+#: apt-ftparchive.1.xml:371
#, fuzzy
#| msgid ""
#| "When processing a <literal>Tree</literal> section <command>apt-"
@@ -3335,12 +3396,12 @@ msgstr ""
"ftparchive</command> realiza una operación similar a la siguiente:"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:380
msgid "Sections"
msgstr "Secciones"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:382
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3351,12 +3412,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:387
msgid "Architectures"
msgstr "Arquitecturas"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:389
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3367,12 +3428,12 @@ msgstr ""
"indicar que este árbol tiene un fichero de fuentes."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
msgid "BinOverride"
msgstr "BinOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:402
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
@@ -3381,12 +3442,12 @@ msgstr ""
"sección, la prioridad y la dirección del mantenedor."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
msgid "SrcOverride"
msgstr "SrcOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:383
+#: apt-ftparchive.1.xml:408
msgid ""
"Sets the source override file. The override file contains section "
"information."
@@ -3395,32 +3456,32 @@ msgstr ""
"la sección."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
msgid "ExtraOverride"
msgstr "ExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
+#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
msgid "Sets the binary extra override file."
msgstr "Define el fichero binario alternativo adicional."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
+#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
msgid "Sets the source extra override file."
msgstr "Define el fichero de fuentes alternativo adicional."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:424
msgid "BinDirectory Section"
msgstr "Sección BinDirectory"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:426
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3435,12 +3496,12 @@ msgstr ""
"<literal>Section</literal><literal>Architecture</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:434
msgid "Sets the Packages file output."
msgstr "Define el fichero «Packages» de salida."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:439
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
@@ -3449,52 +3510,52 @@ msgstr ""
"<literal>Packages</literal> o <literal>Sources</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:420
+#: apt-ftparchive.1.xml:445
msgid "Sets the Contents file output. (optional)"
msgstr "Define el fichero «Contents» de salida. (Opcional)"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:425
+#: apt-ftparchive.1.xml:450
msgid "Sets the binary override file."
msgstr "Define el fichero binario alternativo."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:430
+#: apt-ftparchive.1.xml:455
msgid "Sets the source override file."
msgstr "Define el fichero de fuentes alternativo."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:470
msgid "Sets the cache DB."
msgstr "Define la base de datos de la caché."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:473
msgid "PathPrefix"
msgstr "PathPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:475
msgid "Appends a path to all the output paths."
msgstr "Añade una ruta a todas las rutas de salida."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:478
msgid "FileList, SourceFileList"
msgstr "FileList, SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:480
msgid "Specifies the file list file."
msgstr "Define el fichero de la lista de ficheros."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:487
msgid "The Binary Override File"
msgstr "El fichero binario alternativo"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:488
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3509,19 +3570,19 @@ msgstr ""
"de permutación del mantenedor."
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:494
#, no-wrap
msgid "old [// oldn]* => new"
msgstr "antigua [// antigua-n]* => nueva"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:471
+#: apt-ftparchive.1.xml:496
#, no-wrap
msgid "new"
msgstr "nueva"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:493
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3538,12 +3599,12 @@ msgstr ""
"segunda forma sustituye de forma incondicional el campo del mantenedor."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:504
msgid "The Source Override File"
msgstr "El fichero de fuentes alternativo"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:506
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3554,12 +3615,12 @@ msgstr ""
"nombre del paquete fuente, el segundo es la sección a la que se asignará."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:511
msgid "The Extra Override File"
msgstr "El fichero alternativo adicional"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:513
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3570,12 +3631,12 @@ msgstr ""
"paquete, la segunda es la etiqueta y el resto de la línea es el nuevo valor."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:522
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:524
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3587,12 +3648,12 @@ msgstr ""
"FTPArchive::MD5</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:529
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:531
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3601,7 +3662,7 @@ msgstr ""
"«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:537
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 "
@@ -3615,12 +3676,12 @@ msgstr ""
"configuración. Opción de configuración: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:543
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:545
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3633,12 +3694,12 @@ msgstr ""
"Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:551
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:528
+#: apt-ftparchive.1.xml:553
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3655,12 +3716,12 @@ msgstr ""
"Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:561
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:563
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3671,12 +3732,12 @@ msgstr ""
"FTPArchive::SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:567
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:569
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3685,14 +3746,14 @@ msgstr ""
"Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:573
#, fuzzy
#| msgid "<option>-a</option>"
msgid "<option>--arch</option>"
msgstr "<option>-a</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:574
#, fuzzy
#| msgid ""
#| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3711,14 +3772,14 @@ msgstr ""
"configuración: <literal>APT::Get::AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:580
#, fuzzy
#| msgid "<option>APT::FTPArchive::LongDescription</option>"
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:582
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3732,18 +3793,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:592
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:594
+#, fuzzy
+#| msgid ""
+#| "This configuration option defaults to \"<literal>true</literal>\" and "
+#| "should only be set to <literal>\"false\"</literal> if the Archive "
+#| "generated with &apt-ftparchive; also provides <filename>Translation</"
+#| "filename> files. Note that it is currently not possible to create these "
+#| "files with <command>apt-ftparchive</command>."
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with <command>apt-"
-"ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
msgstr ""
"De forma predeterminada esta opción de configuración se define como "
"«<literal>true</literal>» y sólo se debería definir como «<literal>false</"
@@ -3753,19 +3821,19 @@ msgstr ""
"command>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
+#: apt-ftparchive.1.xml:606 apt.conf.5.xml:1029 apt_preferences.5.xml:483
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Ejemplos"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:612
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:608
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3774,7 +3842,7 @@ msgstr ""
"paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:597
+#: apt-ftparchive.1.xml:622
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -8374,11 +8442,43 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:198
msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"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 "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:202
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: origin \"\"\n"
+#| "Pin-Priority: 999\n"
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
+msgstr ""
+"Package: *\n"
+"Pin: origin \"\"\n"
+"Pin-Priority: 999\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:206
+#, fuzzy
+#| msgid ""
+#| "A note of caution: the keyword used here is \"<literal>origin</literal>"
+#| "\". This should not be confused with the Origin of a distribution as "
+#| "specified in a <filename>Release</filename> file. What follows the "
+#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
+#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
+msgid ""
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file. What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."
msgstr ""
"Aviso: la palabra clave usada aquí es «<literal>origin</literal>». No se debe "
"confundir con el origen («Origin:») de una distribución tal y como se "
@@ -8388,7 +8488,7 @@ msgstr ""
"tales como «Debian» o «Ximian»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8399,7 +8499,7 @@ msgstr ""
"archivo de paquetes «<literal>unstable</literal>» (inestable)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:215
#, no-wrap
msgid ""
"Package: *\n"
@@ -8411,7 +8511,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:220
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8422,7 +8522,7 @@ msgstr ""
"«<literal>squeeze</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:217
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -8434,7 +8534,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:229
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8446,7 +8546,7 @@ msgstr ""
"«<literal>3.0</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:234
#, no-wrap
msgid ""
"Package: *\n"
@@ -8458,17 +8558,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:245
msgid "How APT Interprets Priorities"
msgstr "¿Cómo interpreta APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:254
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8477,12 +8577,12 @@ msgstr ""
"el sistema."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
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:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8491,12 +8591,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:257
+#: apt_preferences.5.xml:264
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:258
+#: apt_preferences.5.xml:265
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"
@@ -8506,12 +8606,12 @@ msgstr ""
"más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:270
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:264
+#: apt_preferences.5.xml:271
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"
@@ -8520,12 +8620,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:269
+#: apt_preferences.5.xml:276
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:270
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8533,17 +8633,17 @@ 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:274
+#: apt_preferences.5.xml:281
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:282
msgid "prevents the version from being installed"
msgstr "Evita la instalación de la versión."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:248
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8554,7 +8654,7 @@ msgstr ""
"siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:280
+#: apt_preferences.5.xml:287
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8568,7 +8668,7 @@ msgstr ""
"versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:286
+#: apt_preferences.5.xml:293
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8577,7 +8677,7 @@ msgstr ""
"registros antes mencionados:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:297
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8605,12 +8705,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:310
msgid "Then:"
msgstr "Por ello:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:312
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 "
@@ -8625,7 +8725,7 @@ msgstr ""
"la versión 5.8*, desactualizando el paquete."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:317
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8636,7 +8736,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:314
+#: apt_preferences.5.xml:321
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</"
@@ -8649,12 +8749,12 @@ msgstr ""
"hay ninguna versión del paquete ya instalado."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:324
+#: apt_preferences.5.xml:331
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:326
+#: apt_preferences.5.xml:333
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8665,27 +8765,27 @@ msgstr ""
"describen los paquetes disponibles en cada uno de los sitios."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:345
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:339
+#: apt_preferences.5.xml:346
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:342 apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
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:343
+#: apt_preferences.5.xml:350
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:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8706,12 +8806,12 @@ msgstr ""
"de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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:360
+#: apt_preferences.5.xml:367
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8729,18 +8829,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:370
+#: apt_preferences.5.xml:377
#, 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:376
+#: apt_preferences.5.xml:383
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:377
+#: apt_preferences.5.xml:384
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8757,13 +8857,13 @@ msgstr ""
"siguientes líneas en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:386
+#: apt_preferences.5.xml:393
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8779,7 +8879,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:402
+#: apt_preferences.5.xml:409
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8791,12 +8891,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:418
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:412
+#: apt_preferences.5.xml:419
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8815,18 +8915,18 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:428
#, 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:427
+#: apt_preferences.5.xml:434
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:428
+#: apt_preferences.5.xml:435
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8839,18 +8939,18 @@ msgstr ""
"mediante la siguiente línea:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:441
#, 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:440
+#: apt_preferences.5.xml:447
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:441
+#: apt_preferences.5.xml:448
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8863,13 +8963,13 @@ msgstr ""
"siguiente línea:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:454
#, 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:348
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8891,7 +8991,7 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:461
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8916,12 +9016,12 @@ msgstr ""
"la distribución «<literal>unstable</literal>» (inestable)."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:474
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:469
+#: apt_preferences.5.xml:476
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8931,25 +9031,13 @@ msgstr ""
"más líneas que tengan como primera palabra <literal>Explanation:</literal>. "
"Útil para comentarios."
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional. If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-"La línea <literal>Pin-Priority:</literal> es opcional. Si se omite, APT "
-"asigna una prioridad de un número menor que la última prioridad especificada "
-"en una línea que empiece con <literal>Pin-Priority: release ...</literal>."
-
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:485
msgid "Tracking Stable"
msgstr "Seguir la distribución «stable» (estable)"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:490
+#: apt_preferences.5.xml:493
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8973,7 +9061,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:487
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 "
@@ -8988,8 +9076,8 @@ msgstr ""
"<literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
-#: apt_preferences.5.xml:611
+#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
+#: apt_preferences.5.xml:614
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -9001,7 +9089,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:505
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 "
@@ -9015,13 +9103,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:522
#, 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:513
+#: apt_preferences.5.xml:516
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -9034,12 +9122,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:528
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:534
+#: apt_preferences.5.xml:537
#, no-wrap
msgid ""
"Package: *\n"
@@ -9067,7 +9155,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:527
+#: apt_preferences.5.xml:530
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9084,7 +9172,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:551
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 "
@@ -9097,13 +9185,13 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568
+#: apt_preferences.5.xml:571
#, 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:559
+#: apt_preferences.5.xml:562
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9122,13 +9210,28 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:578
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:589
-#, no-wrap
+#: apt_preferences.5.xml:592
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
+#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
+#| "\n"
+#| "Explanation: Debian unstable is always codenamed with sid\n"
+#| "Package: *\n"
+#| "Pin: release a=sid\n"
+#| "Pin-Priority: 800\n"
+#| "\n"
+#| "Package: *\n"
+#| "Pin: release o=Debian\n"
+#| "Pin-Priority: -10\n"
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
@@ -9138,7 +9241,7 @@ msgid ""
"\n"
"Explanation: Debian unstable is always codenamed with sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -9161,7 +9264,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:580
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 "
@@ -9188,7 +9291,7 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:609
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 "
@@ -9201,13 +9304,13 @@ msgstr ""
"<literal>squeeze</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:629
#, 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:617
+#: apt_preferences.5.xml:620
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9226,12 +9329,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:638
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:644
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -11291,6 +11394,17 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Ésto usará los archivos del disco previamente obtenidos."
+#~ msgid ""
+#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
+#~ "is optional. If omitted, APT assigns a priority of 1 less than the last "
+#~ "value specified on a line beginning with <literal>Pin-Priority: "
+#~ "release ...</literal>."
+#~ msgstr ""
+#~ "La línea <literal>Pin-Priority:</literal> es opcional. Si se omite, APT "
+#~ "asigna una prioridad de un número menor que la última prioridad "
+#~ "especificada en una línea que empiece con <literal>Pin-Priority: "
+#~ "release ...</literal>."
+
#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index d1704e2e7..68fd82c56 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-02-18 20:53+0100\n"
+"POT-Creation-Date: 2010-05-04 13:41+0300\n"
"PO-Revision-Date: 2010-03-23 09:02+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: fr <debian-l10n-french@lists.debian.org>\n"
@@ -813,15 +813,27 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:268
-#, no-wrap
+#: apt.ent:270
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry>\n"
+#| " <term><option>-c</option></term>\n"
+#| " <term><option>--config-file</option></term>\n"
+#| " <listitem><para>Configuration File; Specify a configuration file to use. \n"
+#| " The program will read the default configuration file and then this \n"
+#| " configuration file. See &apt-conf; for syntax information. \n"
+#| " </para>\n"
+#| " </listitem>\n"
+#| " </varlistentry>\n"
msgid ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
" <listitem><para>Configuration File; Specify a configuration file to use. \n"
" The program will read the default configuration file and then this \n"
-" configuration file. See &apt-conf; for syntax information. \n"
+" configuration file. If configuration settings need to be set before the\n"
+" default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
@@ -837,7 +849,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:280
+#: apt.ent:282
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -865,7 +877,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:291
+#: apt.ent:293
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -891,7 +903,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:297
+#: apt.ent:299
#, no-wrap
msgid ""
"<!ENTITY file-aptconf \"\n"
@@ -907,7 +919,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:303
+#: apt.ent:305
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -923,7 +935,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:309
+#: apt.ent:311
#, no-wrap
msgid ""
"<!ENTITY file-cachearchives \"\n"
@@ -939,7 +951,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:315
+#: apt.ent:317
#, no-wrap
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -955,7 +967,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:325
+#: apt.ent:327
#, no-wrap
msgid ""
"<!ENTITY file-preferences \"\n"
@@ -976,7 +988,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:331
+#: apt.ent:333
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -992,7 +1004,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:337
+#: apt.ent:339
#, no-wrap
msgid ""
"<!ENTITY file-sourceslist \"\n"
@@ -1008,7 +1020,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:343
+#: apt.ent:345
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1024,7 +1036,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:350
+#: apt.ent:352
#, no-wrap
msgid ""
"<!ENTITY file-statelists \"\n"
@@ -1041,7 +1053,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:356
+#: apt.ent:358
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1057,7 +1069,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:362
+#: apt.ent:364
#, no-wrap
msgid ""
"<!ENTITY file-trustedgpg \"\n"
@@ -1073,14 +1085,8 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:369
+#: apt.ent:371
#, no-wrap
-#| msgid ""
-#| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
-#| " <listitem><para>File fragments for locations to fetch packages from.\n"
-#| " Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
-#| " </varlistentry>\n"
-#| "\">\n"
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
@@ -1097,7 +1103,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:373
+#: apt.ent:375
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1106,7 +1112,7 @@ msgid ""
msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
#. type: Plain text
-#: apt.ent:382
+#: apt.ent:384
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1124,7 +1130,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:392
+#: apt.ent:394
#, no-wrap
msgid ""
"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1144,7 +1150,7 @@ msgstr ""
" traduction est légèrement en retard sur le contenu d'origine.\n"
"\">\n"
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
@@ -1760,7 +1766,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:518 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "options"
@@ -1787,7 +1793,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1814,12 +1820,12 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1880,7 +1886,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -2000,14 +2006,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:636
msgid "Files"
msgstr "Fichiers"
@@ -2018,9 +2024,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:617 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:643
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Voir aussi"
@@ -2032,7 +2038,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -2112,12 +2118,6 @@ msgstr "add"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:66
-#| msgid ""
-#| "<literal>add</literal> is used to add a new disc to the source list. It "
-#| "will unmount the CDROM device, prompt for a disk to be inserted and then "
-#| "procceed to scan it and copy the index files. If the disc does not have a "
-#| "proper <filename>disk</filename> directory you will be prompted for a "
-#| "descriptive title."
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -2173,7 +2173,7 @@ msgid "Options"
msgstr "Options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2418,7 +2418,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Affiche seulement le contenu de l'espace de configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2526,7 +2526,7 @@ msgstr ""
"<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, "
"le nombre 100 en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-ftparchive.1.xml:13
msgid ""
@@ -2548,26 +2548,6 @@ msgstr "Outil de création de fichiers d'index"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-ftparchive.1.xml:36
-#| msgid ""
-#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#| "arg> <arg><option>-o <replaceable>config</"
-#| "replaceable>=<replaceable>string</replaceable></option></arg> "
-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#| "replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#| "group>"
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
@@ -2672,7 +2652,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
-msgid "The option <option>--db</option> can be used to specify a binary caching DB."
+msgid ""
+"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
"On peut se servir de l'option <option>--db</option> pour demander un cache "
"binaire."
@@ -2827,8 +2808,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml:156
-msgid "The generate configuration has 4 separate sections, each described below."
-msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
+msgid ""
+"The generate configuration has 4 separate sections, each described below."
+msgstr ""
+"Ce fichier de configuration possède quatre sections, décrites ci-dessous."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:158
@@ -2990,11 +2973,31 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:228
+#, fuzzy
+#| msgid "Contents::Compress"
+msgid "Translation::Compress"
+msgstr "Contents::Compress"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:230
+#, fuzzy
+#| msgid ""
+#| "This is similar to <literal>Packages::Compress</literal> except that it "
+#| "controls the compression for the Contents files."
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+"Identique à <literal>Packages::Compress</literal> mais précise comment sont "
+"compressés les fichiers « Contents »."
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:234
msgid "DeLinkLimit"
msgstr "DeLinkLimit"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:236
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -3005,12 +3008,12 @@ msgstr ""
"paramètre <literal>External-Links</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:241
msgid "FileMode"
msgstr "FileMode"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:243
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
@@ -3019,13 +3022,27 @@ msgstr ""
"c'est le mode 0644. Tous les fichiers d'index ont ce mode et le masque "
"utilisateur (umasq) est ignoré."
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#, fuzzy
+#| msgid "Description"
+msgid "LongDescription"
+msgstr "Description"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:256
msgid "TreeDefault Section"
msgstr "La section TreeDefault"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:258
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -3037,12 +3054,12 @@ msgstr ""
"respective."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:263
msgid "MaxContentsChange"
msgstr "MaxContentsChange"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:265
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -3054,12 +3071,12 @@ msgstr ""
"soient reconstruits."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:270
msgid "ContentsAge"
msgstr "ContentsAge"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:272
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3077,12 +3094,12 @@ msgstr ""
"nombre vaut 10, l'unité étant le jour."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:281
msgid "Directory"
msgstr "Directory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3091,12 +3108,12 @@ msgstr ""
"$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:287
msgid "SrcDirectory"
msgstr "SrcDirectory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
@@ -3105,12 +3122,12 @@ msgstr ""
"<filename>$(DIST)/$(SECTION)/source/</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
msgid "Packages"
msgstr "Packages"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
@@ -3119,12 +3136,12 @@ msgstr ""
"$(SECTION)/binary-$(ARCH)/Packages</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
msgid "Sources"
msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:301
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
@@ -3133,12 +3150,27 @@ msgstr ""
"$(SECTION)/source/Sources</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:305
+#, fuzzy
+#| msgid "Operation"
+msgid "Translation"
+msgstr "Fonctionnement"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:307
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
+"$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:312
msgid "InternalPrefix"
msgstr "InternalPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:314
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3149,12 +3181,12 @@ msgstr ""
"défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
msgid "Contents"
msgstr "Contents"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:321
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3167,22 +3199,22 @@ msgstr ""
"ftparchive</command> les intègre automatiquement."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:328
msgid "Contents::Header"
msgstr "Contents::Header"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:311
+#: apt-ftparchive.1.xml:330
msgid "Sets header file to prepend to the contents output."
msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
msgid "BinCacheDB"
msgstr "BinCacheDB"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
+#: apt-ftparchive.1.xml:335
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
@@ -3191,12 +3223,12 @@ msgstr ""
"Différentes sections peuvent partager cette base de données."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:339
msgid "FileList"
msgstr "FileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:322
+#: apt-ftparchive.1.xml:341
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3207,12 +3239,12 @@ msgstr ""
"relatifs sont préfixés par le répertoire de l'archive."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:346
msgid "SourceFileList"
msgstr "SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:348
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3225,12 +3257,12 @@ msgstr ""
"traiter les index de sources."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:356
msgid "Tree Section"
msgstr "La section Tree"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:358
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3244,7 +3276,7 @@ msgstr ""
"par la variable de substitution <literal>Directory</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:363
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3257,7 +3289,7 @@ msgstr ""
"C'est par exemple : <filename>dists/woody</filename>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
+#: apt-ftparchive.1.xml:368
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3268,7 +3300,7 @@ msgstr ""
"trois nouvelles variables suivantes."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:374
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -3282,7 +3314,7 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:352
+#: apt-ftparchive.1.xml:371
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -3293,12 +3325,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:380
msgid "Sections"
msgstr "Sections"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:382
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3309,12 +3341,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:387
msgid "Architectures"
msgstr "Architectures"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:389
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3325,12 +3357,12 @@ msgstr ""
"que l'arborescence est une arborescence de sources."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
msgid "BinOverride"
msgstr "BinOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:402
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
@@ -3339,12 +3371,12 @@ msgstr ""
"informations sur la section, la priorité et le responsable du paquet."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
msgid "SrcOverride"
msgstr "SrcOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:383
+#: apt-ftparchive.1.xml:408
msgid ""
"Sets the source override file. The override file contains section "
"information."
@@ -3353,32 +3385,32 @@ msgstr ""
"informations sur la section."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
msgid "ExtraOverride"
msgstr "ExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
+#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
msgid "Sets the binary extra override file."
msgstr "Indique un autre fichier d'« override » pour les binaires."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
+#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
msgid "Sets the source extra override file."
msgstr "Indique un autre fichier d'« override » pour les sources."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:424
msgid "BinDirectory Section"
msgstr "La section BinDirectory"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:426
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3393,12 +3425,12 @@ msgstr ""
"paramètrage de <literal>Section</literal><literal>Architecture</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:434
msgid "Sets the Packages file output."
msgstr "Définit le fichier « Packages » créé."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:439
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
@@ -3407,52 +3439,52 @@ msgstr ""
"<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:420
+#: apt-ftparchive.1.xml:445
msgid "Sets the Contents file output. (optional)"
msgstr "Définit le fichier « Contents » créé."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:425
+#: apt-ftparchive.1.xml:450
msgid "Sets the binary override file."
msgstr "Définit le fichier d'« override » pour les binaires."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:430
+#: apt-ftparchive.1.xml:455
msgid "Sets the source override file."
msgstr "Définit le fichier d'« override » pour les sources."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:470
msgid "Sets the cache DB."
msgstr "Définit la base de données cache."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:473
msgid "PathPrefix"
msgstr "PathPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:475
msgid "Appends a path to all the output paths."
msgstr "Ajoute un chemin à tous les chemins créés."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:478
msgid "FileList, SourceFileList"
msgstr "FileList, SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:480
msgid "Specifies the file list file."
msgstr "Définit le fichier contenant la liste des fichiers."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:487
msgid "The Binary Override File"
msgstr "Le fichier d'« Override » pour les binaires."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:488
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3467,19 +3499,19 @@ msgstr ""
"responsable de paquet."
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:494
#, no-wrap
msgid "old [// oldn]* => new"
msgstr "old [// oldn]* =&gt; new"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:471
+#: apt-ftparchive.1.xml:496
#, no-wrap
msgid "new"
msgstr "new"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:493
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3496,12 +3528,12 @@ msgstr ""
"deuxième forme remplace inconditionnellement le champ."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:504
msgid "The Source Override File"
msgstr "Le fichier d'« Override » pour les sources"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:506
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3512,12 +3544,12 @@ msgstr ""
"sa section."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:511
msgid "The Extra Override File"
msgstr "Le fichier supplémentaire d'« Override »"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:513
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3529,12 +3561,12 @@ msgstr ""
"la nouvelle valeur."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:522
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:524
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3546,12 +3578,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:529
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:531
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3561,7 +3593,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:537
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 "
@@ -3576,12 +3608,12 @@ msgstr ""
"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:543
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:545
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3595,12 +3627,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:551
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:528
+#: apt-ftparchive.1.xml:553
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3616,12 +3648,12 @@ msgstr ""
"de configuration : <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:561
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:563
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3632,12 +3664,12 @@ msgstr ""
"FTPArchive::SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:567
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:569
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3646,37 +3678,31 @@ msgstr ""
"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:548
-#| msgid "<option>-a</option>"
+#: apt-ftparchive.1.xml:573
msgid "<option>--arch</option>"
msgstr "<option>--arch</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
-#| msgid ""
-#| "If the command is either <literal>install</literal> or <literal>remove</"
-#| "literal>, then this option acts like running <literal>autoremove</"
-#| "literal> command, removing the unused dependency packages. Configuration "
-#| "Item: <literal>APT::Get::AutomaticRemove</literal>."
+#: apt-ftparchive.1.xml:574
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
"<literal>*_all.deb</literal> instead of all package files in the given "
"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
msgstr ""
-"N'accepte dans les commandes <literal>packages</literal> et <literal>contents</literal> "
-"que les fichiers de paquets correspondant à <literal>*_arch.deb</literal> ou "
-"<literal>*_all.deb</literal> au lieu de tous les fichiers de paquets du chemin indiqué."
-"Élément de configuration : <literal>APT::FTPArchive::Architecture</literal>."
+"N'accepte dans les commandes <literal>packages</literal> et "
+"<literal>contents</literal> que les fichiers de paquets correspondant à "
+"<literal>*_arch.deb</literal> ou <literal>*_all.deb</literal> au lieu de "
+"tous les fichiers de paquets du chemin indiqué.Élément de configuration : "
+"<literal>APT::FTPArchive::Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:555
-#| msgid "<option>APT::FTPArchive::LongDescription</option>"
+#: apt-ftparchive.1.xml:580
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:582
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3688,24 +3714,36 @@ msgid ""
"theory nobody will have these problems and therefore all these extra checks "
"are useless."
msgstr ""
-"&apt-ftparchive; met le plus de métadonnées possible en cache dans une base de données. Si les paquets sont recompilés ou republiés avec à nouveau la même version, cela "
-"pourra causer des problèmes car, alors, les métadonnées en cache (p. ex. les tailles et les sommes de contrôle) seront utilisées. Si cette option est choisie, cela "
-"n'arrivera plus car le fichier sera contrôlé pour vérifier s'il a été modifié. Veuillez noter que cette option n'est pas activée par défaut car il est déconseillé "
-"d'envoyer dans les archives des versions identiques. En théorie, donc, ces problème ne devraient pas survenir et l'ensemble de ces contrôles devient inutile."
+"&apt-ftparchive; met le plus de métadonnées possible en cache dans une base "
+"de données. Si les paquets sont recompilés ou republiés avec à nouveau la "
+"même version, cela pourra causer des problèmes car, alors, les métadonnées "
+"en cache (p. ex. les tailles et les sommes de contrôle) seront utilisées. Si "
+"cette option est choisie, cela n'arrivera plus car le fichier sera contrôlé "
+"pour vérifier s'il a été modifié. Veuillez noter que cette option n'est pas "
+"activée par défaut car il est déconseillé d'envoyer dans les archives des "
+"versions identiques. En théorie, donc, ces problème ne devraient pas "
+"survenir et l'ensemble de ces contrôles devient inutile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:592
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:594
+#, fuzzy
+#| msgid ""
+#| "This configuration option defaults to \"<literal>true</literal>\" and "
+#| "should only be set to <literal>\"false\"</literal> if the Archive "
+#| "generated with &apt-ftparchive; also provides <filename>Translation</"
+#| "filename> files. Note that it is currently not possible to create these "
+#| "files with <command>apt-ftparchive</command>."
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with <command>apt-"
-"ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
msgstr ""
"Cette option de configuration a « <literal>true</literal> » comme valeur par "
"défaut et ne devrait être placée sur « <literal>false</literal> » que si "
@@ -3714,19 +3752,19 @@ msgstr ""
"pas possible de créer ces fichiers avec <command>apt-ftparchive</command>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
+#: apt-ftparchive.1.xml:606 apt.conf.5.xml:1029 apt_preferences.5.xml:483
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:612
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:608
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3735,7 +3773,7 @@ msgstr ""
"paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:597
+#: apt-ftparchive.1.xml:622
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3743,7 +3781,7 @@ msgstr ""
"<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
"nombre 100 en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-get.8.xml:13
msgid ""
@@ -3761,7 +3799,8 @@ msgstr "apt-get"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-get.8.xml:30
msgid "APT package handling utility -- command-line interface"
-msgstr "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
+msgstr ""
+"Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:36
@@ -4303,18 +4342,6 @@ msgstr "<option>--fix-broken</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:334
-#| msgid ""
-#| "Fix; attempt to correct a system with broken dependencies in place. This "
-#| "option, when used with install/remove, can omit any packages to permit "
-#| "APT to deduce a likely solution. Any Package that are specified must "
-#| "completely correct the problem. The option is sometimes necessary when "
-#| "running APT for the first time; APT itself does not allow broken package "
-#| "dependencies to exist on a system. It is possible that a system's "
-#| "dependency structure can be so corrupt as to require manual intervention "
-#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
-#| "to eliminate some of the offending packages). Use of this option together "
-#| "with <option>-m</option> may produce an error in some situations. "
-#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -4689,13 +4716,7 @@ msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
-#| msgid ""
-#| "Use purge instead of remove for anything that would be removed. An "
-#| "asterisk (\"*\") will be displayed next to packages which are scheduled "
-#| "to be purged. <option>remove --purge</option> is equivalent for "
-#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::"
-#| "Purge</literal>."
+#: apt-get.8.xml:474
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. "
@@ -4704,8 +4725,9 @@ msgid ""
msgstr ""
"Utiliser « purge » à la place de « remove » pour supprimer tout ce qui peut "
"être supprimé. Un astérisque (*) sera accolé aux noms des paquets qui vont "
-"être purgés. <option>remove --purge</option> est équivalent à la commande <option>purge</option>. "
-"Élément de configuration : <literal>APT::Get::Purge</literal>."
+"être purgés. <option>remove --purge</option> est équivalent à la commande "
+"<option>purge</option>. Élément de configuration : <literal>APT::Get::Purge</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:481
@@ -4973,10 +4995,6 @@ msgstr "Utilitaire de gestion des clés d'APT"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
-#| msgid ""
-#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
-#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
-#| "option></arg>"
msgid ""
"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
@@ -5097,11 +5115,12 @@ msgstr ""
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
-msgstr "Veuillez noter que les options doivent être utilisées avant les commandes décrites dans la section suivante."
+msgstr ""
+"Veuillez noter que les options doivent être utilisées avant les commandes "
+"décrites dans la section suivante."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:142
-#| msgid "add <replaceable>filename</replaceable>"
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>fichier</replaceable>"
@@ -5115,9 +5134,12 @@ msgid ""
"filename> is the primary keyring which means that e.g. new keys are added to "
"this one."
msgstr ""
-"Cette option permet d'indiquer le fichier porte-clés sur lequel la commande doit agir. Par défaut, une commande sera exécutée sur le fichier <filename>trusted.gpg<"
-"/filename> ainsi que sur tous les fichiers du répertoire <filename>trusted.gpg.d</filename>. Le fichier <filename>trusted.gpg</"
-"filename> reste le fichier principal pour les clés donc, par exemple, les nouvelles clés y seront ajoutées."
+"Cette option permet d'indiquer le fichier porte-clés sur lequel la commande "
+"doit agir. Par défaut, une commande sera exécutée sur le fichier "
+"<filename>trusted.gpg</filename> ainsi que sur tous les fichiers du "
+"répertoire <filename>trusted.gpg.d</filename>. Le fichier <filename>trusted."
+"gpg</filename> reste le fichier principal pour les clés donc, par exemple, "
+"les nouvelles clés y seront ajoutées."
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-key.8.xml:156
@@ -5146,8 +5168,10 @@ msgstr "Trousseau des clés fiables de l'archive Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:166
-msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
-msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgid ""
+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgstr ""
+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:167
@@ -5159,7 +5183,7 @@ msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:13
msgid ""
@@ -5269,8 +5293,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:93
-msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
+msgid ""
+"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+msgstr ""
+"<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:94
@@ -5730,14 +5756,9 @@ msgstr ""
"<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
"en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt.conf.5.xml:13
-#| msgid ""
-#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
-#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#| "email; &apt-product; <date>18 September 2009</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@ -5772,23 +5793,30 @@ msgid ""
"made. All tools therefore share the configuration files and also use a "
"common command line parser to provide a uniform environment."
msgstr ""
-"Le fichier <filename>apt.conf</filename> est le fichier de configuration principal du l'ensemble de programmes APT, mais n'est de loin pas le seul endroit où des choix "
-"d'options peuvent être effectués. Tous les outils partagent les fichiers de configuration et utilisent également une analyse commune de la ligne de commande, ce qui permet "
-"de garantir un environnement d'utilisation uniforme."
+"Le fichier <filename>apt.conf</filename> est le fichier de configuration "
+"principal du l'ensemble de programmes APT, mais n'est de loin pas le seul "
+"endroit où des choix d'options peuvent être effectués. Tous les outils "
+"partagent les fichiers de configuration et utilisent également une analyse "
+"commune de la ligne de commande, ce qui permet de garantir un environnement "
+"d'utilisation uniforme."
#. type: Content of: <refentry><refsect1><orderedlist><para>
#: apt.conf.5.xml:45
msgid ""
"When an APT tool starts up it will read the configuration files in the "
"following order:"
-msgstr "Lorsqu'un programme de l'ensemble APT est utilisé, il lit le fichier de configuration dans l'ordre suivant :"
+msgstr ""
+"Lorsqu'un programme de l'ensemble APT est utilisé, il lit le fichier de "
+"configuration dans l'ordre suivant :"
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:47
msgid ""
"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
"any)"
-msgstr "fichier indiqué par la variable d'environnement <envar>APT_CONFIG</envar> si elle existe"
+msgstr ""
+"fichier indiqué par la variable d'environnement <envar>APT_CONFIG</envar> si "
+"elle existe"
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:49
@@ -5798,25 +5826,28 @@ msgid ""
"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
"characters - otherwise they will be silently ignored."
msgstr ""
-"tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>\", soit aucune extension "
-"et qui ne contiennent que des caractères alphanumériques, des tirets (-), des caractères de soulignement (_) et des points (.), les autres fichiers étant ignorés."
+"tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre "
+"alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>"
+"\", soit aucune extension et qui ne contiennent que des caractères "
+"alphanumériques, des tirets (-), des caractères de soulignement (_) et des "
+"points (.), les autres fichiers étant ignorés."
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:54
-#| msgid ""
-#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
-#| "literal>."
-msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
msgstr ""
-"le fichier de configuration défini par <literal>Dir::"
-"Etc::Main</literal>"
+"le fichier de configuration défini par <literal>Dir::Etc::Main</literal>"
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:56
msgid ""
"the command line options are applied to override the configuration "
"directives or to load even more configuration files."
-msgstr "les options de ligne de commande sont appliquées pour remplacer les directives de configuration ou pour charger d'autres fichiers de configuration."
+msgstr ""
+"les options de ligne de commande sont appliquées pour remplacer les "
+"directives de configuration ou pour charger d'autres fichiers de "
+"configuration."
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:60
@@ -6113,36 +6144,6 @@ msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:170
-#| msgid ""
-#| "Defaults to on which will cause APT to install essential and important "
-#| "packages as fast as possible in the install/upgrade operation. This is "
-#| "done to limit the effect of a failing &dpkg; call: If this option is "
-#| "disabled APT does treat an important package in the same way as an extra "
-#| "package: Between the unpacking of the important package A and his "
-#| "configuration can then be many other unpack or configuration calls, e.g. "
-#| "for package B which has no relation to A, but causes the dpkg call to "
-#| "fail (e.g. because maintainer script of package B generates an error) "
-#| "which results in a system state in which package A is unpacked but "
-#| "unconfigured - each package depending on A is now no longer guaranteed to "
-#| "work as their dependency on A is not longer satisfied. The immediate "
-#| "configuration marker is also applied to all dependencies which can "
-#| "generate a problem if the dependencies e.g. form a circle as a dependency "
-#| "with the immediate flag is comparable with a Pre-Dependency. So in theory "
-#| "it is possible that APT encounters a situation in which it is unable to "
-#| "perform immediate configuration, error out and refers to this option so "
-#| "the user can deactivate the immediate configuration temporary to be able "
-#| "to perform an install/upgrade again. Note the use of the word \"theory\" "
-#| "here as this problem was only encountered by now in real world a few "
-#| "times in non-stable distribution versions and caused by wrong "
-#| "dependencies of the package in question or by a system in an already "
-#| "broken state, so you should not blindly disable this option as the "
-#| "mentioned scenario above is not the only problem immediate configuration "
-#| "can help to prevent in the first place. Before a big operation like "
-#| "<literal>dist-upgrade</literal> is run with this option disabled it "
-#| "should be tried to explicitly <literal>install</literal> the package APT "
-#| "is unable to configure immediately, but please make sure to report your "
-#| "problem also to your distribution and to the APT team with the buglink "
-#| "below so they can work on improving or correcting the upgrade process."
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -6186,23 +6187,24 @@ msgstr ""
"ne fonctionnera plus nécessairement puisque sa dépendance n'est pas "
"satisfaite. Le marqueur de configuration immédiate sera aussi utilisé pour "
"toute dépendance qui peut créer un problème, par exemple les dépendances "
-"circulaires. En effet, utiliser le marqueur de configuration immédiate revient à "
-"gérer une pré-dépendance. Il est donc possible, en théorie, qu'APT rencontre "
-"une situation où il lui est impossible d'effectuer la configuration "
-"immédiate, qu'il se termine alors avec une erreur en faisant référence à "
-"cette option afin que l'utilisateur puisse la désactiver temporairement pour "
-"retenter l'opération d'installation ou de mise à jour. Il est à noter que "
-"« en théorie » indique ici que cette situation n'a été rencontrée que dans de "
-"rares cas, sur des versions instables de distributions, la cause étant des "
-"dépendances incorrectes ou un système déjà dans un état instable. Il est "
-"donc déconseillé de désactiver cette option sans réfléchir car la situation "
-"décrite précédemment n'est qu'un des cas où la configuration immédiate "
-"permet de résoudre des situations complexes. Avant de tenter une opération "
-"telle que <literal>dist-upgrade</literal> avec cette option désactivée, il "
-"est largement préférable d'essayer une opération <literal>install</literal> "
-"sur le paquet qu'APT ne peut configurer immédiatement. Il est également "
-"conseillé de signaler ce type de problème dans le système de suivi de bogues "
-"de la distribution utilisée afin qu'il soit étudié et corrigé."
+"circulaires. En effet, utiliser le marqueur de configuration immédiate "
+"revient à gérer une pré-dépendance. Il est donc possible, en théorie, qu'APT "
+"rencontre une situation où il lui est impossible d'effectuer la "
+"configuration immédiate, qu'il se termine alors avec une erreur en faisant "
+"référence à cette option afin que l'utilisateur puisse la désactiver "
+"temporairement pour retenter l'opération d'installation ou de mise à jour. "
+"Il est à noter que « en théorie » indique ici que cette situation n'a été "
+"rencontrée que dans de rares cas, sur des versions instables de "
+"distributions, la cause étant des dépendances incorrectes ou un système déjà "
+"dans un état instable. Il est donc déconseillé de désactiver cette option "
+"sans réfléchir car la situation décrite précédemment n'est qu'un des cas où "
+"la configuration immédiate permet de résoudre des situations complexes. "
+"Avant de tenter une opération telle que <literal>dist-upgrade</literal> avec "
+"cette option désactivée, il est largement préférable d'essayer une opération "
+"<literal>install</literal> sur le paquet qu'APT ne peut configurer "
+"immédiatement. Il est également conseillé de signaler ce type de problème "
+"dans le système de suivi de bogues de la distribution utilisée afin qu'il "
+"soit étudié et corrigé."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:192
@@ -6329,9 +6331,13 @@ msgid ""
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
-"Deux sous-options permettant de limite l'utilisation de fichiers « pdiff » sont également disponibles. <literal>FileLimit</literal> permet d'indiquer le nombre maximal de "
-"fichiers de différences peuvent être téléchargés pour modifier un fichier. <literal>SizeLimit</literal> permet par ailleurs de limiter la taille combinée des fichiers de "
-"différences récupérés à un certain pourcentage du fichier à modifier. Si une de ces limites est dépassée, le fichier complet est téléchargé au lieu de télécharger les "
+"Deux sous-options permettant de limite l'utilisation de fichiers « pdiff » "
+"sont également disponibles. <literal>FileLimit</literal> permet d'indiquer "
+"le nombre maximal de fichiers de différences peuvent être téléchargés pour "
+"modifier un fichier. <literal>SizeLimit</literal> permet par ailleurs de "
+"limiter la taille combinée des fichiers de différences récupérés à un "
+"certain pourcentage du fichier à modifier. Si une de ces limites est "
+"dépassée, le fichier complet est téléchargé au lieu de télécharger les "
"fichiers de différences."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
@@ -6812,15 +6818,6 @@ msgstr "Langues"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:415
-#| msgid ""
-#| "The Languages subsection controls which <filename>Translation</filename> "
-#| "files are downloaded and in which order APT tries to display the "
-#| "Description-Translations. APT will try to display the first available "
-#| "Description for the Language which is listed at first. Languages can be "
-#| "defined with their short or long Languagecodes. Note that not all "
-#| "archives provide <filename>Translation</filename> files for every "
-#| "Language - especially the long Languagecodes are rare, so please inform "
-#| "you which ones are available before you set here impossible values."
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
@@ -6838,9 +6835,8 @@ msgstr ""
"choisie en premier. Les langues peuvent être indiquées par leur code long ou "
"court. Veuillez noter que tous les dépôts ne fournissent pas les fichiers "
"<filename>Translation</filename> pour toutes les langues, particulièrement "
-"pour les codes rarement utilisés. Il est donc conseillé de vous "
-"renseigner sur ce qui est disponible avant d'établir des réglages "
-"impossibles."
+"pour les codes rarement utilisés. Il est donc conseillé de vous renseigner "
+"sur ce qui est disponible avant d'établir des réglages impossibles."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
#: apt.conf.5.xml:431
@@ -6850,25 +6846,6 @@ msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\";
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:421
-#| msgid ""
-#| "The default list includes \"environment\" and \"en\". "
-#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
-#| "replaced at runtime with the languagecodes extracted from the "
-#| "<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
-#| "that these codes are not included twice in the list. If "
-#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
-#| "<filename>Translation-en</filename> file (if available) will be used. To "
-#| "force apt to use no Translation file use the setting <literal>Acquire::"
-#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-#| "meaning code which will stop the search for a fitting "
-#| "<filename>Translation</filename> file. This can be used by the system "
-#| "administrator to let APT know that it should download also this files "
-#| "without actually use them if not the environment specifies this "
-#| "languages. So the following example configuration will result in the "
-#| "order \"en, de\" in an english and in \"de, en\" in a german "
-#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
-#| "used in a french localization, in such an environment the order would be "
-#| "\"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>"
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -7556,7 +7533,7 @@ msgstr ""
#. TODO: provide a
#. motivating example, except I haven't a clue why you'd want
-#. to do this.
+#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.conf.5.xml:692
msgid ""
@@ -7578,7 +7555,8 @@ msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:711
-msgid "Print information related to accessing <literal>cdrom://</literal> sources."
+msgid ""
+"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"Affiche les informations concernant les sources de type <literal>cdrom://</"
"literal>"
@@ -7591,7 +7569,8 @@ msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
-msgstr "Affiche les informations concernant le téléchargement de paquets par FTP."
+msgstr ""
+"Affiche les informations concernant le téléchargement de paquets par FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:729
@@ -7601,7 +7580,8 @@ msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
-msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP."
+msgstr ""
+"Affiche les informations concernant le téléchargement de paquets par HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:740
@@ -7762,7 +7742,8 @@ msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:862
-msgid "Log all interactions with the sub-processes that actually perform downloads."
+msgid ""
+"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
"Affiche toutes les interactions avec les processus enfants qui se chargent "
"effectivement des téléchargements."
@@ -7903,7 +7884,8 @@ msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:963
-msgid "Output status messages tracing the steps performed when invoking &dpkg;."
+msgid ""
+"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -7974,18 +7956,19 @@ msgstr ""
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
-#. ? reading apt.conf
+#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
-msgid "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-msgstr "&apt-author.team; &apt-email; &apt-product; <date>16 février 2010</date>"
+msgid ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
+msgstr ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 février 2010</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt_preferences.5.xml:21 apt_preferences.5.xml:28
@@ -8060,9 +8043,13 @@ msgid ""
"expected in older or newer releases or together with other packages from "
"different releases. You have been warned."
msgstr ""
-"Les préférences sont un outil puissant pour les administrateurs système mais peuvent devenir leur pire cauchemar si elles sont utilisées sans précautions. APT ne remettra "
-"pas en doute les réglages choisis. Des valeurs erronées pourront alors conduire à des paquets non installables ou à des décisions incorrectes lors de la mise à jour des "
-"paquets. Des problèmes supplémentaires peuvent survenir si des distributions multiples sont mélangées sans une bonne compréhension des paragraphes qui suivent."
+"Les préférences sont un outil puissant pour les administrateurs système mais "
+"peuvent devenir leur pire cauchemar si elles sont utilisées sans "
+"précautions. APT ne remettra pas en doute les réglages choisis. Des valeurs "
+"erronées pourront alors conduire à des paquets non installables ou à des "
+"décisions incorrectes lors de la mise à jour des paquets. Des problèmes "
+"supplémentaires peuvent survenir si des distributions multiples sont "
+"mélangées sans une bonne compréhension des paragraphes qui suivent."
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:67
@@ -8074,9 +8061,12 @@ msgid ""
"underscore (_) and period (.) characters - otherwise they will be silently "
"ignored."
msgstr ""
-"Veuillez noter que les fichiers du répertoire <filename>/etc/apt/preferences.d</filename> sont analysés par ordre alphanumérique ascendant, doivent avoir l'extension \"<"
-"literal>pref</literal>\" ou aucune extension et ne peuvent continir que des caractères alphanumériques, des tirets (-), des caractères de soulignement (_) et des points (."
-"). Dans le cas contraire, ils seront ignorés sans avertissement."
+"Veuillez noter que les fichiers du répertoire <filename>/etc/apt/preferences."
+"d</filename> sont analysés par ordre alphanumérique ascendant, doivent avoir "
+"l'extension \"<literal>pref</literal>\" ou aucune extension et ne peuvent "
+"continir que des caractères alphanumériques, des tirets (-), des caractères "
+"de soulignement (_) et des points (.). Dans le cas contraire, ils seront "
+"ignorés sans avertissement."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:74
@@ -8150,8 +8140,9 @@ msgid "priority 990"
msgstr "une priorité égale à 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
-msgid "to the versions that are not installed and belong to the target release."
+#: apt_preferences.5.xml:112
+msgid ""
+"to the versions that are not installed and belong to the target release."
msgstr ""
"est affectée aux versions qui ne sont pas installées et qui appartiennent à "
"la distribution par défaut."
@@ -8362,11 +8353,43 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:198
msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"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 "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:202
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: origin \"\"\n"
+#| "Pin-Priority: 999\n"
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
+msgstr ""
+"Package: *\n"
+"Pin: origin \"\"\n"
+"Pin-Priority: 999\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:206
+#, fuzzy
+#| msgid ""
+#| "A note of caution: the keyword used here is \"<literal>origin</literal>"
+#| "\". This should not be confused with the Origin of a distribution as "
+#| "specified in a <filename>Release</filename> file. What follows the "
+#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
+#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
+msgid ""
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file. What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."
msgstr ""
"Veuillez noter que le mot-clé utilisé ici, <literal>origin</literal>, ne "
"doit pas être confondu avec l'Origine d'une distribution indiquée dans un "
@@ -8375,7 +8398,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:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8386,7 +8409,7 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:215
#, no-wrap
msgid ""
"Package: *\n"
@@ -8398,7 +8421,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:220
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8409,7 +8432,7 @@ msgstr ""
"<literal>squeeze</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:217
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -8421,7 +8444,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:229
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8433,7 +8456,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:234
#, no-wrap
msgid ""
"Package: *\n"
@@ -8445,17 +8468,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:245
msgid "How APT Interprets Priorities"
msgstr "Méthode d'interprétation des priorités par APT"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:254
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8464,12 +8487,12 @@ msgstr ""
"retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
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:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8479,12 +8502,12 @@ msgstr ""
"plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
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:258
+#: apt_preferences.5.xml:265
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"
@@ -8493,12 +8516,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:263
+#: apt_preferences.5.xml:270
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:264
+#: apt_preferences.5.xml:271
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"
@@ -8507,29 +8530,29 @@ msgstr ""
"autre distribution ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:276
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:270
+#: apt_preferences.5.xml:277
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:274
+#: apt_preferences.5.xml:281
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:282
msgid "prevents the version from being installed"
msgstr "cette priorité empêche l'installation de la version."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:248
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8540,7 +8563,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:280
+#: apt_preferences.5.xml:287
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8554,7 +8577,7 @@ msgstr ""
"trouvée détermine la priorité."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:286
+#: apt_preferences.5.xml:293
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8563,7 +8586,7 @@ msgstr ""
"entrées décrites ci-dessous :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:297
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8591,12 +8614,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:310
msgid "Then:"
msgstr "Alors :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:312
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 "
@@ -8610,7 +8633,7 @@ msgstr ""
"installée est une version 5.9*, il y aura un retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:317
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8621,7 +8644,7 @@ msgstr ""
"appartenant à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:321
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</"
@@ -8634,12 +8657,13 @@ msgstr ""
"paquet n'est déjà installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:324
+#: apt_preferences.5.xml:331
msgid "Determination of Package Version and Distribution Properties"
-msgstr "Détermination de la version des paquets et des propriétés des distributions"
+msgstr ""
+"Détermination de la version des paquets et des propriétés des distributions"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:333
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8650,27 +8674,27 @@ msgstr ""
"décrivent les paquets disponibles à cet endroit."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:345
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:339
+#: apt_preferences.5.xml:346
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:342 apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
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:343
+#: apt_preferences.5.xml:350
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:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8691,12 +8715,12 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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:360
+#: apt_preferences.5.xml:367
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8713,18 +8737,18 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:377
#, 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:376
+#: apt_preferences.5.xml:383
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:377
+#: apt_preferences.5.xml:384
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8740,13 +8764,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:386
+#: apt_preferences.5.xml:393
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8762,7 +8786,7 @@ msgstr ""
"préférences demanderait ces lignes :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:409
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8774,12 +8798,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:418
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:412
+#: apt_preferences.5.xml:419
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8797,18 +8821,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:421
+#: apt_preferences.5.xml:428
#, 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:427
+#: apt_preferences.5.xml:434
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:428
+#: apt_preferences.5.xml:435
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8821,18 +8845,18 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:441
#, 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:440
+#: apt_preferences.5.xml:447
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:441
+#: apt_preferences.5.xml:448
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8845,13 +8869,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:454
#, 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:348
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8873,7 +8897,7 @@ msgstr ""
"déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:461
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8898,12 +8922,12 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:474
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:469
+#: apt_preferences.5.xml:476
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8913,26 +8937,13 @@ msgstr ""
"lignes contenant le mot <literal>Explanation:</literal>. Cela permet des "
"commentaires."
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional. If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-"La ligne <literal>Pin-Priority:</literal> d'une entrée est facultative. Si "
-"elle n'existe pas, APT affecte une priorité inférieure de 1 à la valeur "
-"spécifiée sur une ligne commençant par <literal>Pin-Priority: release ...</"
-"literal>."
-
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:485
msgid "Tracking Stable"
msgstr "Méthode pour suivre Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:490
+#: apt_preferences.5.xml:493
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8956,7 +8967,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:487
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 "
@@ -8971,8 +8982,8 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
-#: apt_preferences.5.xml:611
+#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
+#: apt_preferences.5.xml:614
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8984,7 +8995,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:505
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 "
@@ -8997,13 +9008,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:522
#, 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:513
+#: apt_preferences.5.xml:516
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -9016,12 +9027,12 @@ msgstr ""
"de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:528
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:534
+#: apt_preferences.5.xml:537
#, no-wrap
msgid ""
"Package: *\n"
@@ -9049,7 +9060,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:527
+#: apt_preferences.5.xml:530
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9066,7 +9077,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:551
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 "
@@ -9079,13 +9090,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568
+#: apt_preferences.5.xml:571
#, 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:559
+#: apt_preferences.5.xml:562
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9104,13 +9115,28 @@ msgstr ""
"installée. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:578
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:589
-#, no-wrap
+#: apt_preferences.5.xml:592
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
+#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
+#| "\n"
+#| "Explanation: Debian unstable is always codenamed with sid\n"
+#| "Package: *\n"
+#| "Pin: release a=sid\n"
+#| "Pin-Priority: 800\n"
+#| "\n"
+#| "Package: *\n"
+#| "Pin: release o=Debian\n"
+#| "Pin-Priority: -10\n"
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
@@ -9120,7 +9146,7 @@ msgid ""
"\n"
"Explanation: Debian unstable is always codenamed with sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -9143,7 +9169,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:580
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 "
@@ -9167,7 +9193,7 @@ msgstr ""
"exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:609
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 "
@@ -9180,13 +9206,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:629
#, 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:617
+#: apt_preferences.5.xml:620
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9205,12 +9231,12 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:638
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:644
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9533,21 +9559,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-#| msgid "more recongnizable URI types"
msgid "more recognizable URI types"
msgstr "plus de types d'URI simples à reconnaître"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:180
-#| msgid ""
-#| "APT can be extended with more methods shipped in other optional packages "
-#| "which should follow the nameing scheme <literal>apt-transport-"
-#| "<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
-#| "also the <literal>apt-transport-https</literal> package which provides "
-#| "access methods for https-URIs with features similiar to the http method, "
-#| "but other methods for using e.g. debtorrent are also available, see "
-#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
-#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
@@ -9727,7 +9743,8 @@ msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
#. type: <abstract></abstract>
#: guide.sgml:11
-msgid "This document provides an overview of how to use the the APT package manager."
+msgid ""
+"This document provides an overview of how to use the the APT package manager."
msgstr ""
"Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
"paquets APT."
@@ -9826,12 +9843,6 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:63
-#| msgid ""
-#| "For instance, mailcrypt is an emacs extension that aids in encrypting "
-#| "email with GPG. Without GPGP installed mail-crypt is useless, so "
-#| "mailcrypt has a simple dependency on GPG. Also, because it is an emacs "
-#| "extension it has a simple dependency on emacs, without emacs it is "
-#| "completely useless."
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -10075,16 +10086,6 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
-#| msgid ""
-#| "To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-#| "prgn> and then choose the APT method. You will be prompted for a set of "
-#| "<em>Sources</em> which are places to fetch archives from. These can be "
-#| "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
-#| "provide a fragment of the total Debian archive, APT will automatically "
-#| "combine them to form a complete set of packages. If you have a CDROM then "
-#| "it is a good idea to specify it first and then specify a mirror so that "
-#| "you have access to the latest bug fixes. APT will automatically use "
-#| "packages on your CDROM before downloading from the Internet."
msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
@@ -10227,12 +10228,6 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:247
-#| msgid ""
-#| "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-#| "available list by selecting [U]pdate from the menu. This is a super-set "
-#| "of <tt>apt-get update</tt> that makes the fetched information available "
-#| "to <prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
-#| "update</tt> has been run before."
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
"available list by selecting [U]pdate from the menu. This is a superset of "
@@ -10655,8 +10650,10 @@ msgstr "Résumé final"
#. type: <p></p>
#: guide.sgml:447
-msgid "Finally, APT will print out a summary of all the changes that will occur."
-msgstr "Anfin, APT affichera un résumé de toutes les opérations qui prendront place."
+msgid ""
+"Finally, APT will print out a summary of all the changes that will occur."
+msgstr ""
+"Anfin, APT affichera un résumé de toutes les opérations qui prendront place."
#. type: <example></example>
#: guide.sgml:452
@@ -10930,11 +10927,6 @@ msgstr ""
#. type: <p></p>
#: offline.sgml:57
-#| msgid ""
-#| "This is achieved by creatively manipulating the APT configuration file. "
-#| "The essential premis to tell APT to look on a disc for it's archive "
-#| "files. Note that the disc should be formated with a filesystem that can "
-#| "handle long file names such as ext2, fat32 or vfat."
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
"essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -11084,12 +11076,6 @@ msgstr ""
#. type: <p><example>
#: offline.sgml:136
-#| msgid ""
-#| "On the target machine the first thing to do is mount the disc and copy "
-#| "<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
-#| "directories outlined in the Overview, <em>archives/partial/</em> and "
-#| "<em>lists/partial/</em> Then take the disc to the remote machine and "
-#| "configure the sources.list. On the remote machine execute the following:"
msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
@@ -11122,11 +11108,6 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
-#| msgid ""
-#| "The dist-upgrade command can be replaced with any-other standard APT "
-#| "commands, particularly dselect-upgrade. You can even use an APT front end "
-#| "such as <em>dselect</em> However this presents a problem in communicating "
-#| "your selections back to the local computer."
msgid ""
"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
@@ -11307,6 +11288,17 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
+#~ msgid ""
+#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
+#~ "is optional. If omitted, APT assigns a priority of 1 less than the last "
+#~ "value specified on a line beginning with <literal>Pin-Priority: "
+#~ "release ...</literal>."
+#~ msgstr ""
+#~ "La ligne <literal>Pin-Priority:</literal> d'une entrée est facultative. "
+#~ "Si elle n'existe pas, APT affecte une priorité inférieure de 1 à la "
+#~ "valeur spécifiée sur une ligne commençant par <literal>Pin-Priority: "
+#~ "release ...</literal>."
+
#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
diff --git a/doc/po/it.po b/doc/po/it.po
index 6f0444547..f2fc4348c 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-03-19 11:14+0100\n"
+"POT-Creation-Date: 2010-05-04 13:41+0300\n"
"PO-Revision-Date: 2003-04-26 23:26+0100\n"
"Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
"Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -587,7 +587,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:268
+#: apt.ent:270
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -595,14 +595,16 @@ msgid ""
" <term><option>--config-file</option></term>\n"
" <listitem><para>Configuration File; Specify a configuration file to use. \n"
" The program will read the default configuration file and then this \n"
-" configuration file. See &apt-conf; for syntax information. \n"
+" configuration file. If configuration settings need to be set before the\n"
+" default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
msgstr ""
#. type: Plain text
-#: apt.ent:280
+#: apt.ent:282
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -619,7 +621,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:291
+#: apt.ent:293
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -635,7 +637,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:297
+#: apt.ent:299
#, no-wrap
msgid ""
"<!ENTITY file-aptconf \"\n"
@@ -646,7 +648,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:303
+#: apt.ent:305
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -657,7 +659,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:309
+#: apt.ent:311
#, no-wrap
msgid ""
"<!ENTITY file-cachearchives \"\n"
@@ -668,7 +670,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:315
+#: apt.ent:317
#, no-wrap
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -679,7 +681,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:325
+#: apt.ent:327
#, no-wrap
msgid ""
"<!ENTITY file-preferences \"\n"
@@ -694,7 +696,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:331
+#: apt.ent:333
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -705,7 +707,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:337
+#: apt.ent:339
#, no-wrap
msgid ""
"<!ENTITY file-sourceslist \"\n"
@@ -716,7 +718,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:343
+#: apt.ent:345
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -727,7 +729,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:350
+#: apt.ent:352
#, no-wrap
msgid ""
"<!ENTITY file-statelists \"\n"
@@ -739,7 +741,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:356
+#: apt.ent:358
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -750,7 +752,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:362
+#: apt.ent:364
#, no-wrap
msgid ""
"<!ENTITY file-trustedgpg \"\n"
@@ -761,7 +763,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:369
+#: apt.ent:371
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -773,7 +775,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:373
+#: apt.ent:375
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -782,7 +784,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:382
+#: apt.ent:384
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -796,7 +798,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:392
+#: apt.ent:394
#, no-wrap
msgid ""
"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1264,7 +1266,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:518 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1288,7 +1290,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr ""
@@ -1309,12 +1311,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr ""
@@ -1363,7 +1365,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
msgid "<option>-a</option>"
msgstr ""
@@ -1459,14 +1461,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:636
msgid "Files"
msgstr ""
@@ -1477,9 +1479,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:617 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:643
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1491,7 +1493,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1596,7 +1598,7 @@ msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr ""
@@ -1791,7 +1793,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -2217,36 +2219,60 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:228
-msgid "DeLinkLimit"
+msgid "Translation::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:230
msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:234
+msgid "DeLinkLimit"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:236
+msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
"Links</literal> setting."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:241
msgid "FileMode"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:243
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+msgid "LongDescription"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:256
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:258
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2254,12 +2280,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:263
msgid "MaxContentsChange"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:265
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -2267,12 +2293,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:270
msgid "ContentsAge"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:272
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2283,60 +2309,73 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:281
msgid "Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:287
msgid "SrcDirectory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
msgid "Packages"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
msgid "Sources"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:301
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:305
+msgid "Translation"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:307
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
+"$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:312
msgid "InternalPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:314
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2344,12 +2383,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
msgid "Contents"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:321
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2358,34 +2397,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:328
msgid "Contents::Header"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:311
+#: apt-ftparchive.1.xml:330
msgid "Sets header file to prepend to the contents output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
msgid "BinCacheDB"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
+#: apt-ftparchive.1.xml:335
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:339
msgid "FileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:322
+#: apt-ftparchive.1.xml:341
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2393,12 +2432,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:346
msgid "SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:348
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2407,12 +2446,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:356
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:358
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -2422,7 +2461,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:363
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2431,7 +2470,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
+#: apt-ftparchive.1.xml:368
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -2439,7 +2478,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:374
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -2449,7 +2488,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:352
+#: apt-ftparchive.1.xml:371
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2457,12 +2496,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:380
msgid "Sections"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:382
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -2470,12 +2509,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:387
msgid "Architectures"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:389
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -2483,56 +2522,56 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
msgid "BinOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:402
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
msgid "SrcOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:383
+#: apt-ftparchive.1.xml:408
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
msgid "ExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
+#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
msgid "SrcExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
+#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:424
msgid "BinDirectory Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:426
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -2542,64 +2581,64 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:434
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:439
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:420
+#: apt-ftparchive.1.xml:445
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:425
+#: apt-ftparchive.1.xml:450
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:430
+#: apt-ftparchive.1.xml:455
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:470
msgid "Sets the cache DB."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:473
msgid "PathPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:475
msgid "Appends a path to all the output paths."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:478
msgid "FileList, SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:480
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:487
msgid "The Binary Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:488
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -2609,19 +2648,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:494
#, no-wrap
msgid "old [// oldn]* => new"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:471
+#: apt-ftparchive.1.xml:496
#, no-wrap
msgid "new"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:493
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -2632,12 +2671,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:504
msgid "The Source Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:506
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -2645,12 +2684,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:511
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:513
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -2658,12 +2697,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:522
msgid "<option>--md5</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:524
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -2671,19 +2710,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:529
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:531
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:537
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 "
@@ -2692,12 +2731,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:543
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:545
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2706,12 +2745,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:551
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:528
+#: apt-ftparchive.1.xml:553
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2721,12 +2760,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:561
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:563
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2734,24 +2773,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:567
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:569
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:573
msgid "<option>--arch</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:574
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2760,12 +2799,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:580
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:582
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -2779,41 +2818,41 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:592
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:594
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with <command>apt-"
-"ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
+#: apt-ftparchive.1.xml:606 apt.conf.5.xml:1029 apt_preferences.5.xml:483
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:612
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:608
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:597
+#: apt-ftparchive.1.xml:622
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -6164,15 +6203,33 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:198
msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"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 "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:202
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:206
+msgid ""
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file. What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -6180,7 +6237,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:215
#, no-wrap
msgid ""
"Package: *\n"
@@ -6189,7 +6246,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:220
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -6197,7 +6254,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:217
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -6206,7 +6263,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:229
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6214,7 +6271,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:234
#, no-wrap
msgid ""
"Package: *\n"
@@ -6223,82 +6280,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:245
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:254
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:251
+#: apt_preferences.5.xml:258
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed 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:257
+#: apt_preferences.5.xml:264
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:265
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:263
+#: apt_preferences.5.xml:270
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:271
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:269
+#: apt_preferences.5.xml:276
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:277
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:274
+#: apt_preferences.5.xml:281
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:282
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:248
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6306,7 +6363,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:280
+#: apt_preferences.5.xml:287
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6315,14 +6372,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:286
+#: apt_preferences.5.xml:293
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:290
+#: apt_preferences.5.xml:297
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6339,12 +6396,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:310
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:312
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 "
@@ -6354,7 +6411,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:317
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6362,7 +6419,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:321
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</"
@@ -6371,12 +6428,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:324
+#: apt_preferences.5.xml:331
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:333
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6384,27 +6441,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:345
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:346
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:350
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6417,12 +6474,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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:360
+#: apt_preferences.5.xml:367
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6433,18 +6490,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:377
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:383
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:384
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6454,13 +6511,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:386
+#: apt_preferences.5.xml:393
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6470,7 +6527,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:409
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6479,12 +6536,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:418
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:412
+#: apt_preferences.5.xml:419
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6495,18 +6552,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:428
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:434
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:435
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6515,18 +6572,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:441
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:440
+#: apt_preferences.5.xml:447
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:448
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6535,13 +6592,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:454
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6554,7 +6611,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:461
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6569,34 +6626,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:474
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:469
+#: apt_preferences.5.xml:476
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
"provides a place for comments."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional. If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:485
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:490
+#: apt_preferences.5.xml:493
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6611,7 +6659,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:487
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 "
@@ -6621,8 +6669,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
-#: apt_preferences.5.xml:611
+#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
+#: apt_preferences.5.xml:614
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6631,7 +6679,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:505
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 "
@@ -6640,13 +6688,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:522
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:513
+#: apt_preferences.5.xml:516
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 +6703,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:528
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:537
#, no-wrap
msgid ""
"Package: *\n"
@@ -6677,7 +6725,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:527
+#: apt_preferences.5.xml:530
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6688,7 +6736,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:551
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 "
@@ -6697,13 +6745,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568
+#: apt_preferences.5.xml:571
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:562
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6715,12 +6763,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:578
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:592
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6731,7 +6779,7 @@ msgid ""
"\n"
"Explanation: Debian unstable is always codenamed with sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -6740,7 +6788,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:580
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 "
@@ -6755,7 +6803,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:609
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 "
@@ -6764,13 +6812,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:629
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:620
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6782,12 +6830,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:638
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:644
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index ca89e5aa8..104721bb7 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-19 11:14+0100\n"
+"POT-Creation-Date: 2010-05-04 13:41+0300\n"
"PO-Revision-Date: 2009-07-30 22:55+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -873,15 +873,27 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:268
-#, no-wrap
+#: apt.ent:270
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry>\n"
+#| " <term><option>-c</option></term>\n"
+#| " <term><option>--config-file</option></term>\n"
+#| " <listitem><para>Configuration File; Specify a configuration file to use. \n"
+#| " The program will read the default configuration file and then this \n"
+#| " configuration file. See &apt-conf; for syntax information. \n"
+#| " </para>\n"
+#| " </listitem>\n"
+#| " </varlistentry>\n"
msgid ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
" <listitem><para>Configuration File; Specify a configuration file to use. \n"
" The program will read the default configuration file and then this \n"
-" configuration file. See &apt-conf; for syntax information. \n"
+" configuration file. If configuration settings need to be set before the\n"
+" default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
@@ -897,7 +909,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:280
+#: apt.ent:282
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -924,7 +936,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:291
+#: apt.ent:293
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -950,7 +962,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:297
+#: apt.ent:299
#, no-wrap
msgid ""
"<!ENTITY file-aptconf \"\n"
@@ -961,7 +973,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:303
+#: apt.ent:305
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -972,7 +984,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:309
+#: apt.ent:311
#, no-wrap
msgid ""
"<!ENTITY file-cachearchives \"\n"
@@ -984,7 +996,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
-#: apt.ent:315
+#: apt.ent:317
#, fuzzy, no-wrap
#| msgid "Storage area for package files in transit. Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial)."
msgid ""
@@ -997,7 +1009,7 @@ msgstr "取得中パッケージファイル格納エリア。設定項目 - <li
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
-#: apt.ent:325
+#: apt.ent:327
#, fuzzy, no-wrap
#| msgid "Version preferences file. This is where you would specify \"pinning\", i.e. a preference to get certain packages from a separate source or from a different version of a distribution. Configuration Item: <literal>Dir::Etc::Preferences</literal>."
msgid ""
@@ -1013,7 +1025,7 @@ msgid ""
msgstr "バージョン優先ファイル。ここに \"pin\" の設定を行います。つまり、別々の取得元や異なるディストリビューションのバージョンの、どこからパッケージを取得するかを設定します。設定項目 - <literal>Dir::Etc::Preferences</literal>"
#. type: Plain text
-#: apt.ent:331
+#: apt.ent:333
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1024,7 +1036,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:337
+#: apt.ent:339
#, no-wrap
msgid ""
"<!ENTITY file-sourceslist \"\n"
@@ -1035,7 +1047,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:343
+#: apt.ent:345
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1047,7 +1059,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
-#: apt.ent:350
+#: apt.ent:352
#, fuzzy, no-wrap
#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
msgid ""
@@ -1061,7 +1073,7 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
-#: apt.ent:356
+#: apt.ent:358
#, fuzzy, no-wrap
#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
msgid ""
@@ -1074,7 +1086,7 @@ msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::Stat
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
-#: apt.ent:362
+#: apt.ent:364
#, fuzzy, no-wrap
#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
msgid ""
@@ -1087,7 +1099,7 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
-#: apt.ent:369
+#: apt.ent:371
#, fuzzy, no-wrap
#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
msgid ""
@@ -1100,7 +1112,7 @@ msgid ""
msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)"
#. type: Plain text
-#: apt.ent:373
+#: apt.ent:375
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1109,7 +1121,7 @@ msgid ""
msgstr "<!ENTITY translation-title \"訳者\">\n"
#. type: Plain text
-#: apt.ent:382
+#: apt.ent:384
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1127,7 +1139,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:392
+#: apt.ent:394
#, no-wrap
msgid ""
"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1793,7 +1805,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:518 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "オプション"
@@ -1821,7 +1833,7 @@ msgstr ""
"pkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1848,12 +1860,12 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1914,7 +1926,7 @@ msgstr ""
"ShowFull</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -2036,7 +2048,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
@@ -2044,7 +2056,7 @@ msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:636
msgid "Files"
msgstr "ファイル"
@@ -2056,9 +2068,9 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:617 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:643
#: sources.list.5.xml:233
msgid "See Also"
msgstr "関連項目"
@@ -2072,7 +2084,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "診断メッセージ"
@@ -2222,7 +2234,7 @@ msgid "Options"
msgstr "オプション"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2480,7 +2492,7 @@ msgstr "設定箇所の内容を表示するだけです。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -3099,12 +3111,33 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:228
+#, fuzzy
+#| msgid "Contents::Compress"
+msgid "Translation::Compress"
+msgstr "Contents::Compress"
+
+# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:230
+#, fuzzy
+#| msgid ""
+#| "This is similar to <literal>Packages::Compress</literal> except that it "
+#| "controls the compression for the Contents files."
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+"<literal>Packages::Compress</literal> と同様に、Contents ファイルの圧縮方法を"
+"指定します。"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:234
msgid "DeLinkLimit"
msgstr "DeLinkLimit"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:236
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -3116,13 +3149,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:241
msgid "FileMode"
msgstr "FileMode"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:243
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
@@ -3130,15 +3163,30 @@ msgstr ""
"作成したインデックスファイルのモードを指定します。デフォルトは 0644 です。全"
"インデックスファイルは、umask を無視してこのモードを使用します。"
+# type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#, fuzzy
+#| msgid "Description"
+msgid "LongDescription"
+msgstr "説明"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:256
msgid "TreeDefault Section"
msgstr "TreeDefault セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:258
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -3149,13 +3197,13 @@ msgstr ""
"に展開します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:263
msgid "MaxContentsChange"
msgstr "MaxContentsChange"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:265
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -3166,13 +3214,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:270
msgid "ContentsAge"
msgstr "ContentsAge"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:272
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3189,13 +3237,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:281
msgid "Directory"
msgstr "Directory"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3205,13 +3253,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:287
msgid "SrcDirectory"
msgstr "SrcDirectory"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
@@ -3221,13 +3269,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
msgid "Packages"
msgstr "Packages"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
@@ -3237,13 +3285,13 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
msgid "Sources"
msgstr "Sources"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:301
#, fuzzy
#| msgid ""
#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
@@ -3255,14 +3303,29 @@ msgstr ""
"Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
"$(SECTION)/source/Sources</filename> です。"
+# type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:305
+#, fuzzy
+msgid "Translation"
+msgstr "オプション"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:307
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
+"$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:312
msgid "InternalPrefix"
msgstr "InternalPrefix"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:314
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3273,13 +3336,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
msgid "Contents"
msgstr "Contents"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:321
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3292,24 +3355,24 @@ msgstr ""
"ftparchive</command> は自動でパッケージファイルをまとめます。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:328
msgid "Contents::Header"
msgstr "Contents::Header"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:311
+#: apt-ftparchive.1.xml:330
msgid "Sets header file to prepend to the contents output."
msgstr "contents の出力に付けるヘッダファイルを設定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
msgid "BinCacheDB"
msgstr "BinCacheDB"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
+#: apt-ftparchive.1.xml:335
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
@@ -3319,13 +3382,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:339
msgid "FileList"
msgstr "FileList"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:322
+#: apt-ftparchive.1.xml:341
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3337,13 +3400,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:346
msgid "SourceFileList"
msgstr "SourceFileList"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:348
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3356,13 +3419,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:356
msgid "Tree Section"
msgstr "Tree セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:358
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3377,7 +3440,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:363
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3391,7 +3454,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
+#: apt-ftparchive.1.xml:368
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3402,7 +3465,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:374
#, fuzzy, no-wrap
#| msgid ""
#| "for i in Sections do \n"
@@ -3420,7 +3483,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><informalexample>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:352
+#: apt-ftparchive.1.xml:371
#, fuzzy
#| msgid ""
#| "When processing a <literal>Tree</literal> section <command>apt-"
@@ -3435,13 +3498,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:380
msgid "Sections"
msgstr "Sections"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:382
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3452,13 +3515,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:387
msgid "Architectures"
msgstr "Architectures"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:389
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3470,13 +3533,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
msgid "BinOverride"
msgstr "BinOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:402
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
@@ -3486,13 +3549,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
msgid "SrcOverride"
msgstr "SrcOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:383
+#: apt-ftparchive.1.xml:408
msgid ""
"Sets the source override file. The override file contains section "
"information."
@@ -3502,37 +3565,37 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
msgid "ExtraOverride"
msgstr "ExtraOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
+#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
msgid "Sets the binary extra override file."
msgstr "バイナリ特別オーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
+#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
msgid "Sets the source extra override file."
msgstr "ソース特別オーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:424
msgid "BinDirectory Section"
msgstr "BinDirectory セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:426
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3547,13 +3610,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:434
msgid "Sets the Packages file output."
msgstr "Packages ファイルの出力先を設定します。"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:439
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
@@ -3563,59 +3626,59 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:420
+#: apt-ftparchive.1.xml:445
msgid "Sets the Contents file output. (optional)"
msgstr "Contents ファイルの出力先を設定します。(オプション)"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:425
+#: apt-ftparchive.1.xml:450
msgid "Sets the binary override file."
msgstr "バイナリオーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:430
+#: apt-ftparchive.1.xml:455
msgid "Sets the source override file."
msgstr "ソースオーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:470
msgid "Sets the cache DB."
msgstr "キャッシュ DB を設定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:473
msgid "PathPrefix"
msgstr "PathPrefix"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:475
msgid "Appends a path to all the output paths."
msgstr "全出力パスに付加するパス。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:478
msgid "FileList, SourceFileList"
msgstr "FileList, SourceFileList"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:480
msgid "Specifies the file list file."
msgstr "ファイル一覧ファイルを指定します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:487
msgid "The Binary Override File"
msgstr "バイナリオーバーライドファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:488
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3630,20 +3693,20 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:494
#, no-wrap
msgid "old [// oldn]* => new"
msgstr "old [// oldn]* => new"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:471
+#: apt-ftparchive.1.xml:496
#, no-wrap
msgid "new"
msgstr "new"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:493
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3661,13 +3724,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:504
msgid "The Source Override File"
msgstr "ソースオーバーライドファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:506
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3679,13 +3742,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:511
msgid "The Extra Override File"
msgstr "特別オーバーライドファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:513
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3695,13 +3758,13 @@ msgstr ""
"す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:522
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:524
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3712,13 +3775,13 @@ msgstr ""
"FTPArchive::MD5</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:529
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:531
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3728,7 +3791,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:537
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 "
@@ -3741,13 +3804,13 @@ msgstr ""
"<literal>quiet</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:543
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:545
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3760,13 +3823,13 @@ msgstr ""
"<literal>APT::FTPArchive::DeLinkAct</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:551
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:528
+#: apt-ftparchive.1.xml:553
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3781,13 +3844,13 @@ msgstr ""
"<literal>APT::FTPArchive::Contents</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:561
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:563
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3797,13 +3860,13 @@ msgstr ""
"選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:567
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:569
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3812,7 +3875,7 @@ msgstr ""
"FTPArchive::ReadOnlyDB</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:573
#, fuzzy
#| msgid "<option>-a</option>"
msgid "<option>--arch</option>"
@@ -3820,7 +3883,7 @@ msgstr "<option>-a</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:574
#, fuzzy
#| msgid ""
#| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3839,14 +3902,14 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:580
#, fuzzy
#| msgid "<option>--version</option>"
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:582
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3860,39 +3923,39 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:592
#, fuzzy
#| msgid "<option>--version</option>"
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:594
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with <command>apt-"
-"ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
+#: apt-ftparchive.1.xml:606 apt.conf.5.xml:1029 apt_preferences.5.xml:483
#: sources.list.5.xml:193
msgid "Examples"
msgstr "サンプル"
# type: Content of: <refentry><refsect1><para><programlisting>
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:612
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:608
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3902,7 +3965,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:597
+#: apt-ftparchive.1.xml:622
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -8417,15 +8480,48 @@ msgstr ""
"Pin: origin \"\"\n"
"Pin-Priority: 999\n"
-# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:198
msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"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 "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:202
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: origin \"\"\n"
+#| "Pin-Priority: 999\n"
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
+msgstr ""
+"Package: *\n"
+"Pin: origin \"\"\n"
+"Pin-Priority: 999\n"
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:206
+#, fuzzy
+#| msgid ""
+#| "A note of caution: the keyword used here is \"<literal>origin</literal>"
+#| "\". This should not be confused with the Origin of a distribution as "
+#| "specified in a <filename>Release</filename> file. What follows the "
+#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
+#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
+msgid ""
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file. What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."
msgstr ""
"注意: ここで使用しているキーワードは \"<literal>origin</literal>\" です。"
"<filename>Release</filename> ファイルに指定されたような、ディストリビューショ"
@@ -8435,7 +8531,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8446,7 +8542,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:215
#, no-wrap
msgid ""
"Package: *\n"
@@ -8459,7 +8555,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:220
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8470,7 +8566,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:217
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -8483,7 +8579,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:229
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8495,7 +8591,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:234
#, no-wrap
msgid ""
"Package: *\n"
@@ -8508,18 +8604,18 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:245
msgid "How APT Interprets Priorities"
msgstr "APT が優先度に割り込む方法"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:254
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8527,13 +8623,13 @@ msgstr ""
"パッケージがダウングレードしても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8542,13 +8638,13 @@ msgstr ""
"含まれなくても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:265
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"
@@ -8557,13 +8653,13 @@ msgstr ""
"ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:270
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:271
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"
@@ -8573,13 +8669,13 @@ msgstr ""
"ル"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:276
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8588,19 +8684,19 @@ msgstr ""
"ンストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:274
+#: apt_preferences.5.xml:281
msgid "P &lt; 0"
msgstr "P &lt; 0"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:282
msgid "prevents the version from being installed"
msgstr "このバージョンのインストール禁止"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:248
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8612,7 +8708,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:280
+#: apt_preferences.5.xml:287
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8626,7 +8722,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:286
+#: apt_preferences.5.xml:293
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8636,7 +8732,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:297
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8665,13 +8761,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:310
msgid "Then:"
msgstr "すると、以下のように動作します。"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:312
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 "
@@ -8686,7 +8782,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:317
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8698,7 +8794,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:321
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</"
@@ -8712,13 +8808,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:324
+#: apt_preferences.5.xml:331
msgid "Determination of Package Version and Distribution Properties"
msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:333
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8729,30 +8825,30 @@ msgstr ""
"filename> ファイルを提供します。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:345
msgid "the <literal>Package:</literal> line"
msgstr "<literal>Package:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:346
msgid "gives the package name"
msgstr "パッケージ名"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
msgid "the <literal>Version:</literal> line"
msgstr "<literal>Version:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:350
msgid "gives the version number for the named package"
msgstr "その名前のパッケージのバージョン番号"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8772,13 +8868,13 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:360
+#: apt_preferences.5.xml:367
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -8796,19 +8892,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:377
#, 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:376
+#: apt_preferences.5.xml:383
msgid "the <literal>Codename:</literal> line"
msgstr "<literal>Codename:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:384
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -8825,14 +8921,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:386
+#: apt_preferences.5.xml:393
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8848,7 +8944,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:409
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8860,13 +8956,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:418
msgid "the <literal>Component:</literal> line"
msgstr "<literal>Component:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:412
+#: apt_preferences.5.xml:419
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8884,19 +8980,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:428
#, 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:427
+#: apt_preferences.5.xml:434
msgid "the <literal>Origin:</literal> line"
msgstr "<literal>Origin:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:435
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8909,19 +9005,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:441
#, 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:440
+#: apt_preferences.5.xml:447
msgid "the <literal>Label:</literal> line"
msgstr "<literal>Label:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:448
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8934,14 +9030,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:454
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:355
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -8963,7 +9059,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:461
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8989,13 +9085,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:474
msgid "Optional Lines in an APT Preferences Record"
msgstr "APT 設定レコードのオプション行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:469
+#: apt_preferences.5.xml:476
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -9004,29 +9100,15 @@ msgstr ""
"APT 設定ファイルのレコードごとに、任意で <literal>Explanation:</literal> で始"
"まる行を持てます。これは、コメント用の場所を確保します。"
-# type: Content of: <refentry><refsect1><refsect2><para>
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
-#, fuzzy
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional. If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-"APT 設定レコードの <literal>Pin-Priority:</literal> 行は任意です。省略する"
-"と、<literal>Pin-Priority: release ...</literal> で始まる行で指示した最後の"
-"値 (少なくとも1つ) を優先度に割り当てます。"
-
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:485
msgid "Tracking Stable"
msgstr "安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:490
+#: apt_preferences.5.xml:493
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9051,7 +9133,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:487
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -9067,8 +9149,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
-#: apt_preferences.5.xml:611
+#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
+#: apt_preferences.5.xml:614
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -9081,7 +9163,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:505
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -9094,14 +9176,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:522
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:513
+#: apt_preferences.5.xml:516
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9115,13 +9197,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:528
msgid "Tracking Testing or Unstable"
msgstr "テスト版や不安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:537
#, no-wrap
msgid ""
"Package: *\n"
@@ -9150,7 +9232,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:527
+#: apt_preferences.5.xml:530
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -9168,7 +9250,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:551
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -9181,14 +9263,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568
+#: apt_preferences.5.xml:571
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:562
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9207,14 +9289,29 @@ msgstr ""
"の最新版にアップグレードします。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:578
msgid "Tracking the evolution of a codename release"
msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
-#, no-wrap
+#: apt_preferences.5.xml:592
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
+#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
+#| "\n"
+#| "Explanation: Debian unstable is always codenamed with sid\n"
+#| "Package: *\n"
+#| "Pin: release a=sid\n"
+#| "Pin-Priority: 800\n"
+#| "\n"
+#| "Package: *\n"
+#| "Pin: release o=Debian\n"
+#| "Pin-Priority: -10\n"
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
@@ -9224,7 +9321,7 @@ msgid ""
"\n"
"Explanation: Debian unstable is always codenamed with sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -9247,7 +9344,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:580
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 "
@@ -9263,7 +9360,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:609
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -9276,14 +9373,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:629
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:620
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9303,7 +9400,7 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:638
#, fuzzy
#| msgid "apt_preferences"
msgid "&file-preferences;"
@@ -9311,7 +9408,7 @@ msgstr "apt_preferences"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:644
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -11000,6 +11097,18 @@ msgstr ""
msgid "Which will use the already fetched archives on the disc."
msgstr ""
+# type: Content of: <refentry><refsect1><refsect2><para>
+#, fuzzy
+#~ msgid ""
+#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
+#~ "is optional. If omitted, APT assigns a priority of 1 less than the last "
+#~ "value specified on a line beginning with <literal>Pin-Priority: "
+#~ "release ...</literal>."
+#~ msgstr ""
+#~ "APT 設定レコードの <literal>Pin-Priority:</literal> 行は任意です。省略する"
+#~ "と、<literal>Pin-Priority: release ...</literal> で始まる行で指示した最後"
+#~ "の値 (少なくとも1つ) を優先度に割り当てます。"
+
# type: Content of: <refentry><refsect1><para>
#~ msgid ""
#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 577a002a0..298768fee 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2010-03-19 11:14+0100\n"
+"POT-Creation-Date: 2010-05-04 13:41+0300\n"
"PO-Revision-Date: 2010-03-18 22:00+0100\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -821,15 +821,27 @@ msgstr ""
#
#. type: Plain text
-#: apt.ent:268
-#, no-wrap
+#: apt.ent:270
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry>\n"
+#| " <term><option>-c</option></term>\n"
+#| " <term><option>--config-file</option></term>\n"
+#| " <listitem><para>Configuration File; Specify a configuration file to use. \n"
+#| " The program will read the default configuration file and then this \n"
+#| " configuration file. See &apt-conf; for syntax information. \n"
+#| " </para>\n"
+#| " </listitem>\n"
+#| " </varlistentry>\n"
msgid ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
" <listitem><para>Configuration File; Specify a configuration file to use. \n"
" The program will read the default configuration file and then this \n"
-" configuration file. See &apt-conf; for syntax information. \n"
+" configuration file. If configuration settings need to be set before the\n"
+" default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
@@ -845,7 +857,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:280
+#: apt.ent:282
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -874,7 +886,7 @@ msgstr ""
#
#. type: Plain text
-#: apt.ent:291
+#: apt.ent:293
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -900,7 +912,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:297
+#: apt.ent:299
#, no-wrap
msgid ""
"<!ENTITY file-aptconf \"\n"
@@ -916,7 +928,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:303
+#: apt.ent:305
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -932,7 +944,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:309
+#: apt.ent:311
#, no-wrap
msgid ""
"<!ENTITY file-cachearchives \"\n"
@@ -948,7 +960,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:315
+#: apt.ent:317
#, no-wrap
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -965,7 +977,7 @@ msgstr ""
#
#. type: Plain text
-#: apt.ent:325
+#: apt.ent:327
#, no-wrap
msgid ""
"<!ENTITY file-preferences \"\n"
@@ -989,7 +1001,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:331
+#: apt.ent:333
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1005,7 +1017,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:337
+#: apt.ent:339
#, no-wrap
msgid ""
"<!ENTITY file-sourceslist \"\n"
@@ -1021,7 +1033,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:343
+#: apt.ent:345
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1037,7 +1049,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:350
+#: apt.ent:352
#, no-wrap
msgid ""
"<!ENTITY file-statelists \"\n"
@@ -1055,7 +1067,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:356
+#: apt.ent:358
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1071,7 +1083,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:362
+#: apt.ent:364
#, no-wrap
msgid ""
"<!ENTITY file-trustedgpg \"\n"
@@ -1087,7 +1099,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:369
+#: apt.ent:371
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -1105,7 +1117,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:373
+#: apt.ent:375
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1114,7 +1126,7 @@ msgid ""
msgstr "<!ENTITY translation-title \"TŁUMACZENIE\">\n"
#. type: Plain text
-#: apt.ent:382
+#: apt.ent:384
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1132,7 +1144,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:392
+#: apt.ent:394
#, no-wrap
msgid ""
"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1800,7 +1812,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:518 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "opcje"
@@ -1828,7 +1840,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1856,12 +1868,12 @@ msgstr ""
"Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1923,7 +1935,7 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -2049,14 +2061,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:636
msgid "Files"
msgstr "Pliki"
@@ -2067,9 +2079,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:617 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:643
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Zobacz także"
@@ -2082,7 +2094,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnostyka"
@@ -2231,7 +2243,7 @@ msgid "Options"
msgstr "Opcje"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2483,7 +2495,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Wyświetla zawartość przestrzeni konfiguracji."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2974,11 +2986,25 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:228
+#, fuzzy
+#| msgid "Packages::Compress"
+msgid "Translation::Compress"
+msgstr "Packages::Compress"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:230
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:234
msgid "DeLinkLimit"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:236
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -2986,24 +3012,38 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:241
msgid "FileMode"
msgstr "FileMode"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:243
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#, fuzzy
+#| msgid "Description"
+msgid "LongDescription"
+msgstr "Opis"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:256
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:258
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -3011,12 +3051,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:263
msgid "MaxContentsChange"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:265
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -3024,12 +3064,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:270
msgid "ContentsAge"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:272
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3040,60 +3080,75 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:281
msgid "Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:287
msgid "SrcDirectory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
msgid "Packages"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
msgid "Sources"
msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:301
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:305
+#, fuzzy
+#| msgid "Operation"
+msgid "Translation"
+msgstr "Kolejne kroki"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:307
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
+"$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:312
msgid "InternalPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:314
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3101,12 +3156,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
msgid "Contents"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:321
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3115,34 +3170,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:328
msgid "Contents::Header"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:311
+#: apt-ftparchive.1.xml:330
msgid "Sets header file to prepend to the contents output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
msgid "BinCacheDB"
msgstr "BinCacheDB"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
+#: apt-ftparchive.1.xml:335
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:339
msgid "FileList"
msgstr "FileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:322
+#: apt-ftparchive.1.xml:341
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3150,12 +3205,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:346
msgid "SourceFileList"
msgstr "SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:348
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3164,12 +3219,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:356
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:358
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3179,7 +3234,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:363
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3188,7 +3243,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
+#: apt-ftparchive.1.xml:368
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3196,7 +3251,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:374
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -3210,7 +3265,7 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:352
+#: apt-ftparchive.1.xml:371
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -3218,12 +3273,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:380
msgid "Sections"
msgstr "Sections"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:382
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3231,12 +3286,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:387
msgid "Architectures"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:389
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3244,57 +3299,57 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
#, fuzzy
msgid "BinOverride"
msgstr "BinOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:402
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
msgid "SrcOverride"
msgstr "SrcOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:383
+#: apt-ftparchive.1.xml:408
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
msgid "ExtraOverride"
msgstr "ExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
+#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
+#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:424
msgid "BinDirectory Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:426
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3304,65 +3359,65 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:434
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:439
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:420
+#: apt-ftparchive.1.xml:445
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:425
+#: apt-ftparchive.1.xml:450
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:430
+#: apt-ftparchive.1.xml:455
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:470
msgid "Sets the cache DB."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:473
msgid "PathPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:475
msgid "Appends a path to all the output paths."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:478
msgid "FileList, SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:480
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:487
#, fuzzy
msgid "The Binary Override File"
msgstr "Wprowadzenie"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:488
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3372,19 +3427,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:494
#, no-wrap
msgid "old [// oldn]* => new"
msgstr "old [// oldn]* => new"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:471
+#: apt-ftparchive.1.xml:496
#, no-wrap
msgid "new"
msgstr "new"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:493
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3395,13 +3450,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:504
#, fuzzy
msgid "The Source Override File"
msgstr "Wprowadzenie"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:506
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3409,12 +3464,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:511
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:513
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3422,12 +3477,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:522
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:524
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3435,13 +3490,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:529
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:531
#, fuzzy
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
@@ -3452,7 +3507,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:537
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 "
@@ -3466,13 +3521,13 @@ msgstr ""
"pliku konfiguracyjnym: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:543
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:545
#, fuzzy
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@ -3486,12 +3541,12 @@ msgstr ""
"<literal>APT::Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:551
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:528
+#: apt-ftparchive.1.xml:553
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3501,13 +3556,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:561
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:563
#, fuzzy
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
@@ -3519,13 +3574,13 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:567
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:569
#, fuzzy
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
@@ -3535,14 +3590,14 @@ msgstr ""
"pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:573
#, fuzzy
#| msgid "<option>-a</option>"
msgid "<option>--arch</option>"
msgstr "<option>-a</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:574
#, fuzzy
#| msgid ""
#| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3562,13 +3617,13 @@ msgstr ""
"AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:580
#, fuzzy
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:582
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3582,35 +3637,35 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:592
#, fuzzy
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:594
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with <command>apt-"
-"ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
+#: apt-ftparchive.1.xml:606 apt.conf.5.xml:1029 apt_preferences.5.xml:483
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Przykłady"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:612
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:608
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3618,7 +3673,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:597
+#: apt-ftparchive.1.xml:622
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -7467,15 +7522,40 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:198
msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"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 "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:202
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: origin \"\"\n"
+#| "Pin-Priority: 999\n"
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
msgstr ""
+"Package: *\n"
+"Pin: origin \"\"\n"
+"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:206
+msgid ""
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file. What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -7483,7 +7563,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:215
#, no-wrap
msgid ""
"Package: *\n"
@@ -7495,7 +7575,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:220
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -7503,7 +7583,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:217
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -7515,7 +7595,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:229
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -7523,7 +7603,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:234
#, no-wrap
msgid ""
"Package: *\n"
@@ -7535,17 +7615,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:245
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:254
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -7555,12 +7635,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
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:252
+#: apt_preferences.5.xml:259
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -7570,12 +7650,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
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:258
+#: apt_preferences.5.xml:265
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7585,12 +7665,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:270
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:264
+#: apt_preferences.5.xml:271
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7600,12 +7680,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:276
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:270
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -7614,17 +7694,17 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:274
+#: apt_preferences.5.xml:281
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:282
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:248
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -7632,7 +7712,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:280
+#: apt_preferences.5.xml:287
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -7641,14 +7721,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:286
+#: apt_preferences.5.xml:293
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:290
+#: apt_preferences.5.xml:297
#, no-wrap
msgid ""
"Package: perl\n"
@@ -7676,12 +7756,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:310
msgid "Then:"
msgstr "Wtedy:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:312
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 "
@@ -7691,7 +7771,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:317
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -7699,7 +7779,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:321
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</"
@@ -7708,12 +7788,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:324
+#: apt_preferences.5.xml:331
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:333
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -7721,27 +7801,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:345
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:339
+#: apt_preferences.5.xml:346
msgid "gives the package name"
msgstr "podaje nazwę pakietu"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
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:343
+#: apt_preferences.5.xml:350
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:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -7754,12 +7834,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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:360
+#: apt_preferences.5.xml:367
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -7770,18 +7850,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:377
#, 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:376
+#: apt_preferences.5.xml:383
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:377
+#: apt_preferences.5.xml:384
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -7791,13 +7871,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:386
+#: apt_preferences.5.xml:393
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -7807,7 +7887,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:409
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -7819,12 +7899,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:418
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:412
+#: apt_preferences.5.xml:419
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -7835,18 +7915,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:428
#, 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:427
+#: apt_preferences.5.xml:434
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:428
+#: apt_preferences.5.xml:435
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -7855,18 +7935,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:441
#, 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:440
+#: apt_preferences.5.xml:447
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:441
+#: apt_preferences.5.xml:448
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -7875,13 +7955,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:454
#, 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:348
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -7894,7 +7974,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:461
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -7909,34 +7989,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:474
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:469
+#: apt_preferences.5.xml:476
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
"provides a place for comments."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional. If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:485
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:490
+#: apt_preferences.5.xml:493
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7960,7 +8031,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:487
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 "
@@ -7970,8 +8041,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
-#: apt_preferences.5.xml:611
+#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
+#: apt_preferences.5.xml:614
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -7983,7 +8054,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:505
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 "
@@ -7992,13 +8063,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:522
#, 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:513
+#: apt_preferences.5.xml:516
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8007,12 +8078,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:528
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:537
#, no-wrap
msgid ""
"Package: *\n"
@@ -8040,7 +8111,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:527
+#: apt_preferences.5.xml:530
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8051,7 +8122,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:551
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 "
@@ -8060,13 +8131,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568
+#: apt_preferences.5.xml:571
#, 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:559
+#: apt_preferences.5.xml:562
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8078,12 +8149,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:578
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:592
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8094,7 +8165,7 @@ msgid ""
"\n"
"Explanation: Debian unstable is always codenamed with sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -8117,7 +8188,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:580
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 "
@@ -8132,7 +8203,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:609
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 "
@@ -8141,13 +8212,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:629
#, 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:617
+#: apt_preferences.5.xml:620
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -8159,12 +8230,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:638
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:644
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 5e52814ea..fabb6b865 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.7.26~exp3\n"
-"POT-Creation-Date: 2010-03-19 11:14+0100\n"
+"POT-Creation-Date: 2010-05-04 13:41+0300\n"
"PO-Revision-Date: 2010-03-19 00:21+0000\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -807,15 +807,27 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:268
-#, no-wrap
+#: apt.ent:270
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry>\n"
+#| " <term><option>-c</option></term>\n"
+#| " <term><option>--config-file</option></term>\n"
+#| " <listitem><para>Configuration File; Specify a configuration file to use. \n"
+#| " The program will read the default configuration file and then this \n"
+#| " configuration file. See &apt-conf; for syntax information. \n"
+#| " </para>\n"
+#| " </listitem>\n"
+#| " </varlistentry>\n"
msgid ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
" <listitem><para>Configuration File; Specify a configuration file to use. \n"
" The program will read the default configuration file and then this \n"
-" configuration file. See &apt-conf; for syntax information. \n"
+" configuration file. If configuration settings need to be set before the\n"
+" default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
@@ -831,7 +843,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:280
+#: apt.ent:282
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -859,7 +871,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:291
+#: apt.ent:293
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -885,7 +897,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:297
+#: apt.ent:299
#, no-wrap
msgid ""
"<!ENTITY file-aptconf \"\n"
@@ -901,7 +913,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:303
+#: apt.ent:305
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -917,7 +929,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:309
+#: apt.ent:311
#, no-wrap
msgid ""
"<!ENTITY file-cachearchives \"\n"
@@ -933,7 +945,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:315
+#: apt.ent:317
#, no-wrap
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -949,7 +961,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:325
+#: apt.ent:327
#, no-wrap
msgid ""
"<!ENTITY file-preferences \"\n"
@@ -973,7 +985,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:331
+#: apt.ent:333
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -989,7 +1001,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:337
+#: apt.ent:339
#, no-wrap
msgid ""
"<!ENTITY file-sourceslist \"\n"
@@ -1005,7 +1017,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:343
+#: apt.ent:345
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1021,7 +1033,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:350
+#: apt.ent:352
#, no-wrap
msgid ""
"<!ENTITY file-statelists \"\n"
@@ -1039,7 +1051,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:356
+#: apt.ent:358
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1055,7 +1067,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:362
+#: apt.ent:364
#, no-wrap
msgid ""
"<!ENTITY file-trustedgpg \"\n"
@@ -1071,7 +1083,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:369
+#: apt.ent:371
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -1089,7 +1101,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:373
+#: apt.ent:375
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1098,7 +1110,7 @@ msgid ""
msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
#. type: Plain text
-#: apt.ent:382
+#: apt.ent:384
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1116,7 +1128,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:392
+#: apt.ent:394
#, no-wrap
msgid ""
"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1751,7 +1763,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:518 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "opções"
@@ -1778,7 +1790,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1804,12 +1816,12 @@ msgstr ""
"pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1868,7 +1880,7 @@ msgstr ""
"<literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1985,14 +1997,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:636
msgid "Files"
msgstr "Ficheiros"
@@ -2003,9 +2015,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:617 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:643
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Veja também"
@@ -2017,7 +2029,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnóstico"
@@ -2152,7 +2164,7 @@ msgid "Options"
msgstr "Opções"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -2394,7 +2406,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Apenas mostra o conteúdo do espaço de configuração."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2952,11 +2964,31 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:228
+#, fuzzy
+#| msgid "Contents::Compress"
+msgid "Translation::Compress"
+msgstr "Contents::Compress"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:230
+#, fuzzy
+#| msgid ""
+#| "This is similar to <literal>Packages::Compress</literal> except that it "
+#| "controls the compression for the Contents files."
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+"Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
+"controla a compressão para os ficheiros de Conteúdos."
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:234
msgid "DeLinkLimit"
msgstr "DeLinkLimit"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:236
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -2967,12 +2999,12 @@ msgstr ""
"Links</literal> por secção."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:241
msgid "FileMode"
msgstr "FileMode"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:243
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
@@ -2981,13 +3013,27 @@ msgstr ""
"0644. Todos os ficheiros índice são definidos para este modo "
"independentemente do umask."
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#, fuzzy
+#| msgid "Description"
+msgid "LongDescription"
+msgstr "Descrição"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:256
msgid "TreeDefault Section"
msgstr "Secção TreeDefault"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:258
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2998,12 +3044,12 @@ msgstr ""
"$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:263
msgid "MaxContentsChange"
msgstr "MaxContentsChange"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:265
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -3014,12 +3060,12 @@ msgstr ""
"alguns dias todos sejam reconstruídos."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:270
msgid "ContentsAge"
msgstr "ContentsAge"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:272
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3037,12 +3083,12 @@ msgstr ""
"modo. A predefinição é 10, as unidades são em dias."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:281
msgid "Directory"
msgstr "Directory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3051,12 +3097,12 @@ msgstr ""
"$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:287
msgid "SrcDirectory"
msgstr "SrcDirectory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
@@ -3065,12 +3111,12 @@ msgstr ""
"<filename>$(DIST)/$(SECTION)/source/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
msgid "Packages"
msgstr "Packages"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
@@ -3079,12 +3125,12 @@ msgstr ""
"$(SECTION)/binary-$(ARCH)/Packages</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
msgid "Sources"
msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:301
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
@@ -3093,12 +3139,27 @@ msgstr ""
"$(SECTION)/source/Sources</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:305
+#, fuzzy
+#| msgid "Operation"
+msgid "Translation"
+msgstr "Operação"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:307
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
+"$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:312
msgid "InternalPrefix"
msgstr "InternalPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:314
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3109,12 +3170,12 @@ msgstr ""
"$(SECTION)/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
msgid "Contents"
msgstr "Contents"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:321
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3128,22 +3189,22 @@ msgstr ""
"ficheiros pacotes todos juntos."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:328
msgid "Contents::Header"
msgstr "Contents::Header"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:311
+#: apt-ftparchive.1.xml:330
msgid "Sets header file to prepend to the contents output."
msgstr "Define o ficheiro cabeçalho para prefixar a saída de conteúdos."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
msgid "BinCacheDB"
msgstr "BinCacheDB"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
+#: apt-ftparchive.1.xml:335
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
@@ -3152,12 +3213,12 @@ msgstr ""
"secções podem partilhar a mesma base de dados."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:339
msgid "FileList"
msgstr "FileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:322
+#: apt-ftparchive.1.xml:341
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3169,12 +3230,12 @@ msgstr ""
"arquivo."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:346
msgid "SourceFileList"
msgstr "SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:348
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3187,12 +3248,12 @@ msgstr ""
"arquivo. Isto é usado quando se processa índices de fonte."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:356
msgid "Tree Section"
msgstr "Secção Tree"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:358
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3207,7 +3268,7 @@ msgstr ""
"<literal>Directory</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:363
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3220,7 +3281,7 @@ msgstr ""
"definição tal como <filename>dists/woody</filename>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
+#: apt-ftparchive.1.xml:368
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3231,7 +3292,7 @@ msgstr ""
"variáveis."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:374
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -3245,7 +3306,7 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:352
+#: apt-ftparchive.1.xml:371
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -3256,12 +3317,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:380
msgid "Sections"
msgstr "Sections"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:382
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3272,12 +3333,12 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:387
msgid "Architectures"
msgstr "Architectures"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:389
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3288,12 +3349,12 @@ msgstr ""
"indicar que esta árvore tem um arquivo fonte."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
msgid "BinOverride"
msgstr "BinOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:402
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
@@ -3302,12 +3363,12 @@ msgstr ""
"informação de secção, prioridade e endereço do responsável."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
msgid "SrcOverride"
msgstr "SrcOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:383
+#: apt-ftparchive.1.xml:408
msgid ""
"Sets the source override file. The override file contains section "
"information."
@@ -3316,32 +3377,32 @@ msgstr ""
"informação de secção."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
msgid "ExtraOverride"
msgstr "ExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
+#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
msgid "Sets the binary extra override file."
msgstr "Define o ficheiro de sobreposição extra binário."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
+#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
msgid "Sets the source extra override file."
msgstr "Define o ficheiro de sobreposição extra fonte."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:424
msgid "BinDirectory Section"
msgstr "Secção BinDirectory"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:426
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3356,12 +3417,12 @@ msgstr ""
"definições <literal>Section</literal><literal>Architecture</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:434
msgid "Sets the Packages file output."
msgstr "Define a saída do ficheiro Packages."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:439
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
@@ -3370,52 +3431,52 @@ msgstr ""
"<literal>Packages</literal> ou <literal>Sources</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:420
+#: apt-ftparchive.1.xml:445
msgid "Sets the Contents file output. (optional)"
msgstr "Define a saída do ficheiro Contents (opcional)"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:425
+#: apt-ftparchive.1.xml:450
msgid "Sets the binary override file."
msgstr "Define o ficheiro de sobreposição binário."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:430
+#: apt-ftparchive.1.xml:455
msgid "Sets the source override file."
msgstr "Define o ficheiro de sobreposição fonte."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:470
msgid "Sets the cache DB."
msgstr "Define a base de dados de cache."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:473
msgid "PathPrefix"
msgstr "PathPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:475
msgid "Appends a path to all the output paths."
msgstr "Acrescenta um caminho a todos os caminhos de saída."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:478
msgid "FileList, SourceFileList"
msgstr "FileList, SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:480
msgid "Specifies the file list file."
msgstr "Especifica o ficheiro de lista de ficheiros."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:487
msgid "The Binary Override File"
msgstr "O Ficheiro Binary Override"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:488
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3430,19 +3491,19 @@ msgstr ""
"permutação do responsável."
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:494
#, no-wrap
msgid "old [// oldn]* => new"
msgstr "old [// oldn]* => new"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:471
+#: apt-ftparchive.1.xml:496
#, no-wrap
msgid "new"
msgstr "new"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:493
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3459,12 +3520,12 @@ msgstr ""
"formato substitui incondicionalmente o campo do responsável."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:504
msgid "The Source Override File"
msgstr "O Ficheiro Source Override"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:506
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3475,12 +3536,12 @@ msgstr ""
"nome de pacote fonte, o segundo é a secção onde o atribuir."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:511
msgid "The Extra Override File"
msgstr "O Ficheiro Extra Override"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:513
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3491,12 +3552,12 @@ msgstr ""
"pacote, a segunda é a etiqueta e restante da linha é o novo valor."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:522
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:524
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3507,12 +3568,12 @@ msgstr ""
"<literal>APT::FTPArchive::MD5</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:529
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:531
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3521,7 +3582,7 @@ msgstr ""
"generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:537
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 "
@@ -3535,12 +3596,12 @@ msgstr ""
"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:543
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:545
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3553,12 +3614,12 @@ msgstr ""
"option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:551
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:528
+#: apt-ftparchive.1.xml:553
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3574,12 +3635,12 @@ msgstr ""
"de Configuração: <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:561
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:563
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3590,12 +3651,12 @@ msgstr ""
"SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:567
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:569
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3604,12 +3665,12 @@ msgstr ""
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:573
msgid "<option>--arch</option>"
msgstr "<option>--arch</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:574
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3623,12 +3684,12 @@ msgstr ""
"FTPArchive::Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:580
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:582
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3652,18 +3713,25 @@ msgstr ""
"as verificações extras serão desnecessárias."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:592
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:594
+#, fuzzy
+#| msgid ""
+#| "This configuration option defaults to \"<literal>true</literal>\" and "
+#| "should only be set to <literal>\"false\"</literal> if the Archive "
+#| "generated with &apt-ftparchive; also provides <filename>Translation</"
+#| "filename> files. Note that it is currently not possible to create these "
+#| "files with <command>apt-ftparchive</command>."
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with <command>apt-"
-"ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
msgstr ""
"Esta opção de configuração tem a predefinição de \"<literal>true</literal>\" "
"e deve apenas ser definida para <literal>\"false\"</literal> se o Arquivo "
@@ -3672,19 +3740,19 @@ msgstr ""
"esses ficheiros com <command>apt-ftparchive</command>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
+#: apt-ftparchive.1.xml:606 apt.conf.5.xml:1029 apt_preferences.5.xml:483
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Examples"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:612
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:608
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3693,7 +3761,7 @@ msgstr ""
"pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:597
+#: apt-ftparchive.1.xml:622
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -8209,11 +8277,43 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:198
msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"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 "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:202
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: origin \"\"\n"
+#| "Pin-Priority: 999\n"
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
+msgstr ""
+"Package: *\n"
+"Pin: origin \"\"\n"
+"Pin-Priority: 999\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:206
+#, fuzzy
+#| msgid ""
+#| "A note of caution: the keyword used here is \"<literal>origin</literal>"
+#| "\". This should not be confused with the Origin of a distribution as "
+#| "specified in a <filename>Release</filename> file. What follows the "
+#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
+#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
+msgid ""
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file. What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."
msgstr ""
"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</literal>"
"\". Isto não deve ser confundido com a Origem de uma distribuição como "
@@ -8223,7 +8323,7 @@ msgstr ""
"\"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8234,7 +8334,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:215
#, no-wrap
msgid ""
"Package: *\n"
@@ -8246,7 +8346,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:220
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8257,7 +8357,7 @@ msgstr ""
"\"<literal>squeeze</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:217
+#: apt_preferences.5.xml:224
#, no-wrap
msgid ""
"Package: *\n"
@@ -8269,7 +8369,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:229
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8281,7 +8381,7 @@ msgstr ""
"\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:234
#, no-wrap
msgid ""
"Package: *\n"
@@ -8293,17 +8393,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:245
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta as Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:254
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8312,12 +8412,12 @@ msgstr ""
"na versão do pacote (downgrade)"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
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:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8326,12 +8426,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:257
+#: apt_preferences.5.xml:264
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:258
+#: apt_preferences.5.xml:265
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"
@@ -8341,12 +8441,12 @@ msgstr ""
"mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:270
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:264
+#: apt_preferences.5.xml:271
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"
@@ -8356,12 +8456,12 @@ msgstr ""
"recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:276
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:270
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8370,17 +8470,17 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:274
+#: apt_preferences.5.xml:281
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:282
msgid "prevents the version from being installed"
msgstr "previne a instalação da versão"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:248
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8391,7 +8491,7 @@ msgstr ""
"(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:280
+#: apt_preferences.5.xml:287
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8405,7 +8505,7 @@ msgstr ""
"determina a prioridade da versão de pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:286
+#: apt_preferences.5.xml:293
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8414,7 +8514,7 @@ msgstr ""
"registos apresentados atrás:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:297
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8442,12 +8542,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:310
msgid "Then:"
msgstr "Então:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:312
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 "
@@ -8462,7 +8562,7 @@ msgstr ""
"downgrade ao <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:317
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8473,7 +8573,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:314
+#: apt_preferences.5.xml:321
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</"
@@ -8486,12 +8586,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:324
+#: apt_preferences.5.xml:331
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:326
+#: apt_preferences.5.xml:333
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8502,27 +8602,27 @@ msgstr ""
"descrever os pacotes disponíveis nessa localização."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:345
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:339
+#: apt_preferences.5.xml:346
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:342 apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
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:343
+#: apt_preferences.5.xml:350
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:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8543,12 +8643,12 @@ msgstr ""
"definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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:360
+#: apt_preferences.5.xml:367
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8565,18 +8665,18 @@ msgstr ""
"requerer a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:377
#, 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:376
+#: apt_preferences.5.xml:383
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:377
+#: apt_preferences.5.xml:384
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8592,13 +8692,13 @@ msgstr ""
"preferências do APT requer a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:386
+#: apt_preferences.5.xml:393
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8614,7 +8714,7 @@ msgstr ""
"seguintes linhas:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:409
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8626,12 +8726,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:418
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:412
+#: apt_preferences.5.xml:419
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8649,18 +8749,18 @@ msgstr ""
"a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:428
#, 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:427
+#: apt_preferences.5.xml:434
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:428
+#: apt_preferences.5.xml:435
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8673,18 +8773,18 @@ msgstr ""
"linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:441
#, 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:440
+#: apt_preferences.5.xml:447
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:441
+#: apt_preferences.5.xml:448
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8697,13 +8797,13 @@ msgstr ""
"linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:454
#, 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:348
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8725,7 +8825,7 @@ msgstr ""
"APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:461
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8750,12 +8850,12 @@ msgstr ""
"literal> da distribuição <literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:474
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:469
+#: apt_preferences.5.xml:476
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8765,26 +8865,13 @@ msgstr ""
"com uma ou mais linhas começadas com a palavra <literal>Explanation:</"
"literal>. Isto disponibiliza um espaço para comentários."
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional. If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-"A linha <literal>Pin-Priority:</literal> em cada registo de preferências do "
-"APT é opcional. Se omitida, o APT atribui uma prioridade de 1 a menos do "
-"último valor especificado numa linha que começa com <literal>Pin-Priority: "
-"release ...</literal>."
-
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:485
msgid "Tracking Stable"
msgstr "Acompanhando Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:490
+#: apt_preferences.5.xml:493
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8808,7 +8895,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:487
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 "
@@ -8824,8 +8911,8 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
-#: apt_preferences.5.xml:611
+#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
+#: apt_preferences.5.xml:614
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8837,7 +8924,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:505
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 "
@@ -8850,13 +8937,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:522
#, 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:513
+#: apt_preferences.5.xml:516
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8869,12 +8956,12 @@ msgstr ""
"outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:528
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:537
#, no-wrap
msgid ""
"Package: *\n"
@@ -8902,7 +8989,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:527
+#: apt_preferences.5.xml:530
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8919,7 +9006,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:551
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 "
@@ -8932,13 +9019,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568
+#: apt_preferences.5.xml:571
#, 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:559
+#: apt_preferences.5.xml:562
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8957,13 +9044,28 @@ msgstr ""
"versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:578
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:589
-#, no-wrap
+#: apt_preferences.5.xml:592
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
+#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
+#| "\n"
+#| "Explanation: Debian unstable is always codenamed with sid\n"
+#| "Package: *\n"
+#| "Pin: release a=sid\n"
+#| "Pin-Priority: 800\n"
+#| "\n"
+#| "Package: *\n"
+#| "Pin: release o=Debian\n"
+#| "Pin-Priority: -10\n"
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
@@ -8973,7 +9075,7 @@ msgid ""
"\n"
"Explanation: Debian unstable is always codenamed with sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -8996,7 +9098,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:580
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 "
@@ -9022,7 +9124,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:609
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 "
@@ -9035,13 +9137,13 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:629
#, 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:617
+#: apt_preferences.5.xml:620
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9060,12 +9162,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:638
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:644
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -11064,6 +11166,17 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
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 ""
+#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
+#~ "is optional. If omitted, APT assigns a priority of 1 less than the last "
+#~ "value specified on a line beginning with <literal>Pin-Priority: "
+#~ "release ...</literal>."
+#~ msgstr ""
+#~ "A linha <literal>Pin-Priority:</literal> em cada registo de preferências "
+#~ "do APT é opcional. Se omitida, o APT atribui uma prioridade de 1 a menos "
+#~ "do último valor especificado numa linha que começa com <literal>Pin-"
+#~ "Priority: release ...</literal>."
+
#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index bc0c3a9aa..c9b60bfb3 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2010-03-19 11:14+0100\n"
+"POT-Creation-Date: 2010-05-04 13:41+0300\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"
@@ -622,7 +622,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:268
+#: apt.ent:270
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -630,14 +630,16 @@ msgid ""
" <term><option>--config-file</option></term>\n"
" <listitem><para>Configuration File; Specify a configuration file to use. \n"
" The program will read the default configuration file and then this \n"
-" configuration file. See &apt-conf; for syntax information. \n"
+" configuration file. If configuration settings need to be set before the\n"
+" default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
msgstr ""
#. type: Plain text
-#: apt.ent:280
+#: apt.ent:282
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -654,7 +656,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:291
+#: apt.ent:293
#, fuzzy, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -678,7 +680,7 @@ msgstr ""
" </para>\n"
#. type: Plain text
-#: apt.ent:297
+#: apt.ent:299
#, no-wrap
msgid ""
"<!ENTITY file-aptconf \"\n"
@@ -689,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:303
+#: apt.ent:305
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -700,7 +702,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:309
+#: apt.ent:311
#, no-wrap
msgid ""
"<!ENTITY file-cachearchives \"\n"
@@ -711,7 +713,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:315
+#: apt.ent:317
#, no-wrap
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -722,7 +724,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:325
+#: apt.ent:327
#, no-wrap
msgid ""
"<!ENTITY file-preferences \"\n"
@@ -737,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:331
+#: apt.ent:333
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -748,7 +750,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:337
+#: apt.ent:339
#, no-wrap
msgid ""
"<!ENTITY file-sourceslist \"\n"
@@ -759,7 +761,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:343
+#: apt.ent:345
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -770,7 +772,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:350
+#: apt.ent:352
#, no-wrap
msgid ""
"<!ENTITY file-statelists \"\n"
@@ -782,7 +784,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:356
+#: apt.ent:358
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -793,7 +795,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:362
+#: apt.ent:364
#, no-wrap
msgid ""
"<!ENTITY file-trustedgpg \"\n"
@@ -804,7 +806,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:369
+#: apt.ent:371
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -816,7 +818,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:373
+#: apt.ent:375
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -825,7 +827,7 @@ msgid ""
msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
#. type: Plain text
-#: apt.ent:382
+#: apt.ent:384
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -843,7 +845,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:392
+#: apt.ent:394
#, no-wrap
msgid ""
"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1314,7 +1316,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
+#: apt-ftparchive.1.xml:518 apt-get.8.xml:319 apt-mark.8.xml:89
#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1338,7 +1340,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr ""
@@ -1359,12 +1361,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr ""
@@ -1413,7 +1415,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
msgid "<option>-a</option>"
msgstr ""
@@ -1509,14 +1511,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:636
msgid "Files"
msgstr ""
@@ -1527,9 +1529,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:617 apt-get.8.xml:576
#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:643
#: sources.list.5.xml:233
#, fuzzy
msgid "See Also"
@@ -1542,7 +1544,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1647,7 +1649,7 @@ msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr ""
@@ -1843,7 +1845,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
#: apt-sortpkgs.1.xml:70
#, fuzzy
msgid "&apt-conf;"
@@ -2273,36 +2275,61 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:228
-msgid "DeLinkLimit"
+msgid "Translation::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:230
msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:234
+msgid "DeLinkLimit"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:236
+msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
"Links</literal> setting."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:241
msgid "FileMode"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:243
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#, fuzzy
+msgid "LongDescription"
+msgstr "Descrição"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:256
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:258
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2310,12 +2337,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:263
msgid "MaxContentsChange"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:265
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -2323,12 +2350,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:270
msgid "ContentsAge"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:272
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2339,60 +2366,74 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:281
msgid "Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:283
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:287
msgid "SrcDirectory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:289
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
msgid "Packages"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:295
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
msgid "Sources"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:301
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:305
+#, fuzzy
+msgid "Translation"
+msgstr "Descrição"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:307
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
+"$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:312
msgid "InternalPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:314
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2400,12 +2441,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
msgid "Contents"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:321
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2414,34 +2455,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:328
msgid "Contents::Header"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:311
+#: apt-ftparchive.1.xml:330
msgid "Sets header file to prepend to the contents output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
msgid "BinCacheDB"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
+#: apt-ftparchive.1.xml:335
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:339
msgid "FileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:322
+#: apt-ftparchive.1.xml:341
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2449,12 +2490,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:346
msgid "SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:348
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2463,12 +2504,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:356
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:358
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -2478,7 +2519,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:363
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2487,7 +2528,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
+#: apt-ftparchive.1.xml:368
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -2495,7 +2536,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:374
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -2505,7 +2546,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:352
+#: apt-ftparchive.1.xml:371
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2513,13 +2554,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:380
#, fuzzy
msgid "Sections"
msgstr "Descrição"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:382
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -2527,12 +2568,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:387
msgid "Architectures"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:389
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -2540,56 +2581,56 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
msgid "BinOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:402
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
msgid "SrcOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:383
+#: apt-ftparchive.1.xml:408
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
msgid "ExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
+#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
msgid "SrcExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
+#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:424
msgid "BinDirectory Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:426
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -2599,64 +2640,64 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:434
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:439
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:420
+#: apt-ftparchive.1.xml:445
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:425
+#: apt-ftparchive.1.xml:450
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:430
+#: apt-ftparchive.1.xml:455
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:470
msgid "Sets the cache DB."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:473
msgid "PathPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:475
msgid "Appends a path to all the output paths."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:478
msgid "FileList, SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:480
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:487
msgid "The Binary Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:488
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -2666,19 +2707,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:494
#, no-wrap
msgid "old [// oldn]* => new"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:471
+#: apt-ftparchive.1.xml:496
#, no-wrap
msgid "new"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:493
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -2689,12 +2730,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:504
msgid "The Source Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:506
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -2702,12 +2743,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:511
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:513
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -2715,12 +2756,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:522
msgid "<option>--md5</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:524
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -2728,19 +2769,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:529
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:531
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:537
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 "
@@ -2749,12 +2790,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:543
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:545
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2763,12 +2804,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:551
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:528
+#: apt-ftparchive.1.xml:553
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2778,12 +2819,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:561
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:563
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2791,24 +2832,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:567
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:569
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:573
msgid "<option>--arch</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:574
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2817,12 +2858,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:580
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:582
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -2836,42 +2877,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:592
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:594
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with <command>apt-"
-"ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
+#: apt-ftparchive.1.xml:606 apt.conf.5.xml:1029 apt_preferences.5.xml:483
#: sources.list.5.xml:193
#, fuzzy
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:612
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:608
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:597
+#: apt-ftparchive.1.xml:622
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -6363,13 +6404,35 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:198
+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 "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:202
+#, fuzzy, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
+msgstr ""
+"<programlisting>\n"
+"Package: *\n"
+"Pin: origin \"\"\n"
+"Pin-Priority: 999\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:206
#, fuzzy
msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file. What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."
msgstr ""
"Uma nota de aviso : a palavra-chave usada aqui é \"<literal>origin</literal>"
"\". Esta palavra não deve ser confundida com a origem (\"Origin:\") de uma "
@@ -6379,7 +6442,7 @@ msgstr ""
"como \"Debian\" ou \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
#, fuzzy
msgid ""
"The following record assigns a low priority to all package versions "
@@ -6391,7 +6454,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:215
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6404,7 +6467,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:220
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -6416,7 +6479,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:217
+#: apt_preferences.5.xml:224
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6429,7 +6492,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:229
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -6442,7 +6505,7 @@ msgstr ""
"literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:234
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6455,19 +6518,19 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:245
#, fuzzy
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
#, fuzzy
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:254
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -6477,13 +6540,13 @@ msgstr ""
"dowgrade do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
#, fuzzy
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:252
+#: apt_preferences.5.xml:259
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -6493,13 +6556,13 @@ msgstr ""
"versão alvo, a menos que a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
#, fuzzy
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:258
+#: apt_preferences.5.xml:265
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6509,13 +6572,13 @@ msgstr ""
"disponível pertencente a versão alvo ou a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:270
#, fuzzy
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:264
+#: apt_preferences.5.xml:271
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6526,13 +6589,13 @@ msgstr ""
"seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:276
#, fuzzy
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:270
+#: apt_preferences.5.xml:277
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -6542,19 +6605,19 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:274
+#: apt_preferences.5.xml:281
#, fuzzy
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:282
#, fuzzy
msgid "prevents the version from being installed"
msgstr "impede a versão de ser instalada"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:248
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -6566,7 +6629,7 @@ msgstr ""
"seguir (a grosso modo):"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:280
+#: apt_preferences.5.xml:287
#, fuzzy
msgid ""
"If any specific-form records match an available package version then the "
@@ -6582,7 +6645,7 @@ msgstr ""
"determinará a prioridade da versão do pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:286
+#: apt_preferences.5.xml:293
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -6592,7 +6655,7 @@ msgstr ""
"registros apresentados anteriormente :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:297
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6621,12 +6684,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:310
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:312
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -6642,7 +6705,7 @@ msgstr ""
"será feito um downgrade do <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:317
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -6654,7 +6717,7 @@ msgstr ""
"mesmo versões pertencentes a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:321
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -6669,13 +6732,13 @@ msgstr ""
"instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:324
+#: apt_preferences.5.xml:331
#, 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:326
+#: apt_preferences.5.xml:333
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -6687,31 +6750,31 @@ msgstr ""
"os pacotes disponíveis nessas localidades."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:345
#, 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:339
+#: apt_preferences.5.xml:346
#, 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:342 apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
#, 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:343
+#: apt_preferences.5.xml:350
#, 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:330
+#: apt_preferences.5.xml:337
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -6733,13 +6796,13 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
#, 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:360
+#: apt_preferences.5.xml:367
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -6757,7 +6820,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:377
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -6765,13 +6828,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:383
#, 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:377
+#: apt_preferences.5.xml:384
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -6788,13 +6851,13 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:386
+#: apt_preferences.5.xml:393
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -6811,7 +6874,7 @@ msgstr ""
"das linhas a seguir."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:409
#, fuzzy, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6824,13 +6887,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:418
#, 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:412
+#: apt_preferences.5.xml:419
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -6849,7 +6912,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:428
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -6857,13 +6920,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:434
#, 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:428
+#: apt_preferences.5.xml:435
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -6877,7 +6940,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:441
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -6885,13 +6948,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:440
+#: apt_preferences.5.xml:447
#, 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:441
+#: apt_preferences.5.xml:448
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -6904,7 +6967,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:447
+#: apt_preferences.5.xml:454
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -6912,7 +6975,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:355
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -6935,7 +6998,7 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:461
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -6961,13 +7024,13 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:474
#, 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:469
+#: apt_preferences.5.xml:476
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -6978,28 +7041,14 @@ msgstr ""
"iniciar com uma ou mais linhas iniciadas com a palavra <literal>Explanation:"
"</literal>. Isto oferece um local para inserir comentários."
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
-#, fuzzy
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional. If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-"A linha <literal>Pin-Priority:</literal> em cada registro de preferências do "
-"APT é opcional. Caso omitida, o APT atribuirá uma prioridade de 1 menos o "
-"último valor especificado em uma linha iniciando com <literal>Pin-Priority: "
-"release ...</literal>."
-
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:485
#, fuzzy
msgid "Tracking Stable"
msgstr "Acompanhando a Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:490
+#: apt_preferences.5.xml:493
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7024,7 +7073,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:487
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -7040,8 +7089,8 @@ msgstr ""
"outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
-#: apt_preferences.5.xml:611
+#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
+#: apt_preferences.5.xml:614
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -7054,7 +7103,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:505
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7067,7 +7116,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:522
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
@@ -7075,7 +7124,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:513
+#: apt_preferences.5.xml:516
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7088,13 +7137,13 @@ msgstr ""
"atualizado novamente a menos que esse comando seja executado novamente."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:528
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando a Testing"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:537
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7123,7 +7172,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:527
+#: apt_preferences.5.xml:530
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -7140,7 +7189,7 @@ msgstr ""
"versões de pacotes de outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:551
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7153,7 +7202,7 @@ msgstr ""
"(s) última(s) versão(ões) <literal>testing</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568
+#: apt_preferences.5.xml:571
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
@@ -7161,7 +7210,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:562
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7181,12 +7230,12 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:578
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:592
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7197,7 +7246,7 @@ msgid ""
"\n"
"Explanation: Debian unstable is always codenamed with sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -7216,7 +7265,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:580
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 "
@@ -7231,7 +7280,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:609
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7244,7 +7293,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:629
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
@@ -7252,7 +7301,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:620
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7272,13 +7321,13 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:638
#, fuzzy
msgid "&file-preferences;"
msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:644
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -8702,6 +8751,18 @@ msgid "Which will use the already fetched archives on the disc."
msgstr ""
#, fuzzy
+#~ msgid ""
+#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
+#~ "is optional. If omitted, APT assigns a priority of 1 less than the last "
+#~ "value specified on a line beginning with <literal>Pin-Priority: "
+#~ "release ...</literal>."
+#~ msgstr ""
+#~ "A linha <literal>Pin-Priority:</literal> em cada registro de preferências "
+#~ "do APT é opcional. Caso omitida, o APT atribuirá uma prioridade de 1 "
+#~ "menos o último valor especificado em uma linha iniciando com <literal>Pin-"
+#~ "Priority: release ...</literal>."
+
+#, fuzzy
#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
#~ msgstr "<filename>/etc/apt.conf</>"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index c71ae6bdd..b0ff42b59 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -111,8 +111,8 @@
<para>Some examples:</para>
<literallayout>
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://http.us.debian.org/debian dists/stable-updates/
+deb http://ftp.debian.org/debian &stable-codename; main contrib non-free
+deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
</literallayout>
</refsect1>
@@ -206,8 +206,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/
<literallayout>deb http://archive.debian.org/debian-archive hamm main</literallayout>
<para>Uses FTP to access the archive at ftp.debian.org, under the debian
- directory, and uses only the stable/contrib area.</para>
- <literallayout>deb ftp://ftp.debian.org/debian stable contrib</literallayout>
+ directory, and uses only the &stable-codename;/contrib area.</para>
+ <literallayout>deb ftp://ftp.debian.org/debian &stable-codename; contrib</literallayout>
<para>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