fix two typos in apt.conf & apt-cache manpage

[apt.git] / doc / po / es.po

diff --git a/doc/po/es.po b/doc/po/es.po
index 419feb7cf639c567c5ec7ed9dce3f44aaba7d0af..0312d0365218a6954a7e97cab9ed27c64037f9f6 100644 (file)
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2015-11-25 16:01+0100\n"
+"POT-Creation-Date: 2016-05-11 10:50+0200\n"

 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"


@@ -806,10 +806,10 @@ msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals (=) and the version of the package "
 "to select. Alternatively the version from a specific release can be selected "
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals (=) and the version of the package "
 "to select. Alternatively the version from a specific release can be selected "

-"by following the package name with a forward slash (/) and codename (&stable-"
-"codename;, &testing-codename;, sid …) or suite name (stable, testing, "
-"unstable). This will also select versions from this release for dependencies "
-"of this package if needed to satisfy the request."
+"by following the package name with a forward slash (/) and codename (&debian-"
+"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, "
+"testing, unstable). This will also select versions from this release for "
+"dependencies of this package if needed to satisfy the request."

 msgstr ""
 "Puede seleccionar una versión especifica de un paquete poniendo a "
 "continuación del nombre del paquete un símbolo igual («=») seguido de la "
 msgstr ""
 "Puede seleccionar una versión especifica de un paquete poniendo a "
 "continuación del nombre del paquete un símbolo igual («=») seguido de la "


@@ -1449,8 +1449,8 @@ msgid ""
 "command is mainly used as an interface for external tools working with APT "
 "to get information as well as filenames for downloaded files so they can use "
 "them as well instead of downloading them again on their own. Detailed "
 "command is mainly used as an interface for external tools working with APT "
 "to get information as well as filenames for downloaded files so they can use "
 "them as well instead of downloading them again on their own. Detailed "

-"documentation is omitted here and can instead be found in the source tree in "
-"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+"documentation is omitted here and can instead be found in the file &apt-"
+"acquire-additional-files; shipped by the <package>apt-doc</package> package."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>


@@ -2632,8 +2632,8 @@ msgstr ""
 msgid ""
 "Per default <command>depends</command> and <command>rdepends</command> print "
 "only dependencies explicitly expressed in the metadata. With this flag it "
 msgid ""
 "Per default <command>depends</command> and <command>rdepends</command> print "
 "only dependencies explicitly expressed in the metadata. With this flag it "

-"will also show dependencies implicitely added based on the encountered "
-"data.  A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"will also show dependencies implicitly added based on the encountered "
+"data.  A <literal>Conflicts: foo</literal> e.g. expresses implicitly that "

 "this package also conflicts with the package foo from any other "
 "architecture.  Configuration Item: <literal>APT::Cache::ShowImplicit</"
 "literal>."
 "this package also conflicts with the package foo from any other "
 "architecture.  Configuration Item: <literal>APT::Cache::ShowImplicit</"
 "literal>."


@@ -4127,14 +4127,14 @@ msgstr ""
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "

-"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
-"'4.0', '5.0*'. See also &apt-preferences;."
+"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-"
+"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;."

 msgstr ""
 "La versión predeterminada de la que se instalarán los paquetes, si hay más "
 "de una versión disponible. Contiene el nombre de la versión, ya sea el "
 "nombre en código o el número de la versión. Por ejemplo: «stable», "
 msgstr ""
 "La versión predeterminada de la que se instalarán los paquetes, si hay más "
 "de una versión disponible. Contiene el nombre de la versión, ya sea el "
 "nombre en código o el número de la versión. Por ejemplo: «stable», "

-"«testing», «unstable», «&stable-codename;», «&testing-codename;», «4.0», "
-"«5.0*». Consulte también &apt-preferences;."
+"«testing», «unstable», «&debian-stable-codename;», «&debian-testing-"
+"codename;», «4.0», «5.0*». Consulte también &apt-preferences;."

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml


@@ -5073,7 +5073,7 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Allow that a repository that was previously gpg signed to become unsigned "
 #: apt.conf.5.xml
 msgid ""
 "Allow that a repository that was previously gpg signed to become unsigned "

-"durign a update operation. When there is no valid signature of a perviously "
+"durign a update operation. When there is no valid signature of a previously "

 "trusted repository apt will refuse the update. This option can be used to "
 "override this protection. You almost certainly never want to enable this. "
 "The default is false.  Note that apt will still consider packages from this "
 "trusted repository apt will refuse the update. This option can be used to "
 "override this protection. You almost certainly never want to enable this. "
 "The default is false.  Note that apt will still consider packages from this "


@@ -5098,11 +5098,11 @@ msgid ""
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "

-"normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
-"if the package is from a component (e.g. <literal>main</literal>)  this is "
-"the first part otherwise it is omitted, 2. the first letter of source "
-"package name, expect if the source package name starts with '<literal>lib</"
+"normal URI to a text file, except that package specific data is replaced "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
+"1. if the package is from a component (e.g. <literal>main</literal>)  this "
+"is the first part otherwise it is omitted, 2. the first letter of source "
+"package name, except if the source package name starts with '<literal>lib</"

 "literal>' in which case it will be the first four letters. 3. The complete "
 "source package name. 4. the complete name again and 5. the source version.  "
 "The first (if present), second, third and fourth part are separated by a "
 "literal>' in which case it will be the first four letters. 3. The complete "
 "source package name. 4. the complete name again and 5. the source version.  "
 "The first (if present), second, third and fourth part are separated by a "


@@ -5453,14 +5453,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""

-"Package action lines consist of five fields in Version 2: old version, "
-"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
-"no change), new version, action. The version fields are \"-\" for no version "
-"at all (for example when installing a package for the first time; no version "
-"is treated as earlier than any real version, so that is an upgrade, "
-"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
-"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
-"is being removed, or the filename of a .deb file if it is being unpacked."
+"Package action lines consist of five fields in Version 2: package name "
+"(without architecture qualification even if foreign), old version, direction "
+"of version change (&lt; for upgrades, &gt; for downgrades, = for no change), "
+"new version, action. The version fields are \"-\" for no version at all (for "
+"example when installing a package for the first time; no version is treated "
+"as earlier than any real version, so that is an upgrade, indicated as "
+"<literal>- &lt; 1.23.4</literal>). The action field is \"**CONFIGURE**\" if "
+"the package is being configured, \"**REMOVE**\" if it is being removed, or "
+"the filename of a .deb file if it is being unpacked."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -5468,9 +5469,9 @@ msgstr ""
 msgid ""
 "In Version 3 after each version field follows the architecture of this "
 "version, which is \"-\" if there is no version, and a field showing the "
 msgid ""
 "In Version 3 after each version field follows the architecture of this "
 "version, which is \"-\" if there is no version, and a field showing the "

-"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
-"\" is an incorrect typename which is just kept to remain compatible, it "
-"should be read as \"no\" and users are encouraged to support both."
+"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that "
+"\"none\" is an incorrect typename which is just kept to remain compatible, "
+"it should be read as \"no\" and users are encouraged to support both."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -6065,8 +6066,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml

 msgid "Examples"
 msgstr "Ejemplos"
 
 msgid "Examples"
 msgstr "Ejemplos"
 


@@ -6582,23 +6582,23 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The following record assigns a high priority to all package versions "
 #: apt_preferences.5.xml
 msgid ""
 "The following record assigns a high priority to all package versions "

-"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
-"</literal>\"."
+"belonging to any distribution whose Codename is \"<literal>&debian-testing-"
+"codename;</literal>\"."

 msgstr ""
 "El siguiente registro asigna una prioridad alta a todas las versiones de los "
 "paquetes pertenecientes a cualquier distribución que tenga como nombre clave "
 msgstr ""
 "El siguiente registro asigna una prioridad alta a todas las versiones de los "
 "paquetes pertenecientes a cualquier distribución que tenga como nombre clave "

-"«<literal>&testing-codename;</literal>»."
+"«<literal>&debian-testing-codename;</literal>»."

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>


@@ -6606,23 +6606,24 @@ msgstr ""
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "

-"and whose release Version number is \"<literal>&stable-version;</literal>\"."
+"and whose release Version number is \"<literal>&debian-stable-version;</"
+"literal>\"."

 msgstr ""
 "El siguiente registro asigna una prioridad alta a todas las versiones de los "
 "paquetes pertenecientes a cualquier publicación que tenga como nombre de "
 "archivo de paquetes «<literal>stable</literal>» y como número de versión "
 msgstr ""
 "El siguiente registro asigna una prioridad alta a todas las versiones de los "
 "paquetes pertenecientes a cualquier publicación que tenga como nombre de "
 "archivo de paquetes «<literal>stable</literal>» y como número de versión "

-"«<literal>&stable-version;</literal>»."
+"«<literal>&debian-stable-version;</literal>»."

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"

-"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"

 "Pin-Priority: 500\n"
 msgstr ""
 "Package: *\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: *\n"

-"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"

 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>


@@ -6977,20 +6978,20 @@ msgid ""
 "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>.../"
 "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/&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> file are "
-"relevant for setting APT priorities:"
+"dists/&debian-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> "
+"file are relevant for setting APT priorities:"

 msgstr ""
 "El fichero <filename>Release</filename> se suele encontrar en el directorio "
 "<filename>.../dists/<replaceable>nombre-dist</replaceable></filename>, por "
 "ejemplo <filename>.../dists/stable/Release</filename> o <filename>.../dists/"
 msgstr ""
 "El fichero <filename>Release</filename> se suele encontrar en el directorio "
 "<filename>.../dists/<replaceable>nombre-dist</replaceable></filename>, por "
 "ejemplo <filename>.../dists/stable/Release</filename> o <filename>.../dists/"

-"&stable-codename;/Release</filename>. El fichero consiste en registros de "
-"una sola línea que se aplican a <emphasis>todos</emphasis> los paquetes por "
-"debajo del directorio padre. Al contrario que el fichero <filename>Packages</"
-"filename>, casi todas las líneas del fichero <filename>Release</filename> "
-"son relevantes para las prioridades de APT:"
+"&debian-stable-codename;/Release</filename>. El fichero consiste en "
+"registros de una sola línea que se aplican a <emphasis>todos</emphasis> los "
+"paquetes por debajo del directorio padre. Al contrario que el fichero "
+"<filename>Packages</filename>, casi todas las líneas del fichero "
+"<filename>Release</filename> son relevantes para las prioridades de APT:"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml


@@ -7030,55 +7031,55 @@ msgstr "La línea <literal>Codename:</literal>"
 #: apt_preferences.5.xml
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 #: apt_preferences.5.xml
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "

-"For example, the line \"Codename: &testing-codename;\" specifies that all of "
-"the packages in the directory tree below the parent of the "
-"<filename>Release</filename> file belong to a version named "
-"<literal>&testing-codename;</literal>.  Specifying this value in the APT "
-"preferences file would require the line:"
+"For example, the line \"Codename: &debian-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>&debian-"
+"testing-codename;</literal>.  Specifying this value in the APT preferences "
+"file would require the line:"

 msgstr ""
 "indica el nombre de la distribución a la que pertenecen todos los paquetes "
 msgstr ""
 "indica el nombre de la distribución a la que pertenecen todos los paquetes "

-"del árbol de directorios. Por ejemplo, la línea «Codename: &testing-"
+"del árbol de directorios. Por ejemplo, la línea «Codename: &debian-testing-"

 "codename;» especifica que todos los paquetes en el árbol de directorios por "
 "debajo del directorio padre marcado en el fichero <filename>Release</"
 "codename;» especifica que todos los paquetes en el árbol de directorios por "
 "debajo del directorio padre marcado en el fichero <filename>Release</"

-"filename> pertenecen a la versión llamada <literal>&testing-codename;</"
-"literal>. Para especificar una preferencia de acuerdo con este parámetro "
+"filename> pertenecen a la versión llamada <literal>&debian-testing-codename;"
+"</literal>. Para especificar una preferencia de acuerdo con este parámetro "

 "tendrá que poner una de las 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
 #, no-wrap
 "tendrá que poner una de las 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
 #, no-wrap

-msgid "Pin: release n=&testing-codename;\n"
-msgstr "Pin: release n=&testing-codename;\n"
+msgid "Pin: release n=&debian-testing-codename;\n"
+msgstr "Pin: release n=&debian-testing-codename;\n"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml
 msgid ""
 "names the release version.  For example, the packages in the tree might "

-"belong to Debian release version &stable-version;.  Note that there is "
-"normally no version number for the <literal>testing</literal> and "
+"belong to Debian release version &debian-stable-version;.  Note that there "
+"is normally no version number for the <literal>testing</literal> and "

 "<literal>unstable</literal> distributions because they have not been "
 "released yet.  Specifying this in the APT preferences file would require one "
 "of the following lines."
 msgstr ""
 "nombra la versión de la publicación. Por ejemplo, los paquetes en el árbol "
 "<literal>unstable</literal> distributions because they have not been "
 "released yet.  Specifying this in the APT preferences file would require one "
 "of the following lines."
 msgstr ""
 "nombra la versión de la publicación. Por ejemplo, los paquetes en el árbol "

-"pueden pertenecer a la versión &stable-version; de Debian. Observe que, "
-"generalmente, <literal>testing</literal> y <literal>unstable</literal> no "
-"tienen una versión asignada porque no se han publicado. Para especificar una "
-"preferencia de acuerdo con este parámetro tendrá que poner una de las "
+"pueden pertenecer a la versión &debian-stable-version; de Debian. Observe "
+"que, generalmente, <literal>testing</literal> y <literal>unstable</literal> "
+"no tienen una versión asignada porque no se han publicado. Para especificar "
+"una preferencia de acuerdo con este parámetro tendrá que poner una de las "

 "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
 #, no-wrap
 msgid ""
 "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
 #, no-wrap
 msgid ""

-"Pin: release v=&stable-version;\n"
-"Pin: release a=stable, v=&stable-version;\n"
-"Pin: release &stable-version;\n"
+"Pin: release v=&debian-stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"
+"Pin: release &debian-stable-version;\n"

 msgstr ""
 msgstr ""

-"Pin: release v=&stable-version;\n"
-"Pin: release a=stable, v=&stable-version;\n"
-"Pin: release &stable-version;\n"
+"Pin: release v=&debian-stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"
+"Pin: release &debian-stable-version;\n"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml


@@ -7386,9 +7387,9 @@ msgstr "Seguir la evolución de una publicación por el nombre"
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"

-"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
+"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n"

 "Package: *\n"
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"


@@ -7403,7 +7404,7 @@ msgstr ""
 "Explanation: Eliminar o no instalar cualquier paquete de Debian cuya versión sea\n"
 "Explanation: distinta a aquellos en las distribuciones de nombre squeeze o sid\n"
 "Package: *\n"
 "Explanation: Eliminar o no instalar cualquier paquete de Debian cuya versión sea\n"
 "Explanation: distinta a aquellos en las distribuciones de nombre squeeze o sid\n"
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explanation: El nombre clave de Debian «unstable» siempre es sid\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: El nombre clave de Debian «unstable» siempre es sid\n"


@@ -7447,14 +7448,14 @@ msgstr ""
 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 "
 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 "

-"the release codenamed with <literal>&testing-codename;</literal>.  "
+"the release codenamed with <literal>&debian-testing-codename;</literal>.  "

 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Con un fichero «&sources-list;» adecuado y el fichero de preferencias "
 "mostrado anteriormente, cualquiera de las siguientes órdenes provocará que "
 "APT actualice los paquetes a la última versión de la distribución llamada "
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Con un fichero «&sources-list;» adecuado y el fichero de preferencias "
 "mostrado anteriormente, cualquiera de las siguientes órdenes provocará que "
 "APT actualice los paquetes a la última versión de la distribución llamada "

-"<literal>&testing-codename;</literal>.  <placeholder type=\"programlisting\" "
-"id=\"0\"/>"
+"<literal>&debian-testing-codename;</literal>.  <placeholder type="
+"\"programlisting\" id=\"0\"/>"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml


@@ -7468,17 +7469,17 @@ msgid ""
 "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 "
 "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>&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.  "
-"<placeholder type=\"programlisting\" id=\"0\"/>"
+"recent <literal>&debian-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.  <placeholder type=\"programlisting\" id=\"0\"/>"

 msgstr ""
 "La siguiente orden hace que APT actualice un determinado paquete a la última "
 "versión de la distribución <literal>sid</literal>. Más tarde, <command>apt-"
 "get upgrade</command> actualizará el paquete a la última versión de la "
 msgstr ""
 "La siguiente orden hace que APT actualice un determinado paquete a la última "
 "versión de la distribución <literal>sid</literal>. Más tarde, <command>apt-"
 "get upgrade</command> actualizará el paquete a la última versión de la "

-"distribución<literal>&testing-codename;</literal> si es más reciente que la "
-"versión instalada. De otro modo, se instalará la versión más reciente de la "
-"distribución <literal>sid</literal> si es más reciente que la versión "
+"distribución<literal>&debian-testing-codename;</literal> si es más reciente "
+"que la versión instalada. De otro modo, se instalará la versión más reciente "
+"de la distribución <literal>sid</literal> si es más reciente que la versión "

 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>


@@ -7650,9 +7651,9 @@ msgstr "Los tipos «deb» y «deb-src»"
 #| "archive, <filename>distribution/component</filename>. The "
 #| "<literal>distribution</literal> is generally an archive name like "
 #| "<literal>stable</literal> or <literal>testing</literal> or a codename "
 #| "archive, <filename>distribution/component</filename>. The "
 #| "<literal>distribution</literal> is generally an archive name like "
 #| "<literal>stable</literal> or <literal>testing</literal> or a codename "

-#| "like <literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-#| "literal> while component is one of <literal>main</literal>, "
-#| "<literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "like <literal>&debian-stable-codename;</literal> or <literal>&debian-"
+#| "testing-codename;</literal> while component is one of <literal>main</"
+#| "literal>, <literal>contrib</literal> or <literal>non-free</literal>. The "

 #| "<literal>deb-src</literal> type references a Debian distribution's source "
 #| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
 #| "src</literal> line is required to fetch source indexes."
 #| "<literal>deb-src</literal> type references a Debian distribution's source "
 #| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
 #| "src</literal> line is required to fetch source indexes."


@@ -7661,8 +7662,8 @@ msgid ""
 "archive, <filename>distribution/component</filename>. The "
 "<literal>distribution</literal> is generally a suite name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "archive, <filename>distribution/component</filename>. The "
 "<literal>distribution</literal> is generally a suite name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "

-"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal>, "
+"<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
+"codename;</literal> while component is one of <literal>main</literal>, "

 "<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
 "src</literal> type references a Debian distribution's source code in the "
 "same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
 "<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
 "src</literal> type references a Debian distribution's source code in the "
 "same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "


@@ -7672,10 +7673,10 @@ msgstr ""
 "de dos niveles, <filename>distribución/componente</filename>. Habitualmente, "
 "<literal>distribución</literal> es «<literal>stable</literal>» (estable) o "
 "«<literal>testing</literal>» (en pruebas), o un nombre código como "
 "de dos niveles, <filename>distribución/componente</filename>. Habitualmente, "
 "<literal>distribución</literal> es «<literal>stable</literal>» (estable) o "
 "«<literal>testing</literal>» (en pruebas), o un nombre código como "

-"<literal>&stable-codename;</literal> o <literal>&testing-codename;</"
-"literal>, mientras que el componente es <literal>main</literal> (principal), "
-"<literal>contrib</literal>, <literal>non-free</literal> (no libre), o "
-"<literal>non-us</literal>. El tipo <literal>deb-src</literal> hace "
+"<literal>&debian-stable-codename;</literal> o <literal>&debian-testing-"
+"codename;</literal>, mientras que el componente es <literal>main</literal> "
+"(principal), <literal>contrib</literal>, <literal>non-free</literal> (no "
+"libre), o <literal>non-us</literal>. El tipo <literal>deb-src</literal> hace "

 "referencia al código fuente de la distribución con la misma sintaxis que el "
 "tipo <literal>deb</literal>. Debe insertar una línea <literal>deb-src</"
 "literal> para obtener los índices de fuentes."
 "referencia al código fuente de la distribución con la misma sintaxis que el "
 "tipo <literal>deb</literal>. Debe insertar una línea <literal>deb-src</"
 "literal> para obtener los índices de fuentes."


@@ -7923,9 +7924,10 @@ msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
 "not specified, the default set is defined by the <option>Acquire::"
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
 "not specified, the default set is defined by the <option>Acquire::"

-"IndexTargets</option> configuration scope.  Additionally, specific targets "
-"can be enabled or disabled by using the identifier as field name instead of "
-"using this multivalue option."
+"IndexTargets</option> configuration scope (targets are specified by their "
+"name in the <literal>Created-By</literal> field).  Additionally, targets can "
+"be enabled or disabled by using the <literal>Identifier</literal> field as "
+"an option with a boolean value instead of using this multivalue option."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>


@@ -7973,14 +7975,14 @@ msgid ""
 "<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
 "which defaults to APT deciding if a source is considered trusted or if "
 "warnings should be raised before e.g.  packages are installed from this "
 "<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
 "which defaults to APT deciding if a source is considered trusted or if "
 "warnings should be raised before e.g.  packages are installed from this "

-"source. This option can be used to override this decision either with the "
-"value <literal>yes</literal>, which lets APT consider this source always as "
-"a trusted source, even if it lacks or fails authentication checks, by "
-"disabling parts of &apt-secure;. It should therefore only be used in a local "
-"and trusted context (if at all) as otherwise security is breached. The "
-"opposite can be achieved with the value <literal>no</literal>, which causes "
-"the source to be handled as untrusted even if the authentication checks "
-"passed successfully.  The default value can't be set explicitly."
+"source. This option can be used to override that decision. The value "
+"<literal>yes</literal> tells APT always to consider this source as trusted, "
+"even if it doesn't pass authentication checks. It disables parts of &apt-"
+"secure;, and should therefore only be used in a local and trusted context "
+"(if at all) as otherwise security is breached. The value <literal>no</"
+"literal> does the opposite, causing the source to be handled as untrusted "
+"even if the authentication checks passed successfully. The default value "
+"can't be set explicitly."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>


@@ -7989,13 +7991,14 @@ msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "

-"file) or a fingerprint of a key either in the <filename>trusted.gpg</"
-"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"file) or one or more fingerprints of keys either in the <filename>trusted."
+"gpg</filename> keyring or in the keyrings in the <filename>trusted.gpg.d/</"

 "filename> directory (see <command>apt-key fingerprint</command>). If the "
 "filename> directory (see <command>apt-key fingerprint</command>). If the "

-"option is set, only the key(s) in this keyring or only the key with this "
-"fingerprint is used for the &apt-secure; verification of this repository. "
-"Otherwise all keys in the trusted keyrings are considered valid signers for "
-"this repository."
+"option is set, only the key(s) in this keyring or only the keys with these "
+"fingerprints are used for the &apt-secure; verification of this repository. "
+"Defaults to the value of the option with the same name if set in the "
+"previously acquired <filename>Release</filename> file.  Otherwise all keys "
+"in the trusted keyrings are considered valid signers for this repository."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>


@@ -8249,35 +8252,35 @@ msgstr ""
 #: sources.list.5.xml
 #, fuzzy, no-wrap
 #| msgid ""
 #: sources.list.5.xml
 #, fuzzy, no-wrap
 #| msgid ""

-#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
-#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"

 msgid ""
 msgid ""

-"deb http://httpredir.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main"
+"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"

 msgstr ""
 msgstr ""

-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"

 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, fuzzy, no-wrap
 #| msgid ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, fuzzy, no-wrap
 #| msgid ""

-#| "deb http://ftp.debian.org/debian &stable-codename; main\n"
-#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"

 msgid ""
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"
 msgid ""
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"

-"Suites: &stable-codename;\n"
+"Suites: &debian-stable-codename;\n"

 "Components: main\n"
 "\n"
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"

-"Suites: &stable-codename;\n"
+"Suites: &debian-stable-codename;\n"

 "Components: main\n"
 "Architectures: amd64 armel\n"
 msgstr ""
 "Components: main\n"
 "Architectures: amd64 armel\n"
 msgstr ""

-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"

 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml


@@ -8309,27 +8312,28 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 #: sources.list.5.xml
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 #: sources.list.5.xml
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "

-"directory, and uses only the &stable-codename;/contrib area."
+"directory, and uses only the &debian-stable-codename;/contrib area."

 msgstr ""
 "Utiliza FTP para acceder al archivo de Debian en «ftp.debian.org», debajo "
 msgstr ""
 "Utiliza FTP para acceder al archivo de Debian en «ftp.debian.org», debajo "

-"del directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
+"del directorio «debian», y usa sólo la sección «&debian-stable-codename;/"
+"contrib»."

 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap

-msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
-msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"

 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, fuzzy, no-wrap
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, fuzzy, no-wrap

-#| msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"

 msgid ""
 "Types: deb\n"
 "URIs: ftp://ftp.debian.org/debian\n"
 msgid ""
 "Types: deb\n"
 "URIs: ftp://ftp.debian.org/debian\n"

-"Suites: &stable-codename;\n"
+"Suites: &debian-stable-codename;\n"

 "Components: contrib"
 "Components: contrib"

-msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"

 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml


@@ -8437,9 +8441,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 #, fuzzy
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 #, fuzzy

-#| msgid "&apt-cache; &apt-conf;"
-msgid "&apt-get;, &apt-conf;"
-msgstr "&apt-cache; &apt-conf;"
+#| msgid "&apt-cache;, &apt-config;, &apt-preferences;."
+msgid "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
+msgstr "&apt-cache;, &apt-config;, &apt-preferences;."

 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml


@@ -9124,12 +9128,12 @@ 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 "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
 "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/&stable-codename;</filename>."
+"setting such as <filename>dists/&debian-stable-codename;</filename>."

 msgstr ""
 "La sección <literal>Tree</literal> toma un ámbito de una etiqueta que define "
 "la variable <literal>$(DIST)</literal> y la raíz del árbol (a la ruta se le "
 "añade el prefijo <literal>ArchiveDir</literal>). Normalmente esto es un "
 msgstr ""
 "La sección <literal>Tree</literal> toma un ámbito de una etiqueta que define "
 "la variable <literal>$(DIST)</literal> y la raíz del árbol (a la ruta se le "
 "añade el prefijo <literal>ArchiveDir</literal>). Normalmente esto es un "

-"valor como <filename>dists/&stable-codename;</filename>."
+"valor como <filename>dists/&debian-stable-codename;</filename>."

 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml


@@ -11151,6 +11155,11 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 

+#, fuzzy
+#~| msgid "&apt-cache; &apt-conf;"
+#~ msgid "&apt-get;, &apt-conf;"
+#~ msgstr "&apt-cache; &apt-conf;"
+

 #~ msgid ""
 #~ "This is a space separated list of all the architectures that appear under "
 #~ "search section. The special architecture 'source' is used to indicate "
 #~ msgid ""
 #~ "This is a space separated list of all the architectures that appear under "
 #~ "search section. The special architecture 'source' is used to indicate "


@@ -11381,14 +11390,16 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 #~ msgstr "Algunos ejemplos:"
 
 #~ msgid ""
 #~ msgstr "Algunos ejemplos:"
 
 #~ msgid ""

-#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib "
+#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "

 #~ "non-free\n"
 #~ "non-free\n"

+#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
+#~ "contrib non-free\n"

 #~ "   "
 #~ msgstr ""
 #~ "   "
 #~ msgstr ""

-#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib "
+#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "

 #~ "non-free\n"
 #~ "non-free\n"

+#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
+#~ "contrib non-free\n"

 #~ "   "
 
 #~ msgid "apt"
 #~ "   "
 
 #~ msgid "apt"