add apt-key support for armored GPG key files (*.asc)

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

diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index d9df0ad4c580d8c32e02264e6dc116c45ad25ddb..0b2e06fca663c0bd98bc3130230fcd6e43f2179a 100644 (file)
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 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-12-30 00:41+0100\n"
+"POT-Creation-Date: 2016-11-11 23:29+0100\n"

 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
 "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"


@@ -543,7 +543,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "

-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "

 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."


@@ -558,7 +558,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.8.xml
+#: apt.8.xml apt-key.8.xml

 msgid ","
 msgstr ""
 
 msgid ","
 msgstr ""
 


@@ -577,10 +577,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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -616,12 +616,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml

-#, fuzzy

 msgid "(&apt-cache;)"
 msgid "(&apt-cache;)"

-msgstr ""
-"&apt-docinfo;\n"
-"\n"
-" "
+msgstr "(&apt-cache;)"

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


@@ -1013,8 +1009,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>


@@ -1136,8 +1132,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""

-"Show upgraded packages; print out a list of all packages that are to be "
-"upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
+"Do not show a list of all packages that are to be upgraded.  Configuration "
+"Item: <literal>APT::Get::Show-Upgraded</literal>."

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


@@ -1376,8 +1372,9 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Forbid the update command to acquire unverifiable data from configured "
 #: apt-get.8.xml
 msgid ""
 "Forbid the update command to acquire unverifiable data from configured "

-"sources. Apt will fail at the update command for repositories without valid "
-"cryptographically signatures.  Configuration Item: <literal>Acquire::"
+"sources. APT will fail at the update command for repositories without valid "
+"cryptographically signatures. See also &apt-secure; for details on the "
+"concept and the implications.  Configuration Item: <literal>Acquire::"

 "AllowInsecureRepositories</literal>."
 msgstr ""
 
 "AllowInsecureRepositories</literal>."
 msgstr ""
 


@@ -1387,10 +1384,18 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "

-"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Items: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"

 "literal>."
 msgstr ""
 
 "literal>."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Adds the given file as a source for metadata. Can be repeated to add "
+"multiple files.  See <option>--with-source</option> description in &apt-"
+"cache; for further details."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml


@@ -1640,11 +1645,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml

-#, fuzzy

 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"

-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
+msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml


@@ -1700,11 +1702,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml

-#, fuzzy

 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"

-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
+msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml


@@ -1777,11 +1776,10 @@ 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 "
-"this package also conflicts with the package foo from any other "
-"architecture.  Configuration Item: <literal>APT::Cache::ShowImplicit</"
-"literal>."
+"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>."

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


@@ -1841,6 +1839,33 @@ msgid ""
 "<literal>APT::Cache::Installed</literal>."
 msgstr ""
 
 "<literal>APT::Cache::Installed</literal>."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml
+msgid ""
+"Adds the given file as a source for metadata. Can be repeated to add "
+"multiple files.  Supported are currently <literal>*.deb</literal>, "
+"<literal>*.dsc</literal>, <literal>*.changes</literal>, <literal>Sources</"
+"literal> and <literal>Packages</literal> files as well as source package "
+"directories.  Files are matched based on their name only, not their content!"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml
+msgid ""
+"<literal>Sources</literal> and <literal>Packages</literal> can be compressed "
+"in any format apt supports as long as they have the correct extension. If "
+"you need to store multiple of these files in one directory you can prefix a "
+"name of your choice with the last character being an underscore "
+"(\"<literal>_</literal>\"). Example: my.example_Packages.xz"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml
+msgid ""
+"Note that these sources are treated as trusted (see &apt-secure;).  "
+"Configuration Item: <literal>APT::Sources::With</literal>."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><para>
 #: apt-cache.8.xml
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cache.8.xml
 msgid "&apt-conf;, &sources-list;, &apt-get;"


@@ -1866,6 +1891,18 @@ msgid ""
 "keys will be considered trusted."
 msgstr ""
 
 "keys will be considered trusted."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid ""
+"Note that if usage of <command>apt-key</command> is desired the additional "
+"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
+"package>) is required. For this reason alone the programmatic usage "
+"(especially in package maintainerscripts!) is strongly discouraged.  Further "
+"more the output format of all commands is undefined and can and does change "
+"whenever the underlying commands change. <command>apt-key</command> will try "
+"to detect such usage and generates warnings on stderr in these cases."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml
 msgid "Commands"
 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml
 msgid "Commands"


@@ -1889,27 +1926,31 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "Remove a key from the list of trusted keys."
+msgid ""
+"Instead of using this command a keyring can be placed directly in the "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+"name (same rules for filename apply as for &apt-conf; files) and "
+"\"<literal>gpg</literal>\" as file extension."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "Output the key &synopsis-param-keyid; to standard output."
+msgid "Remove a key from the list of trusted keys."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "Output all trusted keys to standard output."
+msgid "Output the key &synopsis-param-keyid; to standard output."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "List trusted keys."
+msgid "Output all trusted keys to standard output."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "List fingerprints of trusted keys."
+msgid "List trusted keys with fingerprints."

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


@@ -1921,6 +1962,11 @@ msgid ""
 "to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
 
 "to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""


@@ -1930,6 +1976,16 @@ msgid ""
 "distribution, e.g. the &keyring-package; package in &keyring-distro;."
 msgstr ""
 
 "distribution, e.g. the &keyring-package; package in &keyring-distro;."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Note that a distribution does not need to and in fact should not use this "
+"command any longer and instead ship keyring files in the <filename>/etc/apt/"
+"trusted.gpg</filename> directory directly as this avoids a dependency on "
+"<package>gnupg</package> and it is easier to manage keys by simply adding "
+"and removing files for maintainers and users alike."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""


@@ -1964,42 +2020,10 @@ msgid ""
 "this one."
 msgstr ""
 
 "this one."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-#, fuzzy
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt.conf</>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Local trust database of archive keys."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-filename;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive trusted keys."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-removed-filename;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive removed trusted keys."
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml

-#, fuzzy

 msgid "&apt-get;, &apt-secure;"
 msgid "&apt-get;, &apt-secure;"

-msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgstr "&apt-get;, &apt-secure;"

 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml


@@ -2138,27 +2162,57 @@ msgid ""
 "Starting with version 0.6, <command>APT</command> contains code that does "
 "signature checking of the Release file for all repositories. This ensures "
 "that data like packages in the archive can't be modified by people who have "
 "Starting with version 0.6, <command>APT</command> contains code that does "
 "signature checking of the Release file for all repositories. This ensures "
 "that data like packages in the archive can't be modified by people who have "

-"no access to the Release file signing key."
+"no access to the Release file signing key. Starting with version 1.1 "
+"<command>APT</command> requires repositories to provide recent "
+"authentication information for unimpeded usage of the repository."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
 "If an archive has an unsigned Release file or no Release file at all current "
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
 "If an archive has an unsigned Release file or no Release file at all current "

-"APT versions will raise a warning in <command>update</command> operations "
-"and front-ends like <command>apt-get</command> will require explicit "
-"confirmation if an installation request includes a package from such an "
-"unauthenticated archive."
+"APT versions will refuse to download data from them by default in "
+"<command>update</command> operations and even if forced to download front-"
+"ends like &apt-get; will require explicit confirmation if an installation "
+"request includes a package from such an unauthenticated archive."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""

-"In the future APT will refuse to work with unauthenticated repositories by "
-"default until support for them is removed entirely. Users have the option to "
-"opt-in to this behavior already by setting the configuration option "
-"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
-"literal>."
+"As a temporary exception &apt-get; (not &apt;!) raises warnings only if it "
+"encounters unauthenticated archives to give a slightly longer grace period "
+"on this backward compatibility effecting change. This exception will be "
+"removed in future releases and you can opt-out of this grace period by "
+"setting the configuration option <option>Binary::apt-get::Acquire::"
+"AllowInsecureRepositories</option> to <literal>false</literal> or <option>--"
+"no-allow-insecure-repositories</option> on the command line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
+"You can force all APT clients to raise only warnings by setting the "
+"configuration option <option>Acquire::AllowInsecureRepositories</option> to "
+"<literal>true</literal>. Individual repositories can also be allowed to be "
+"insecure via the &sources-list; option <literal>allow-insecure=yes</"
+"literal>.  Note that insecure repositories are strongly discouraged and all "
+"options to force apt to continue supporting them will eventually be "
+"removed.  Users also have the <option>Trusted</option> option available to "
+"disable even the warnings, but be sure to understand the implications as "
+"detailed in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
+"A repository which previously was authenticated but would loose this state "
+"in an <command>update</command> operation raises an error in all APT clients "
+"irrespective of the option to allow or forbid usage of insecure "
+"repositories.  The error can be overcome by additionally setting "
+"<option>Acquire::AllowDowngradeToInsecureRepositories</option> to "
+"<literal>true</literal> or for Individual repositories with the &sources-"
+"list; option <literal>allow-downgrade-to-insecure=yes</literal>."

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


@@ -2489,9 +2543,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml

-#, fuzzy

 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgid "&apt-conf;, &apt-get;, &sources-list;"

-msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgstr "&apt-conf;, &apt-get;, &sources-list;"

 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml


@@ -2579,12 +2632,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
 #: apt-ftparchive.1.xml
 #. type: Content of: <refentry><refsect1><para>
 #: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
 #: apt-ftparchive.1.xml

-#, fuzzy

 msgid "&apt-conf;"
 msgid "&apt-conf;"

-msgstr ""
-"&apt-docinfo;\n"
-"\n"
-" "
+msgstr "&apt-conf;"

 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-config.8.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-config.8.xml


@@ -2832,6 +2881,33 @@ msgid ""
 "are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 
 "are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"This scope defines which compression formats are supported, how compression "
+"and decompression can be performed if support for this format isn't built "
+"into apt directly and a cost-value indicating how costly it is to compress "
+"something in this format. As an example the following configuration stanza "
+"would allow apt to download and uncompress as well as create and store files "
+"with the low-cost <literal>.reversed</literal> file extension which it will "
+"pass to the command <command>rev</command> without additional commandline "
+"parameters for compression and uncompression:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#: apt.conf.5.xml
+#, no-wrap
+msgid ""
+"APT::Compressor::rev {\n"
+"\tName \"rev\";\n"
+"\tExtension \".reversed\";\n"
+"\tBinary \"rev\";\n"
+"\tCompressArg {};\n"
+"\tUncompressArg {};\n"
+"\tCost \"10\";\n"
+"};\n"
+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 ""


@@ -2846,8 +2922,8 @@ 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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -3151,14 +3227,17 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 #: apt.conf.5.xml
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "

-"an external command to discover the http proxy to use. Apt expects the "
-"command to output the proxy on stdout in the style <literal>http://proxy:"
-"port/</literal>. This will override the generic <literal>Acquire::http::"
-"Proxy</literal> but not any specific host proxy configuration set via "
-"<literal>Acquire::http::Proxy::$HOST</literal>.  See the &squid-deb-proxy-"
-"client; package for an example implementation that uses avahi. This option "
-"takes precedence over the legacy option name <literal>ProxyAutoDetect</"
-"literal>."
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the style <literal>http://proxy:port/</literal> "
+"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
+"indicates that the generic proxy settings should be used.  Note that auto-"
+"detection will not be used for a host if a host-specific proxy configuration "
+"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
+"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
+"example implementation that uses avahi.  This option takes precedence over "
+"the legacy option name <literal>ProxyAutoDetect</literal>."

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


@@ -3279,11 +3358,11 @@ msgstr ""
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "

-"compression formats.  By default the acquire methods can decompress "
-"<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files; with this setting more formats can be added on "
-"the fly or the used method can be changed. The syntax for this is: "
-"<placeholder type=\"synopsis\" id=\"0\"/>"
+"compression formats.  By default the acquire methods can decompress and "
+"recompress many common formats like <command>xz</command> and <command>gzip</"
+"command>; with this scope the supported formats can be queried, modified as "
+"well as support for more formats added (see also <option>APT::Compressor</"
+"option>). The syntax for this is: <placeholder type=\"synopsis\" id=\"0\"/>"

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


@@ -3295,7 +3374,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml
 #, no-wrap
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml
 #, no-wrap

-msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
+msgid "Acquire::CompressionTypes::Order { \"xz\"; \"gz\"; };"

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


@@ -3305,15 +3384,14 @@ msgid ""
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
 "in this list on error, so to prefer one over the other type simply add the "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
 "in this list on error, so to prefer one over the other type simply add the "

-"preferred type first - default types not already added will be implicitly "
-"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
-"\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
-"<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
-"command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this: "
-"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> to the list explicitly as it will be added "
-"automatically."
+"preferred type first - types not already added will be implicitly appended "
+"to the end of the list, so e.g. <placeholder type=\"synopsis\" id=\"0\"/> "
+"can be used to prefer <command>gzip</command> compressed files over all "
+"other compression formats.  If <command>xz</command> should be preferred "
+"over <command>gzip</command> and <command>bzip2</command> the configure "
+"setting should look like this: <placeholder type=\"synopsis\" id=\"1\"/> It "
+"is not needed to add <literal>bz2</literal> to the list explicitly as it "
+"will be added automatically."

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


@@ -3326,15 +3404,16 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 #: apt.conf.5.xml
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"

-"literal> will be checked at run time. If this option has been set, the "
-"method will only be used if this file exists; e.g. for the <literal>bzip2</"
-"literal> method (the inbuilt) setting is: <placeholder type=\"literallayout"
-"\" id=\"0\"/> Note also that list entries specified on the command line will "
-"be added at the end of the list specified in the configuration files, but "
-"before the default entries. To prefer a type in this case over the ones "
-"specified in the configuration files you can set the option direct - not in "
-"list style.  This will not override the defined list; it will only prefix "
-"the list with this type."
+"literal> will be checked at run time. If this option has been set and "
+"support for this format isn't directly built into apt, the method will only "
+"be used if this file exists; e.g. for the <literal>bzip2</literal> method "
+"(the inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> "
+"Note also that list entries specified on the command line will be added at "
+"the end of the list specified in the configuration files, but before the "
+"default entries. To prefer a type in this case over the ones specified in "
+"the configuration files you can set the option direct - not in list style.  "
+"This will not override the defined list; it will only prefix the list with "
+"this type."

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


@@ -3431,21 +3510,30 @@ 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 ""

-"Allow the update operation to load data files from a repository without a "
-"trusted signature. If enabled this option no data files will be loaded and "
-"the update operation fails with a error for this source. The default is "
-"false for backward compatibility. This will be changed in the future."
+"Allow update operations to load data files from repositories without "
+"sufficient security information.  The default value is \"<literal>false</"
+"literal>\".  Concept, implications as well as alternatives are detailed in "
+"&apt-secure;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Allow update operations to load data files from repositories which provide "
+"security information, but these are deemed no longer cryptographically "
+"strong enough.  The default value is \"<literal>false</literal>\".  Concept, "
+"implications as well as alternatives are detailed in &apt-secure;."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
 "Allow that a repository that was previously gpg signed to become unsigned "
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: 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 "
-"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 "
-"source untrusted and warn about them if you try to install them."
+"during an update operation. When there is no valid signature for 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 <literal>false</literal>.  Concept, implications as "
+"well as alternatives are detailed in &apt-secure;."

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


@@ -3766,125 +3854,14 @@ msgid ""
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 "default is to disable signing and produce all binaries."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml
-msgid "dpkg trigger usage (and related options)"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml
-msgid ""
-"Note that it is not guaranteed that APT will support these options or that "
-"these options will not cause (big) trouble in the future. If you have "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
-"call).  See &dpkg; if you are interested in what this actually means. In "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

 #: apt.conf.5.xml
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
 #: apt.conf.5.xml
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "

-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."

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


@@ -3897,8 +3874,8 @@ msgstr ""
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "

-"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
-"for the brief documentation of these options."
+"<literal>/usr/lib/apt/apt.systemd.daily</literal> script. See the top of "
+"this script for the brief documentation of these options."

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


@@ -4148,7 +4125,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml

-#, fuzzy

 msgid "Examples"
 msgstr "Exemplos"
 
 msgid "Examples"
 msgstr "Exemplos"
 


@@ -4162,9 +4138,8 @@ msgstr ""
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml

-#, fuzzy

 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."

-msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgstr "&apt-cache;, &apt-config;, &apt-preferences;."

 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt_preferences.5.xml


@@ -4267,11 +4242,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid "APT::Default-Release \"stable\";\n"
 msgid "APT::Default-Release \"stable\";\n"

-msgstr ""
-"<programlisting>\n"
-"APT::Default-Release \"stable\";\n"
+msgstr "APT::Default-Release \"stable\";\n"

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


@@ -4533,15 +4506,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid ""
 "Package: perl\n"
 "Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 msgid ""
 "Package: perl\n"
 "Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""

-"<programlisting>\n"

 "Package: perl\n"
 "Package: perl\n"

-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"

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


@@ -4575,13 +4547,12 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid ""
 "Package: *\n"
 "Pin: origin \"\"\n"
 "Pin-Priority: 999\n"
 msgstr ""
 msgid ""
 "Package: *\n"
 "Pin: origin \"\"\n"
 "Pin-Priority: 999\n"
 msgstr ""

-"<programlisting>\n"

 "Package: *\n"
 "Pin: origin \"\"\n"
 "Pin-Priority: 999\n"
 "Package: *\n"
 "Pin: origin \"\"\n"
 "Pin-Priority: 999\n"


@@ -4597,15 +4568,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid ""
 "Package: *\n"
 "Pin: origin \"ftp.de.debian.org\"\n"
 "Pin-Priority: 999\n"
 msgstr ""
 msgid ""
 "Package: *\n"
 "Pin: origin \"ftp.de.debian.org\"\n"
 "Pin-Priority: 999\n"
 msgstr ""

-"<programlisting>\n"

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

-"Pin: origin \"\"\n"
+"Pin: origin \"ftp.de.debian.org\"\n"

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


@@ -4639,13 +4609,12 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid ""
 "Package: *\n"
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
 msgstr ""
 msgid ""
 "Package: *\n"
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
 msgstr ""

-"<programlisting>\n"

 "Package: *\n"
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
 "Package: *\n"
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"


@@ -4655,8 +4624,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The following record assigns a high priority to all package versions "
 #, fuzzy
 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 ""
 "O registro a seguir atribui uma prioridade baixa para todas as versões de "
 "pacote que pertençam a qualquer distribuição cujo nome do Repositório seja "
 msgstr ""
 "O registro a seguir atribui uma prioridade baixa para todas as versões de "
 "pacote que pertençam a qualquer distribuição cujo nome do Repositório seja "


@@ -4664,16 +4633,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

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

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

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

-"<programlisting>\n"

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

-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Pin: release n=&debian-testing-codename;\n"
+"Pin-Priority: 900\n"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml


@@ -4681,7 +4649,8 @@ 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 ""
 "O registro a seguir atribui uma prioridade alta para todas as versões de "
 "pacotes que pertençam a qualquer versão cujo nome do Repositório seja "
 msgstr ""
 "O registro a seguir atribui uma prioridade alta para todas as versões de "
 "pacotes que pertençam a qualquer versão cujo nome do Repositório seja "


@@ -4690,16 +4659,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid ""
 "Package: *\n"
 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 ""
 "Pin-Priority: 500\n"
 msgstr ""

-"<programlisting>\n"

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

-"Pin: release a=unstable, v=3.0\n"
-"Pin-Priority: 50\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"
+"Pin-Priority: 500\n"

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


@@ -4727,16 +4695,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid ""
 "Package: gnome* /kde/\n"
 "Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 msgid ""
 "Package: gnome* /kde/\n"
 "Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""

-"<programlisting>\n"
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Package: gnome* /kde/\n"
+"Pin: release a=experimental\n"
+"Pin-Priority: 500\n"

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


@@ -4748,16 +4715,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid ""
 "Package: *\n"
 "Pin: release n=&ubuntu-codename;*\n"
 "Pin-Priority: 990\n"
 msgstr ""
 msgid ""
 "Package: *\n"
 "Pin: release n=&ubuntu-codename;*\n"
 "Pin-Priority: 990\n"
 msgstr ""

-"<programlisting>\n"

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

-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
+"Pin: release n=&ubuntu-codename;*\n"
+"Pin-Priority: 990\n"

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


@@ -4913,7 +4879,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid ""
 "Package: perl\n"
 "Pin: version &good-perl;*\n"
 msgid ""
 "Package: perl\n"
 "Pin: version &good-perl;*\n"


@@ -4927,9 +4893,8 @@ msgid ""
 "Pin: release unstable\n"
 "Pin-Priority: 50\n"
 msgstr ""
 "Pin: release unstable\n"
 "Pin-Priority: 50\n"
 msgstr ""

-"<programlisting>\n"

 "Package: perl\n"
 "Package: perl\n"

-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"

 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"


@@ -5058,11 +5023,11 @@ 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 ""
 "O arquivo <filename>Release</filename> é normalmente encontrado no diretório "
 "<filename>.../dists/<replaceable>nome-distribuição</replaceable></"
 msgstr ""
 "O arquivo <filename>Release</filename> é normalmente encontrado no diretório "
 "<filename>.../dists/<replaceable>nome-distribuição</replaceable></"


@@ -5100,11 +5065,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid "Pin: release a=stable\n"
 msgid "Pin: release a=stable\n"

-msgstr ""
-"<programlisting>\n"
-"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
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml


@@ -5117,11 +5080,11 @@ msgstr "a linha <literal>Component:</literal>"
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 #, fuzzy
 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 ""
 "dá nome ao repositório para o qual todos os pacotes na àrvore de diretório "
 "pertencem. Por exemplo, a linha \"Archive: stable\" especifica que todos os "
 msgstr ""
 "dá nome ao repositório para o qual todos os pacotes na àrvore de diretório "
 "pertencem. Por exemplo, a linha \"Archive: stable\" especifica que todos os "


@@ -5132,19 +5095,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
-msgid "Pin: release n=&testing-codename;\n"
-msgstr ""
-"<programlisting>\n"
-"Pin: release a=stable\n"
+#, no-wrap
+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
 #, fuzzy
 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
 #, fuzzy
 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."
 "<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."


@@ -5158,16 +5119,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid ""
 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 ""

-"<programlisting>\n"
-"Pin: release v=3.0\n"
-"Pin: release a=stable v=3.0\n"
-"Pin: release 3.0\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


@@ -5196,11 +5156,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid "Pin: release c=main\n"
 msgid "Pin: release c=main\n"

-msgstr ""
-"<programlisting>\n"
-"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
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml


@@ -5226,9 +5184,7 @@ msgstr ""
 #: apt_preferences.5.xml
 #, fuzzy, no-wrap
 msgid "Pin: release o=Debian\n"
 #: apt_preferences.5.xml
 #, fuzzy, no-wrap
 msgid "Pin: release o=Debian\n"

-msgstr ""
-"<programlisting>\n"
-"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
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml


@@ -5251,11 +5207,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid "Pin: release l=Debian\n"
 msgid "Pin: release l=Debian\n"

-msgstr ""
-"<programlisting>\n"
-"Pin: release l=Debian\n"
+msgstr "Pin: release l=Debian\n"

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


@@ -5403,7 +5357,7 @@ msgstr "Acompanhando a Testing"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid ""
 "Package: *\n"
 "Pin: release a=testing\n"
 msgid ""
 "Package: *\n"
 "Pin: release a=testing\n"


@@ -5417,7 +5371,6 @@ msgid ""
 "Pin: release o=Debian\n"
 "Pin-Priority: -10\n"
 msgstr ""
 "Pin: release o=Debian\n"
 "Pin-Priority: -10\n"
 msgstr ""

-"<programlisting>\n"

 "Package: *\n"
 "Pin: release a=testing\n"
 "Pin-Priority: 900\n"
 "Package: *\n"
 "Pin: release a=testing\n"
 "Pin-Priority: 900\n"


@@ -5462,11 +5415,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"

-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/unstable\n"
+msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n"

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


@@ -5498,9 +5449,9 @@ msgstr ""
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
 #, 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 &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"


@@ -5544,7 +5495,7 @@ 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 ""
 "Com um arquivo &sources-list; apropriado e o arquivo de preferências acima, "
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Com um arquivo &sources-list; apropriado e o arquivo de preferências acima, "


@@ -5553,11 +5504,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml

-#, fuzzy, no-wrap
+#, no-wrap

 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"

-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
+msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"

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


@@ -5566,10 +5515,10 @@ 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 ""
 "O comando a seguir fará com que o APT atualize o pacote especificado para a "
 "última versão da distribuição <literal>unstable</literal>. Assim, o comando "
 msgstr ""
 "O comando a seguir fará com que o APT atualize o pacote especificado para a "
 "última versão da distribuição <literal>unstable</literal>. Assim, o comando "


@@ -5581,7 +5530,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml

-#, fuzzy

 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 


@@ -5712,8 +5660,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> "


@@ -5868,9 +5816,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>


@@ -5912,6 +5861,17 @@ msgid ""
 "detect and error out on such anomalies."
 msgstr ""
 
 "detect and error out on such anomalies."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Allow-Insecure</option> (<option>allow-insecure</option>), "
+"<option>Allow-Weak</option> (<option>allow-weak</option>) and <option>Allow-"
+"Downgrade-To-Insecure</option> (<option>allow-downgrade-to-insecure</"
+"option>)  are boolean values which all default to <literal>no</literal>.  If "
+"set to <literal>yes</literal> they circumvent parts of &apt-secure; and "
+"should therefore not be used lightly!"
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 msgid ""


@@ -5934,13 +5894,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>


@@ -6137,8 +6098,8 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 #: sources.list.5.xml
 #, no-wrap
 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://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"

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


@@ -6146,13 +6107,13 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb\n"
 #, no-wrap
 msgid ""
 "Types: deb\n"

-"URIs: http://httpredir.debian.org/debian\n"
-"Suites: &stable-codename;\n"
+"URIs: http://deb.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"

 "Components: main\n"
 "\n"
 "Types: deb\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"

-"URIs: http://httpredir.debian.org/debian\n"
-"Suites: &stable-codename;\n"
+"URIs: http://deb.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"

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


@@ -6184,13 +6145,13 @@ msgstr ""
 #: 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 ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap

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

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


@@ -6199,7 +6160,7 @@ msgstr ""
 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"
 msgstr ""
 
 "Components: contrib"
 msgstr ""
 


@@ -6266,12 +6227,12 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""

-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"

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


@@ -6279,16 +6240,15 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"

-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"

 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml

-#, fuzzy
-msgid "&apt-get;, &apt-conf;"
-msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+msgid "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
+msgstr "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"

 
 #. 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


@@ -6458,14 +6418,15 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "

-"<filename>Packages</filename> and <filename>Sources</filename> files and "
-"ones compressed with <command>gzip</command>, <command>bzip2</command> or "
-"<command>lzma</command> as well as <filename>Release</filename> and "
-"<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
-"Release::Default-Patterns</literal>). Additional filename patterns can be "
-"added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a <filename>Release</filename> file "
-"containing (by default) an MD5, SHA1, SHA256 and SHA512 digest for each file."
+"and compressed <filename>Packages</filename>, <filename>Sources</filename>, "
+"<filename>Contents</filename>, <filename>Components</filename> and "
+"<filename>icons</filename> files as well as <filename>Release</filename>, "
+"<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
+"default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
+"Additional filename patterns can be added by listing them in <literal>APT::"
+"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
+"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
+"SHA256 and SHA512 digest for each file."

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


@@ -6473,11 +6434,13 @@ msgstr ""
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"

-"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
-"supported fields are: <literal>Origin</literal>, <literal>Label</literal>, "
+"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The "
+"supported fields are <literal>Origin</literal>, <literal>Label</literal>, "

 "<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
 "<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"

-"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
-"<literal>Architectures</literal>, <literal>Components</literal>, "
+"literal>, <literal>Date</literal>, <literal>NotAutomatic</literal>, "
+"<literal>ButAutomaticUpgrades</literal>, <literal>Acquire-By-Hash</literal>, "
+"<literal>Valid-Until</literal>, <literal>Signed-By</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal> and "

 "<literal>Description</literal>."
 msgstr ""
 
 "<literal>Description</literal>."
 msgstr ""
 


@@ -6578,9 +6541,9 @@ msgstr ""
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "

-"is a string that contains a space separated list of at least one of: '.' (no "
-"compression), 'gzip' and 'bzip2'. The default for all compression schemes is "
-"'. gzip'."
+"is a string that contains a space separated list of at least one of the "
+"compressors configured via the <option>APT::Compressor</option> "
+"configuration scope.  The default for all compression schemes is '. gzip'."

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


@@ -6779,7 +6742,7 @@ 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 ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>


@@ -8208,6 +8171,14 @@ msgstr ""
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 

+#, fuzzy
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt.conf</>"
+
+#, fuzzy
+#~ msgid "&apt-get;, &apt-conf;"
+#~ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+

 #, fuzzy
 #~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 #~ msgstr "a linha <literal>Package:</literal>"
 #, fuzzy
 #~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 #~ msgstr "a linha <literal>Package:</literal>"