* doc/apt-secure.8.xml:

  - review and fix typo, grammar and style issues

debian/changelog

@@ -20,18 +20,15 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   * doc/apt-cdrom.8.xml:
     - replace CDROM with the proper CD-ROM in text
     - correct disc vs. disk issues
-  * doc/apt-config.8.xml:
-    - review and fix spelling issues
   * doc/apt-extracttemplates.1.xml:
     - debconf is not DebConf
   * doc/apt-get.8.xml:
     - move dselect-upgrade below dist-upgrade
     - review and fix spelling issues
-  * doc/apt-ftparchive.8.xml:
-    - fix typo, grammar and style issues
-  * doc/apt-key.8.xml, doc/apt-mark.8.xml,
-    doc/apt_preferences.5.xml:
-    - review and fix spelling issues
+  * doc/apt-ftparchive.8.xml, doc/apt-config.8.xml,
+    doc/apt-key.8.xml, doc/apt-mark.8.xml,
+    doc/apt_preferences.5.xml, doc/apt-secure.8.xml:
+    - review and fix typo, grammar and style issues
 
   [ Robert Luberda ]
   * Polish manpage translation update (Closes: #675603)
@@ -42,7 +39,7 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   * French program and manpage translation update
   * Danish program translation by Joe Hansen. Closes: #675605
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 24 May 2012 19:40:58 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 06 Jun 2012 23:54:01 +0200
 
 apt (0.9.5.1) unstable; urgency=low
 

doc/apt-secure.8.xml

@@ -57,11 +57,11 @@
    </para>
 
    <para>
-   If a package comes from a archive without a signature or with a
-   signature that apt does not have a key for that package is
-   considered untrusted and installing it will result in a big
+   If a package comes from a archive without a signature, or with a
+   signature that apt does not have a key for, that package is
+   considered untrusted, and installing it will result in a big
    warning. <command>apt-get</command> will currently only warn
-   for unsigned archives, future releases might force all sources
+   for unsigned archives; future releases might force all sources
    to be verified before downloading packages from them.
    </para>
 
@@ -75,11 +75,11 @@
 
    <para> 
    The chain of trust from an apt archive to the end user is made up of
-   different steps. <command>apt-secure</command> is the last step in
-   this chain, trusting an archive does not mean that the packages
-   that you trust it do not contain malicious code but means that you
-   trust the archive maintainer. It's the archive maintainer
-   responsibility to ensure that the archive integrity is correct.
+   several steps. <command>apt-secure</command> is the last step in
+   this chain; trusting an archive does not mean that you trust its
+   packages not to contain malicious code, but means that you
+   trust the archive maintainer. It's the archive maintainer's
+   responsibility to ensure that the archive's integrity is preserved.
    </para>
 
    <para>apt-secure does not review signatures at a
@@ -90,30 +90,29 @@
 
    <para>
    The chain of trust in Debian starts when a maintainer uploads a new
-   package or a new version of a package to the Debian archive. This
-   upload in order to become effective needs to be signed by a key of
-   a maintainer within the Debian maintainer's keyring (available in
-   the debian-keyring package). Maintainer's keys are signed by
+   package or a new version of a package to the Debian archive. In
+   order to become effective, this upload needs to be signed by a key
+   contained in the Debian Maintainers keyring (available in
+   the debian-keyring package). Maintainers' keys are signed by
    other maintainers following pre-established procedures to
    ensure the identity of the key holder.
    </para>
 
    <para>
    Once the uploaded package is verified and included in the archive,
-   the maintainer signature is stripped off, an MD5 sum of the package
-   is computed and put in the Packages file. The MD5 sum of all of the
-   packages files are then computed and put into the Release file. The
-   Release file is then signed by the archive key (which is created
-   once a year) and distributed through the FTP server. This key is
-   also on the Debian keyring.
+   the maintainer signature is stripped off, and checksums of the package
+   are computed and put in the Packages file. The checksums of all of the
+   Packages files are then computed and put into the Release file. The
+   Release file is then signed by the archive key for this Debian release
+   and distributed alongside the packages and the Packages files on
+   Debian mirrors. The keys are in the Debian archive keyring available in
+   the <package>debian-archive-keyring</package> package.
    </para>
 
    <para>
-   Any end user can check the signature of the Release file, extract the MD5
-   sum of a package from it and compare it with the MD5 sum of the
-   package he downloaded. Prior to version 0.6 only the MD5 sum of the
-   downloaded Debian package was checked. Now both the MD5 sum and the
-   signature of the Release file are checked.
+   End users can check the signature of the Release file, extract a checksum
+   of a package from it and compare it with the checksum of the package
+   they downloaded by hand - or rely on APT doing this automatically.
    </para>
 
    <para>Notice that this is distinct from checking signatures on a
@@ -122,11 +121,11 @@
 
     <itemizedlist>
        <listitem><para><literal>Network "man in the middle"
-       attacks</literal>. Without signature checking, a malicious
-       agent can introduce himself in the package download process and
+       attacks</literal>. Without signature checking, malicious
+       agents can introduce themselves into the package download process and
        provide malicious software either by controlling a network
        element (router, switch, etc.) or by redirecting traffic to a
-       rogue server (through arp or DNS spoofing
+       rogue server (through ARP or DNS spoofing
        attacks).</para></listitem>
  
        <listitem><para><literal>Mirror network compromise</literal>.
@@ -145,8 +144,8 @@
  <refsect1><title>User configuration</title>
    <para>
    <command>apt-key</command> is the program that manages the list
-   of keys used by apt. It can be used to add or remove keys although
-   an installation of this release will automatically provide the
+   of keys used by apt. It can be used to add or remove keys, although
+   an installation of this release will automatically contain the
    default Debian archive signing keys used in the Debian package
    repositories.
    </para>
@@ -183,9 +182,9 @@
 
     </itemizedlist>
 
-    <para>Whenever the contents of the archive changes (new packages
+    <para>Whenever the contents of the archive change (new packages
     are added or removed) the archive maintainer has to follow the
-    first two steps previously outlined.</para>
+    first two steps outlined above.</para>
 
 </refsect1>
 

doc/apt-verbatim.ent

@@ -222,6 +222,12 @@
 <!ENTITY stable-version "6.0">
 <!ENTITY ubuntu-codename "precise">
 
+<!-- good and bad just refers to matching and not matching a pattern…
+     It is not a remark about the specific perl version.
+     There is no way perl could be clasified "good" (or "bad") in any version… -->
+<!ENTITY good-perl "5.10">
+<!ENTITY bad-perl "5.14">
+
 <!-- Arguments -->
 <!ENTITY synopsis-arg-option "<arg><option>-o=<replaceable>&synopsis-config-string;</replaceable></option></arg>">
 <!ENTITY synopsis-arg-config "<arg><option>-c=<filename><replaceable>&synopsis-config-file;</replaceable></filename></option></arg>">

doc/apt_preferences.5.xml

@@ -8,9 +8,6 @@
 <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
 %aptverbatiment;
 
-<!ENTITY good-perl "5.10">
-<!ENTITY bad-perl "5.14">
-
 ]>
 
 <refentry>

doc/po/apt-doc.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.5.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 15:23+0300\n"
+"POT-Creation-Date: 2012-06-06 23:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1110,7 +1110,7 @@ msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
+#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "See Also"
 msgstr ""
 
@@ -1805,10 +1805,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:60
 msgid ""
-"If a package comes from a archive without a signature or with a signature "
-"that apt does not have a key for that package is considered untrusted and "
+"If a package comes from a archive without a signature, or with a signature "
+"that apt does not have a key for, that package is considered untrusted, and "
 "installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives, future releases might force all "
+"currently only warn for unsigned archives; future releases might force all "
 "sources to be verified before downloading packages from them."
 msgstr ""
 
@@ -1827,12 +1827,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:77
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of "
-"different steps. <command>apt-secure</command> is the last step in this "
-"chain, trusting an archive does not mean that the packages that you trust it "
-"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
-"archive integrity is correct."
+"The chain of trust from an apt archive to the end user is made up of several "
+"steps. <command>apt-secure</command> is the last step in this chain; "
+"trusting an archive does not mean that you trust its packages not to contain "
+"malicious code, but means that you trust the archive maintainer. It's the "
+"archive maintainer's responsibility to ensure that the archive's integrity "
+"is preserved."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1848,53 +1848,53 @@ msgstr ""
 #: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. This upload in order to "
-"become effective needs to be signed by a key of a maintainer within the "
-"Debian maintainer's keyring (available in the debian-keyring "
-"package). Maintainer's keys are signed by other maintainers following "
-"pre-established procedures to ensure the identity of the key holder."
+"or a new version of a package to the Debian archive. In order to become "
+"effective, this upload needs to be signed by a key contained in the Debian "
+"Maintainers keyring (available in the debian-keyring package). Maintainers' "
+"keys are signed by other maintainers following pre-established procedures to "
+"ensure the identity of the key holder."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:102
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
-"maintainer signature is stripped off, an MD5 sum of the package is computed "
-"and put in the Packages file. The MD5 sum of all of the packages files are "
-"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"maintainer signature is stripped off, and checksums of the package are "
+"computed and put in the Packages file. The checksums of all of the Packages "
+"files are then computed and put into the Release file. The Release file is "
+"then signed by the archive key for this Debian release and distributed "
+"alongside the packages and the Packages files on Debian mirrors. The keys "
+"are in the Debian archive keyring available in the "
+"<package>debian-archive-keyring</package> package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:113
 msgid ""
-"Any end user can check the signature of the Release file, extract the MD5 "
-"sum of a package from it and compare it with the MD5 sum of the package he "
-"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian "
-"package was checked. Now both the MD5 sum and the signature of the Release "
-"file are checked."
+"End users can check the signature of the Release file, extract a checksum of "
+"a package from it and compare it with the checksum of the package they "
+"downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:119
+#: apt-secure.8.xml:118
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:124
+#: apt-secure.8.xml:123
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
-"checking, a malicious agent can introduce himself in the package download "
-"process and provide malicious software either by controlling a network "
-"element (router, switch, etc.) or by redirecting traffic to a rogue server "
-"(through arp or DNS spoofing attacks)."
+"checking, malicious agents can introduce themselves into the package "
+"download process and provide malicious software either by controlling a "
+"network element (router, switch, etc.) or by redirecting traffic to a rogue "
+"server (through ARP or DNS spoofing attacks)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:131
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -1903,7 +1903,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:139
+#: apt-secure.8.xml:138
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -1912,21 +1912,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:145
+#: apt-secure.8.xml:144
 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:146
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys although an installation of "
-"this release will automatically provide the default Debian archive signing "
+"by apt. It can be used to add or remove keys, although an installation of "
+"this release will automatically contain the default Debian archive signing "
 "keys used in the Debian package repositories."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:153
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -1937,19 +1937,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:162
 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:164
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:170
+#: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive "
@@ -1957,7 +1957,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg "
 "--clearsign -o InRelease Release</command> and <command>gpg -abs -o "
@@ -1965,7 +1965,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:178
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -1973,22 +1973,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:185
 msgid ""
-"Whenever the contents of the archive changes (new packages are added or "
-"removed) the archive maintainer has to follow the first two steps previously "
-"outlined."
+"Whenever the contents of the archive change (new packages are added or "
+"removed) the archive maintainer has to follow the first two steps outlined "
+"above."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:194
+#: apt-secure.8.xml:193
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:198
+#: apt-secure.8.xml:197
 msgid ""
 "For more background information you might want to review the <ulink "
 "url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -1999,12 +1999,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:211
+#: apt-secure.8.xml:210
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:213
+#: apt-secure.8.xml:212
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -3819,7 +3819,8 @@ msgid ""
 "specified packages with a specified version or version range.  For example, "
 "the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
-"\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
+"\"<literal>&good-perl;</literal>\".  Multiple packages can be separated by "
+"spaces."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -3827,7 +3828,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 
@@ -4092,7 +4093,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -4114,9 +4115,10 @@ msgstr ""
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>5.8</literal>\".  If <emphasis>any</emphasis> 5.8* version of "
-"<literal>perl</literal> is available and the installed version is 5.9*, then "
-"<literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> "
+"&good-perl;* version of <literal>perl</literal> is available and the "
+"installed version is &bad-perl;*, then <literal>perl</literal> will be "
+"downgraded."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

doc/po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 14:56+0300\n"
+"POT-Creation-Date: 2012-06-06 23:46+0300\n"
 "PO-Revision-Date: 2012-05-21 23:18+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1587,7 +1587,7 @@ msgstr "Dateien"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:192 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
 #: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
@@ -2581,10 +2581,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:60
 msgid ""
-"If a package comes from a archive without a signature or with a signature "
-"that apt does not have a key for that package is considered untrusted and "
+"If a package comes from a archive without a signature, or with a signature "
+"that apt does not have a key for, that package is considered untrusted, and "
 "installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives, future releases might force all "
+"currently only warn for unsigned archives; future releases might force all "
 "sources to be verified before downloading packages from them."
 msgstr ""
 "Wenn ein Paket aus einem Archiv ohne Signatur stammt oder einem mit "
@@ -2611,12 +2611,12 @@ msgstr "Vertrauenswürdige Archive"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:77
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of "
-"different steps. <command>apt-secure</command> is the last step in this "
-"chain, trusting an archive does not mean that the packages that you trust it "
-"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
-"archive integrity is correct."
+"The chain of trust from an apt archive to the end user is made up of several "
+"steps. <command>apt-secure</command> is the last step in this chain; "
+"trusting an archive does not mean that you trust its packages not to contain "
+"malicious code, but means that you trust the archive maintainer. It's the "
+"archive maintainer's responsibility to ensure that the archive's integrity "
+"is preserved."
 msgstr ""
 "Eine Kette des Vertrauens von einem APT-Archiv zum Endanwender wird durch "
 "verschiedene Schritte erreicht. <command>apt-secure</command> ist der letzte "
@@ -2643,11 +2643,11 @@ msgstr ""
 #: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. This upload in order to "
-"become effective needs to be signed by a key of a maintainer within the "
-"Debian maintainer's keyring (available in the debian-keyring package). "
-"Maintainer's keys are signed by other maintainers following pre-established "
-"procedures to ensure the identity of the key holder."
+"or a new version of a package to the Debian archive. In order to become "
+"effective, this upload needs to be signed by a key contained in the Debian "
+"Maintainers keyring (available in the debian-keyring package). Maintainers' "
+"keys are signed by other maintainers following pre-established procedures to "
+"ensure the identity of the key holder."
 msgstr ""
 "Die Kette des Vertrauens in Debian beginnt, wenn eine Betreuer ein neues "
 "Paket oder eine neue Version eines Pakets in das Debian-Archiv hochlädt. "
@@ -2659,13 +2659,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "Once the uploaded package is verified and included in the archive, the "
+#| "maintainer signature is stripped off, and an MD5 sum of the package is "
+#| "computed and put in the Packages file. The MD5 sums of all of the "
+#| "Packages files are then computed and put into the Release file. The "
+#| "Release file is then signed by the archive key (which is created once a "
+#| "year) and distributed through the FTP server. This key is also on the "
+#| "Debian keyring."
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
-"maintainer signature is stripped off, an MD5 sum of the package is computed "
-"and put in the Packages file. The MD5 sum of all of the packages files are "
-"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"maintainer signature is stripped off, and checksums of the package are "
+"computed and put in the Packages file. The checksums of all of the Packages "
+"files are then computed and put into the Release file. The Release file is "
+"then signed by the archive key for this Debian release and distributed "
+"alongside the packages and the Packages files on Debian mirrors. The keys "
+"are in the Debian archive keyring available in the <package>debian-archive-"
+"keyring</package> package."
 msgstr ""
 "Sobald das hochgeladenen Paket überprüft und in das Archiv hinzugefügt "
 "wurde, wird die Betreuersignatur entfernt, eine MD5-Summe des Pakets "
@@ -2676,13 +2687,18 @@ msgstr ""
 "Schlüsselbund."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:113
+#, fuzzy
+#| msgid ""
+#| "Any end user can check the signature of the Release file, extract the MD5 "
+#| "sum of a package from it and compare it with the MD5 sum of the package "
+#| "he downloaded. Prior to version 0.6 only the MD5 sum of the downloaded "
+#| "Debian package was checked. Now both the MD5 sum and the signature of the "
+#| "Release file are checked."
 msgid ""
-"Any end user can check the signature of the Release file, extract the MD5 "
-"sum of a package from it and compare it with the MD5 sum of the package he "
-"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian "
-"package was checked. Now both the MD5 sum and the signature of the Release "
-"file are checked."
+"End users can check the signature of the Release file, extract a checksum of "
+"a package from it and compare it with the checksum of the package they "
+"downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
 "Jeder Endanwender kann die Signatur der Release-Datei prüfen, die MD5-Summe "
 "eines Paketes daraus entpacken und mit der MD5-Summe des Pakets vergleichen, "
@@ -2691,7 +2707,7 @@ msgstr ""
 "auch die Signatur der Release-Datei geprüft."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:119
+#: apt-secure.8.xml:118
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2700,13 +2716,13 @@ msgstr ""
 "ist. Es wurde entworfen, um zwei mögliche Angriffe zu verhindern:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:124
+#: apt-secure.8.xml:123
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
-"checking, a malicious agent can introduce himself in the package download "
-"process and provide malicious software either by controlling a network "
-"element (router, switch, etc.) or by redirecting traffic to a rogue server "
-"(through arp or DNS spoofing attacks)."
+"checking, malicious agents can introduce themselves into the package "
+"download process and provide malicious software either by controlling a "
+"network element (router, switch, etc.) or by redirecting traffic to a rogue "
+"server (through ARP or DNS spoofing attacks)."
 msgstr ""
 "<literal>Network \"man in the middle\" attacks</literal>. Ohne "
 "Signaturprüfung kann ein schädlicher Mittelsmann sich selbst in das "
@@ -2716,7 +2732,7 @@ msgstr ""
 "oder DNS-Manipulationsangriffe) erfolgen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:131
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2729,7 +2745,7 @@ msgstr ""
 "Pakete von diesem Rechner herunterladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:139
+#: apt-secure.8.xml:138
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2742,16 +2758,16 @@ msgstr ""
 "Fall kann dieser Mechanismus eine Signatur pro Paket ergänzen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:145
+#: apt-secure.8.xml:144
 msgid "User configuration"
 msgstr "Benutzerkonfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:146
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys although an installation of "
-"this release will automatically provide the default Debian archive signing "
+"by apt. It can be used to add or remove keys, although an installation of "
+"this release will automatically contain the default Debian archive signing "
 "keys used in the Debian package repositories."
 msgstr ""
 "<command>apt-key</command> ist das Programm, das die Liste der von APT "
@@ -2761,7 +2777,7 @@ msgstr ""
 "den Debian-Paketdepots benutzt werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:153
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2779,12 +2795,12 @@ msgstr ""
 "herunterladen und prüfen kann."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:162
 msgid "Archive configuration"
 msgstr "Archivkonfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:164
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2793,7 +2809,7 @@ msgstr ""
 "stellen möchten, müssen Sie:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:170
+#: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2804,7 +2820,7 @@ msgstr ""
 "<command>apt-ftparchive release</command> (aus apt-utils) ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2815,7 +2831,7 @@ msgstr ""
 "abs -o Release.gpg Release</command> ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:178
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2826,18 +2842,18 @@ msgstr ""
 "Dateien im Archiv zu authentifizieren."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:185
 msgid ""
-"Whenever the contents of the archive changes (new packages are added or "
-"removed) the archive maintainer has to follow the first two steps previously "
-"outlined."
+"Whenever the contents of the archive change (new packages are added or "
+"removed) the archive maintainer has to follow the first two steps outlined "
+"above."
 msgstr ""
 "Immer wenn sich die Inhalte des Archivs ändern (neue Pakete hinzugefügt oder "
 "entfernt werden), muss der Archivbetreuer den beiden zuerst skizzierten "
 "Schritten folgen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:194
+#: apt-secure.8.xml:193
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
@@ -2846,7 +2862,7 @@ msgstr ""
 "&debsign; &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:198
+#: apt-secure.8.xml:197
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2863,12 +2879,12 @@ msgstr ""
 ">Strong Distribution HOWTO</ulink> von V. Alex Brennen lesen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:211
+#: apt-secure.8.xml:210
 msgid "Manpage Authors"
 msgstr "Autoren der Handbuchseite"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:213
+#: apt-secure.8.xml:212
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -5588,37 +5604,31 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:187
-#, fuzzy
-#| msgid ""
-#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-#| "specified packages and specified version or version range.  For example, "
-#| "the following record assigns a high priority to all versions of the "
-#| "<filename>perl</filename> package whose version number begins with "
-#| "\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
 "the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
-"\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
+"\"<literal>&good-perl;</literal>\".  Multiple packages can be separated by "
+"spaces."
 msgstr ""
 "Die spezielle Form weist die Priorität (eine »Pin-Priorität«) einem oder "
 "mehreren angegebenen Paketen und angegebenen Versionen oder "
 "Versionsbereichen zu. Der folgende Datensatz weist zum Beispiel allen "
 "Versionen des <filename>perl</filename>-Pakets eine höhere Priorität zu, "
-"deren Versionsnummer mit »<literal>5.8</literal>« beginnt. Mehrere Pakete "
-"können durch Leerzeichen getrennt werden."
+"deren Versionsnummer mit »<literal>&good-perl;</literal>« beginnt. Mehrere "
+"Pakete können durch Leerzeichen getrennt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 "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>
@@ -5778,10 +5788,10 @@ msgstr "Reguläre Ausdrücke und &glob;-Syntax"
 #: apt_preferences.5.xml:264
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
-"surrounded by slashes. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a &glob;"
-"-like expression) or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
+"surrounded by slashes. For example, the following example assigns the "
+"priority 500 to all packages from experimental where the name starts with "
+"gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
+"extended regular expression surrounded by slashes)."
 msgstr ""
 "APT unterstützt außerdem Pinning mittels &glob;-Ausdrücken und regulären "
 "Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist "
@@ -5968,7 +5978,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -5980,7 +5990,7 @@ msgid ""
 "Pin-Priority: 50\n"
 msgstr ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -6001,15 +6011,15 @@ msgstr "Dann:"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>5.8</literal>\".  If <emphasis>any</emphasis> 5.8* version of "
-"<literal>perl</literal> is available and the installed version is 5.9*, then "
-"<literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
+"* version of <literal>perl</literal> is available and the installed version "
+"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "Es wird die aktuellste verfügbare Version des Pakets <literal>perl</literal> "
-"installiert, so lange die Versionsnummer mit »<literal>5.8</literal>« "
-"anfängt. Wenn <emphasis>irgendeine</emphasis> 5.8*-Version von "
-"<literal>perl</literal> verfügbar ist und die installierte Version 5.9* ist, "
-"dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
+"installiert, so lange die Versionsnummer mit »<literal>&good-perl;</"
+"literal>« anfängt. Wenn <emphasis>irgendeine</emphasis> &good-perl;*-Version "
+"von <literal>perl</literal> verfügbar ist und die installierte Version &bad-"
+"perl;* ist, dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:379

doc/po/es.po

@@ -37,7 +37,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 14:56+0300\n"
+"POT-Creation-Date: 2012-06-06 23:46+0300\n"
 "PO-Revision-Date: 2010-08-25 03:25+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1635,7 +1635,7 @@ msgstr "Ficheros"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:192 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
 #: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
@@ -2628,10 +2628,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:60
 msgid ""
-"If a package comes from a archive without a signature or with a signature "
-"that apt does not have a key for that package is considered untrusted and "
+"If a package comes from a archive without a signature, or with a signature "
+"that apt does not have a key for, that package is considered untrusted, and "
 "installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives, future releases might force all "
+"currently only warn for unsigned archives; future releases might force all "
 "sources to be verified before downloading packages from them."
 msgstr ""
 "Si el paquete viene de un archivo sin una firma o con una firma de la que "
@@ -2657,12 +2657,12 @@ msgstr "Archivos de confianza"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:77
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of "
-"different steps. <command>apt-secure</command> is the last step in this "
-"chain, trusting an archive does not mean that the packages that you trust it "
-"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
-"archive integrity is correct."
+"The chain of trust from an apt archive to the end user is made up of several "
+"steps. <command>apt-secure</command> is the last step in this chain; "
+"trusting an archive does not mean that you trust its packages not to contain "
+"malicious code, but means that you trust the archive maintainer. It's the "
+"archive maintainer's responsibility to ensure that the archive's integrity "
+"is preserved."
 msgstr ""
 "La cadena de confianza desde un archivo apt a un usuario final se realiza en "
 "diferentes pasos. <command>apt-secure</command> es el último paso en esta "
@@ -2688,11 +2688,11 @@ msgstr ""
 #: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. This upload in order to "
-"become effective needs to be signed by a key of a maintainer within the "
-"Debian maintainer's keyring (available in the debian-keyring package). "
-"Maintainer's keys are signed by other maintainers following pre-established "
-"procedures to ensure the identity of the key holder."
+"or a new version of a package to the Debian archive. In order to become "
+"effective, this upload needs to be signed by a key contained in the Debian "
+"Maintainers keyring (available in the debian-keyring package). Maintainers' "
+"keys are signed by other maintainers following pre-established procedures to "
+"ensure the identity of the key holder."
 msgstr ""
 "La cadena de confianza de Debian comienza cuando un mantenedor sube un nuevo "
 "paquete o una nueva versión de un paquete al archivo de Debian. Para que la "
@@ -2704,13 +2704,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "Once the uploaded package is verified and included in the archive, the "
+#| "maintainer signature is stripped off, and an MD5 sum of the package is "
+#| "computed and put in the Packages file. The MD5 sums of all of the "
+#| "Packages files are then computed and put into the Release file. The "
+#| "Release file is then signed by the archive key (which is created once a "
+#| "year) and distributed through the FTP server. This key is also on the "
+#| "Debian keyring."
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
-"maintainer signature is stripped off, an MD5 sum of the package is computed "
-"and put in the Packages file. The MD5 sum of all of the packages files are "
-"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"maintainer signature is stripped off, and checksums of the package are "
+"computed and put in the Packages file. The checksums of all of the Packages "
+"files are then computed and put into the Release file. The Release file is "
+"then signed by the archive key for this Debian release and distributed "
+"alongside the packages and the Packages files on Debian mirrors. The keys "
+"are in the Debian archive keyring available in the <package>debian-archive-"
+"keyring</package> package."
 msgstr ""
 "Una vez subido el paquete se comprueba y se incluye en el archivo, se "
 "elimina la firma del mantenedor, se genera un resumen MD5 del paquete y se "
@@ -2721,13 +2732,18 @@ msgstr ""
 "registro de claves de Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:113
+#, fuzzy
+#| msgid ""
+#| "Any end user can check the signature of the Release file, extract the MD5 "
+#| "sum of a package from it and compare it with the MD5 sum of the package "
+#| "he downloaded. Prior to version 0.6 only the MD5 sum of the downloaded "
+#| "Debian package was checked. Now both the MD5 sum and the signature of the "
+#| "Release file are checked."
 msgid ""
-"Any end user can check the signature of the Release file, extract the MD5 "
-"sum of a package from it and compare it with the MD5 sum of the package he "
-"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian "
-"package was checked. Now both the MD5 sum and the signature of the Release "
-"file are checked."
+"End users can check the signature of the Release file, extract a checksum of "
+"a package from it and compare it with the checksum of the package they "
+"downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
 "Cualquier usuario final puede comprobar la firma del fichero «Release», "
 "extraer el resumen MD5 de un paquete y compararlo con el resumen MD5 del "
@@ -2736,7 +2752,7 @@ msgstr ""
 "MD5 y la firma del fichero «Release»."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:119
+#: apt-secure.8.xml:118
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2745,23 +2761,23 @@ msgstr ""
 "individualmente. Se diseñó para prevenir dos posible ataques:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:124
+#: apt-secure.8.xml:123
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
-"checking, a malicious agent can introduce himself in the package download "
-"process and provide malicious software either by controlling a network "
-"element (router, switch, etc.) or by redirecting traffic to a rogue server "
-"(through arp or DNS spoofing attacks)."
+"checking, malicious agents can introduce themselves into the package "
+"download process and provide malicious software either by controlling a "
+"network element (router, switch, etc.) or by redirecting traffic to a rogue "
+"server (through ARP or DNS spoofing attacks)."
 msgstr ""
 "<literal>Ataques de red «man in the middle» (persona entre medias)</"
 "literal>. Sin la comprobación de las firmas, una persona malvada puede "
 "introducirse en el proceso de descarga del paquete y proporcionar programas "
 "con contenido malicioso para controlar un elemento de la red (enrutador, "
 "switch, etc) o para redirigir el tráfico a un servidor ficticio (mediante "
-"ataques de envenenamiento de arp o de DNS)."
+"ataques de envenenamiento de ARP o de DNS)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:131
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2774,7 +2790,7 @@ msgstr ""
 "usuarios que descarguen paquetes de dicha réplica."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:139
+#: apt-secure.8.xml:138
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2787,16 +2803,16 @@ msgstr ""
 "una firma por paquete."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:145
+#: apt-secure.8.xml:144
 msgid "User configuration"
 msgstr "Configuración de usuario"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:146
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys although an installation of "
-"this release will automatically provide the default Debian archive signing "
+"by apt. It can be used to add or remove keys, although an installation of "
+"this release will automatically contain the default Debian archive signing "
 "keys used in the Debian package repositories."
 msgstr ""
 "<command>apt-key</command> es el programa que gestiona la lista de claves "
@@ -2806,7 +2822,7 @@ msgstr ""
 "paquetes de Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:153
 #, fuzzy
 #| msgid ""
 #| "In order to add a new key you need to first download it (you should make "
@@ -2830,12 +2846,12 @@ msgstr ""
 "<filename>Release.gpg</filename> de los archivos que estén configurados."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:162
 msgid "Archive configuration"
 msgstr "Configuración del archivo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:164
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2844,7 +2860,7 @@ msgstr ""
 "que:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:170
+#: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2855,7 +2871,7 @@ msgstr ""
 "utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:174
 #, fuzzy
 #| msgid ""
 #| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
@@ -2869,7 +2885,7 @@ msgstr ""
 "Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:178
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2880,18 +2896,18 @@ msgstr ""
 "del archivo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:185
 msgid ""
-"Whenever the contents of the archive changes (new packages are added or "
-"removed) the archive maintainer has to follow the first two steps previously "
-"outlined."
+"Whenever the contents of the archive change (new packages are added or "
+"removed) the archive maintainer has to follow the first two steps outlined "
+"above."
 msgstr ""
 "Cuando los contenidos del archivo cambien (se añadan paquetes nuevos o se "
 "eliminen) el mantenedor del archivo tiene que seguir los dos primeros pasos "
 "explicados anteriormente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:194
+#: apt-secure.8.xml:193
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
@@ -2900,7 +2916,7 @@ msgstr ""
 "&debsign; &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:198
+#: apt-secure.8.xml:197
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2917,12 +2933,12 @@ msgstr ""
 "una Distribución</ulink> de V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:211
+#: apt-secure.8.xml:210
 msgid "Manpage Authors"
 msgstr "Autores de la página del manual"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:213
+#: apt-secure.8.xml:212
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -5688,37 +5704,31 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:187
-#, fuzzy
-#| msgid ""
-#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-#| "specified packages and specified version or version range.  For example, "
-#| "the following record assigns a high priority to all versions of the "
-#| "<filename>perl</filename> package whose version number begins with "
-#| "\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
 "the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
-"\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
+"\"<literal>&good-perl;</literal>\".  Multiple packages can be separated by "
+"spaces."
 msgstr ""
 "El formato «específico» asigna una prioridad («Pin-Priority») a un paquete "
 "concreto y afecta a una versión especificada o rango de versiones. Por "
 "ejemplo, el siguiente registro asigna una prioridad alta a todas las "
 "versiones del paquete <filename>perl</filename> cuyo número de versión "
-"empiece con «<literal>5.8</literal>». Puede especificar varios paquetes "
-"separados por espacios."
+"empiece con «<literal>&good-perl;</literal>». Puede especificar varios "
+"paquetes separados por espacios."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 "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>
@@ -5879,10 +5889,10 @@ msgstr ""
 #: apt_preferences.5.xml:264
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
-"surrounded by slashes. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a &glob;"
-"-like expression) or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
+"surrounded by slashes. For example, the following example assigns the "
+"priority 500 to all packages from experimental where the name starts with "
+"gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
+"extended regular expression surrounded by slashes)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -6051,7 +6061,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -6063,7 +6073,7 @@ msgid ""
 "Pin-Priority: 50\n"
 msgstr ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -6084,15 +6094,15 @@ msgstr "Por ello:"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>5.8</literal>\".  If <emphasis>any</emphasis> 5.8* version of "
-"<literal>perl</literal> is available and the installed version is 5.9*, then "
-"<literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
+"* version of <literal>perl</literal> is available and the installed version "
+"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "La versión más reciente disponible del paquete <literal>perl</literal> se "
-"instalará siempre que el número de versión empiece con «<literal>5.8</"
-"literal>». De existir <emphasis>cualquier</emphasis> versión 5.8* disponible "
-"de <literal>perl</literal>, y si la versión instalada es 5.9*, se instalará "
-"la versión 5.8*, desactualizando el paquete."
+"instalará siempre que el número de versión empiece con «<literal>&good-perl;"
+"</literal>». De existir <emphasis>cualquier</emphasis> versión &good-perl;* "
+"disponible de <literal>perl</literal>, y si la versión instalada es &bad-"
+"perl;*, se instalará la versión &good-perl;*, desactualizando el paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:379

doc/po/fr.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 14:56+0300\n"
+"POT-Creation-Date: 2012-06-06 23:46+0300\n"
 "PO-Revision-Date: 2012-06-02 18:37+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -498,8 +498,7 @@ msgstr ""
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
-msgstr ""
-"<!ENTITY synopsis-config-string \"chaîne_de_configuration\">"
+msgstr "<!ENTITY synopsis-config-string \"chaîne_de_configuration\">"
 
 #. type: Plain text
 #: apt.ent:201
@@ -514,8 +513,7 @@ msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
-msgstr ""
-"<!ENTITY synopsis-target-release \"publication_cible\">"
+msgstr "<!ENTITY synopsis-target-release \"publication_cible\">"
 
 #. type: Plain text
 #: apt.ent:207
@@ -557,8 +555,7 @@ msgstr "<!ENTITY synopsis-regex \"expression_régulière\">"
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
-msgstr ""
-"<!ENTITY synopsis-cdrom-mount \"point_de_montage_CD-ROM\">"
+msgstr "<!ENTITY synopsis-cdrom-mount \"point_de_montage_CD-ROM\">"
 
 #. type: Plain text
 #: apt.ent:225
@@ -566,8 +563,7 @@ msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
 "\"temporary_directory\">"
-msgstr ""
-"<!ENTITY synopsis-tmp-directory \"répertoire_temporaire\">"
+msgstr "<!ENTITY synopsis-tmp-directory \"répertoire_temporaire\">"
 
 #. type: Plain text
 #: apt.ent:228
@@ -581,8 +577,7 @@ msgstr "<!ENTITY synopsis-filename \"nom_de_fichier\">"
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
-msgstr ""
-"<!ENTITY synopsis-path \"chemin\">"
+msgstr "<!ENTITY synopsis-path \"chemin\">"
 
 #. type: Plain text
 #: apt.ent:234
@@ -590,8 +585,7 @@ msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
 "\"override-file\">"
-msgstr ""
-"<!ENTITY synopsis-override \"fichier-override\">"
+msgstr "<!ENTITY synopsis-override \"fichier-override\">"
 
 #. type: Plain text
 #: apt.ent:237
@@ -599,8 +593,7 @@ msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
 "\"pathprefix\">"
-msgstr ""
-"<!ENTITY synopsis-pathprefix \"préfixe_de_chemin\">"
+msgstr "<!ENTITY synopsis-pathprefix \"préfixe_de_chemin\">"
 
 #. type: Plain text
 #: apt.ent:240
@@ -1594,7 +1587,7 @@ msgstr "Fichiers"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:192 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
 #: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
@@ -2557,10 +2550,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:60
 msgid ""
-"If a package comes from a archive without a signature or with a signature "
-"that apt does not have a key for that package is considered untrusted and "
+"If a package comes from a archive without a signature, or with a signature "
+"that apt does not have a key for, that package is considered untrusted, and "
 "installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives, future releases might force all "
+"currently only warn for unsigned archives; future releases might force all "
 "sources to be verified before downloading packages from them."
 msgstr ""
 "Quand un paquet provient d'une archive sans signature ou d'une archive avec "
@@ -2587,12 +2580,12 @@ msgstr "Trusted archives"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:77
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of "
-"different steps. <command>apt-secure</command> is the last step in this "
-"chain, trusting an archive does not mean that the packages that you trust it "
-"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
-"archive integrity is correct."
+"The chain of trust from an apt archive to the end user is made up of several "
+"steps. <command>apt-secure</command> is the last step in this chain; "
+"trusting an archive does not mean that you trust its packages not to contain "
+"malicious code, but means that you trust the archive maintainer. It's the "
+"archive maintainer's responsibility to ensure that the archive's integrity "
+"is preserved."
 msgstr ""
 "D'une archive apt jusqu'à l'utilisateur, la confiance se construit en "
 "plusieurs étapes. <command>Apt-secure</command> est la dernière étape. Faire "
@@ -2618,11 +2611,11 @@ msgstr ""
 #: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. This upload in order to "
-"become effective needs to be signed by a key of a maintainer within the "
-"Debian maintainer's keyring (available in the debian-keyring package). "
-"Maintainer's keys are signed by other maintainers following pre-established "
-"procedures to ensure the identity of the key holder."
+"or a new version of a package to the Debian archive. In order to become "
+"effective, this upload needs to be signed by a key contained in the Debian "
+"Maintainers keyring (available in the debian-keyring package). Maintainers' "
+"keys are signed by other maintainers following pre-established procedures to "
+"ensure the identity of the key holder."
 msgstr ""
 "La chaîne de confiance dans Debian commence quand un responsable de paquet "
 "envoie un nouveau paquet ou une nouvelle version d'un paquet dans l'archive. "
@@ -2634,13 +2627,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "Once the uploaded package is verified and included in the archive, the "
+#| "maintainer signature is stripped off, and an MD5 sum of the package is "
+#| "computed and put in the Packages file. The MD5 sums of all of the "
+#| "Packages files are then computed and put into the Release file. The "
+#| "Release file is then signed by the archive key (which is created once a "
+#| "year) and distributed through the FTP server. This key is also on the "
+#| "Debian keyring."
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
-"maintainer signature is stripped off, an MD5 sum of the package is computed "
-"and put in the Packages file. The MD5 sum of all of the packages files are "
-"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"maintainer signature is stripped off, and checksums of the package are "
+"computed and put in the Packages file. The checksums of all of the Packages "
+"files are then computed and put into the Release file. The Release file is "
+"then signed by the archive key for this Debian release and distributed "
+"alongside the packages and the Packages files on Debian mirrors. The keys "
+"are in the Debian archive keyring available in the <package>debian-archive-"
+"keyring</package> package."
 msgstr ""
 "Une fois que le paquet envoyé a été vérifié et inclus dans l'archive, la "
 "signature du responsable est enlevée, une somme MD5 du paquet est calculée "
@@ -2650,13 +2654,18 @@ msgstr ""
 "par le serveur FTP. Elle se trouve aussi dans le trousseau Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:113
+#, fuzzy
+#| msgid ""
+#| "Any end user can check the signature of the Release file, extract the MD5 "
+#| "sum of a package from it and compare it with the MD5 sum of the package "
+#| "he downloaded. Prior to version 0.6 only the MD5 sum of the downloaded "
+#| "Debian package was checked. Now both the MD5 sum and the signature of the "
+#| "Release file are checked."
 msgid ""
-"Any end user can check the signature of the Release file, extract the MD5 "
-"sum of a package from it and compare it with the MD5 sum of the package he "
-"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian "
-"package was checked. Now both the MD5 sum and the signature of the Release "
-"file are checked."
+"End users can check the signature of the Release file, extract a checksum of "
+"a package from it and compare it with the checksum of the package they "
+"downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
 "Un utilisateur peut consulter la signature du fichier Release, extraire la "
 "somme MD5 d'un paquet et la comparer avec la somme du paquet qu'il a "
@@ -2664,7 +2673,7 @@ msgstr ""
 "vérifiée. Maintenant on peut vérifier aussi la signature du fichier Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:119
+#: apt-secure.8.xml:118
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2673,13 +2682,13 @@ msgstr ""
 "paquet. Elle vise à empêcher deux types d'attaque possibles :"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:124
+#: apt-secure.8.xml:123
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
-"checking, a malicious agent can introduce himself in the package download "
-"process and provide malicious software either by controlling a network "
-"element (router, switch, etc.) or by redirecting traffic to a rogue server "
-"(through arp or DNS spoofing attacks)."
+"checking, malicious agents can introduce themselves into the package "
+"download process and provide malicious software either by controlling a "
+"network element (router, switch, etc.) or by redirecting traffic to a rogue "
+"server (through ARP or DNS spoofing attacks)."
 msgstr ""
 "<literal>Attaque réseau de type « homme au milieu »</literal>. Sans "
 "vérification de signature, quelqu'un de malveillant peut s'introduire au "
@@ -2688,7 +2697,7 @@ msgstr ""
 "trafic vers un serveur fourbe (par usurpation d'adresses)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:131
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2701,7 +2710,7 @@ msgstr ""
 "paquets de ce miroir propagent du code malveillant."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:139
+#: apt-secure.8.xml:138
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2714,16 +2723,16 @@ msgstr ""
 "signature des paquets."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:145
+#: apt-secure.8.xml:144
 msgid "User configuration"
 msgstr "Configuration utilisateur"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:146
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys although an installation of "
-"this release will automatically provide the default Debian archive signing "
+"by apt. It can be used to add or remove keys, although an installation of "
+"this release will automatically contain the default Debian archive signing "
 "keys used in the Debian package repositories."
 msgstr ""
 "Le programme qui gère la liste des clés utilisées par apt s'appelle "
@@ -2732,7 +2741,7 @@ msgstr ""
 "Debian et les différents répertoires de paquets."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:153
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2749,12 +2758,12 @@ msgstr ""
 "l'archive que vous avez configurée."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:162
 msgid "Archive configuration"
 msgstr "Configuration d'une archive"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:164
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2763,7 +2772,7 @@ msgstr ""
 "devez :"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:170
+#: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2774,7 +2783,7 @@ msgstr ""
 "ftparchive release</command> (fournie dans le paquet apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2785,7 +2794,7 @@ msgstr ""
 "command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:178
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2796,17 +2805,17 @@ msgstr ""
 "authentifier les fichiers de l'archive."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:185
 msgid ""
-"Whenever the contents of the archive changes (new packages are added or "
-"removed) the archive maintainer has to follow the first two steps previously "
-"outlined."
+"Whenever the contents of the archive change (new packages are added or "
+"removed) the archive maintainer has to follow the first two steps outlined "
+"above."
 msgstr ""
 "Chaque fois que le contenu de l'archive change, le responsable doit refaire "
 "les deux premières étapes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:194
+#: apt-secure.8.xml:193
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
@@ -2815,7 +2824,7 @@ msgstr ""
 "&debsign; &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:198
+#: apt-secure.8.xml:197
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2832,12 +2841,12 @@ msgstr ""
 "Distribution HOWTO</ulink> par V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:211
+#: apt-secure.8.xml:210
 msgid "Manpage Authors"
 msgstr "Auteurs des pages de manuel"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:213
+#: apt-secure.8.xml:212
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -5616,36 +5625,30 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:187
-#, fuzzy
-#| msgid ""
-#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-#| "specified packages and specified version or version range.  For example, "
-#| "the following record assigns a high priority to all versions of the "
-#| "<filename>perl</filename> package whose version number begins with "
-#| "\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
 "the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
-"\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
+"\"<literal>&good-perl;</literal>\".  Multiple packages can be separated by "
+"spaces."
 msgstr ""
 "La forme particulière affecte une priorité (<emphasis>Pin-Priority</"
 "emphasis>) à un paquet précis, à une version précise ou à un intervalle "
 "spécifiant plusieurs versions. Par exemple, l'entrée suivante affecte une "
 "priorité haute à toutes les versions du paquet <filename>perl</filename> "
-"dont le numéro de version commence par <literal>5.8</literal>."
+"dont le numéro de version commence par <literal>&good-perl;</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 "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>
@@ -5805,10 +5808,10 @@ msgstr ""
 #: apt_preferences.5.xml:264
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
-"surrounded by slashes. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a &glob;"
-"-like expression) or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
+"surrounded by slashes. For example, the following example assigns the "
+"priority 500 to all packages from experimental where the name starts with "
+"gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
+"extended regular expression surrounded by slashes)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -5975,7 +5978,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -5987,7 +5990,7 @@ msgid ""
 "Pin-Priority: 50\n"
 msgstr ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -6008,14 +6011,15 @@ msgstr "Alors :"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>5.8</literal>\".  If <emphasis>any</emphasis> 5.8* version of "
-"<literal>perl</literal> is available and the installed version is 5.9*, then "
-"<literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
+"* version of <literal>perl</literal> is available and the installed version "
+"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "La version la plus récente du paquet <literal>perl</literal> sera installé "
-"pour autant que son numéro de version commence par <literal>5.8</literal>.  "
-"Si l'<emphasis>une</emphasis> des versions 5.8* existe et si la version "
-"installée est une version 5.9*, il y aura un retour en arrière."
+"pour autant que son numéro de version commence par <literal>&good-perl;</"
+"literal>.  Si l'<emphasis>une</emphasis> des versions &good-perl;* existe et "
+"si la version installée est une version &bad-perl;*, il y aura un retour en "
+"arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:379

doc/po/it.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 15:23+0300\n"
+"POT-Creation-Date: 2012-06-06 23:46+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -1072,7 +1072,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:192 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
 #: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
@@ -1772,10 +1772,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:60
 msgid ""
-"If a package comes from a archive without a signature or with a signature "
-"that apt does not have a key for that package is considered untrusted and "
+"If a package comes from a archive without a signature, or with a signature "
+"that apt does not have a key for, that package is considered untrusted, and "
 "installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives, future releases might force all "
+"currently only warn for unsigned archives; future releases might force all "
 "sources to be verified before downloading packages from them."
 msgstr ""
 
@@ -1794,12 +1794,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:77
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of "
-"different steps. <command>apt-secure</command> is the last step in this "
-"chain, trusting an archive does not mean that the packages that you trust it "
-"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
-"archive integrity is correct."
+"The chain of trust from an apt archive to the end user is made up of several "
+"steps. <command>apt-secure</command> is the last step in this chain; "
+"trusting an archive does not mean that you trust its packages not to contain "
+"malicious code, but means that you trust the archive maintainer. It's the "
+"archive maintainer's responsibility to ensure that the archive's integrity "
+"is preserved."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1815,53 +1815,53 @@ msgstr ""
 #: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. This upload in order to "
-"become effective needs to be signed by a key of a maintainer within the "
-"Debian maintainer's keyring (available in the debian-keyring package). "
-"Maintainer's keys are signed by other maintainers following pre-established "
-"procedures to ensure the identity of the key holder."
+"or a new version of a package to the Debian archive. In order to become "
+"effective, this upload needs to be signed by a key contained in the Debian "
+"Maintainers keyring (available in the debian-keyring package). Maintainers' "
+"keys are signed by other maintainers following pre-established procedures to "
+"ensure the identity of the key holder."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:102
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
-"maintainer signature is stripped off, an MD5 sum of the package is computed "
-"and put in the Packages file. The MD5 sum of all of the packages files are "
-"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"maintainer signature is stripped off, and checksums of the package are "
+"computed and put in the Packages file. The checksums of all of the Packages "
+"files are then computed and put into the Release file. The Release file is "
+"then signed by the archive key for this Debian release and distributed "
+"alongside the packages and the Packages files on Debian mirrors. The keys "
+"are in the Debian archive keyring available in the <package>debian-archive-"
+"keyring</package> package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:113
 msgid ""
-"Any end user can check the signature of the Release file, extract the MD5 "
-"sum of a package from it and compare it with the MD5 sum of the package he "
-"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian "
-"package was checked. Now both the MD5 sum and the signature of the Release "
-"file are checked."
+"End users can check the signature of the Release file, extract a checksum of "
+"a package from it and compare it with the checksum of the package they "
+"downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:119
+#: apt-secure.8.xml:118
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:124
+#: apt-secure.8.xml:123
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
-"checking, a malicious agent can introduce himself in the package download "
-"process and provide malicious software either by controlling a network "
-"element (router, switch, etc.) or by redirecting traffic to a rogue server "
-"(through arp or DNS spoofing attacks)."
+"checking, malicious agents can introduce themselves into the package "
+"download process and provide malicious software either by controlling a "
+"network element (router, switch, etc.) or by redirecting traffic to a rogue "
+"server (through ARP or DNS spoofing attacks)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:131
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -1870,7 +1870,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:139
+#: apt-secure.8.xml:138
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -1879,21 +1879,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:145
+#: apt-secure.8.xml:144
 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:146
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys although an installation of "
-"this release will automatically provide the default Debian archive signing "
+"by apt. It can be used to add or remove keys, although an installation of "
+"this release will automatically contain the default Debian archive signing "
 "keys used in the Debian package repositories."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:153
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -1904,19 +1904,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:162
 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:164
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:170
+#: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -1924,7 +1924,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -1932,7 +1932,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:178
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -1940,22 +1940,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:185
 msgid ""
-"Whenever the contents of the archive changes (new packages are added or "
-"removed) the archive maintainer has to follow the first two steps previously "
-"outlined."
+"Whenever the contents of the archive change (new packages are added or "
+"removed) the archive maintainer has to follow the first two steps outlined "
+"above."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:194
+#: apt-secure.8.xml:193
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:198
+#: apt-secure.8.xml:197
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -1966,12 +1966,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:211
+#: apt-secure.8.xml:210
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:213
+#: apt-secure.8.xml:212
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -3773,7 +3773,8 @@ msgid ""
 "specified packages with a specified version or version range.  For example, "
 "the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
-"\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
+"\"<literal>&good-perl;</literal>\".  Multiple packages can be separated by "
+"spaces."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -3781,7 +3782,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 
@@ -3920,7 +3921,7 @@ msgstr ""
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -3928,7 +3929,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
 "Pin-Priority: 990\n"
 msgstr ""
 
@@ -3938,7 +3939,7 @@ msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
 "of all package names it matches. It is undecided whether this will change in "
-"the future, thus you should always list wild-card pins first, so later "
+"the future; thus you should always list wild-card pins first, so later "
 "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
 "Package field is not considered a &glob; expression in itself."
 msgstr ""
@@ -4046,7 +4047,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -4068,9 +4069,9 @@ msgstr ""
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>5.8</literal>\".  If <emphasis>any</emphasis> 5.8* version of "
-"<literal>perl</literal> is available and the installed version is 5.9*, then "
-"<literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
+"* version of <literal>perl</literal> is available and the installed version "
+"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

doc/po/ja.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 14:56+0300\n"
+"POT-Creation-Date: 2012-06-06 23:46+0300\n"
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1607,7 +1607,7 @@ msgstr "ファイル"
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:192 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
 #: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
@@ -2656,10 +2656,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:60
 msgid ""
-"If a package comes from a archive without a signature or with a signature "
-"that apt does not have a key for that package is considered untrusted and "
+"If a package comes from a archive without a signature, or with a signature "
+"that apt does not have a key for, that package is considered untrusted, and "
 "installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives, future releases might force all "
+"currently only warn for unsigned archives; future releases might force all "
 "sources to be verified before downloading packages from them."
 msgstr ""
 "パッケージに署名されなかったり、apt が知らないキーで署名されていた場合、アー"
@@ -2688,12 +2688,12 @@ msgstr "信頼済アーカイブ"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:77
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of "
-"different steps. <command>apt-secure</command> is the last step in this "
-"chain, trusting an archive does not mean that the packages that you trust it "
-"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
-"archive integrity is correct."
+"The chain of trust from an apt archive to the end user is made up of several "
+"steps. <command>apt-secure</command> is the last step in this chain; "
+"trusting an archive does not mean that you trust its packages not to contain "
+"malicious code, but means that you trust the archive maintainer. It's the "
+"archive maintainer's responsibility to ensure that the archive's integrity "
+"is preserved."
 msgstr ""
 "apt アーカイブからエンドユーザまでの信頼の輪は、いくつかのステップで構成され"
 "ています。<command>apt-secure</command> は、この輪の最後のステップで、アーカ"
@@ -2721,11 +2721,11 @@ msgstr ""
 #: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. This upload in order to "
-"become effective needs to be signed by a key of a maintainer within the "
-"Debian maintainer's keyring (available in the debian-keyring package). "
-"Maintainer's keys are signed by other maintainers following pre-established "
-"procedures to ensure the identity of the key holder."
+"or a new version of a package to the Debian archive. In order to become "
+"effective, this upload needs to be signed by a key contained in the Debian "
+"Maintainers keyring (available in the debian-keyring package). Maintainers' "
+"keys are signed by other maintainers following pre-established procedures to "
+"ensure the identity of the key holder."
 msgstr ""
 "Debian における信頼の輪は、新しいパッケージやパッケージの新しいバージョンを、"
 "メンテナが Debian アーカイブにアップロードすることで始まります。これは、"
@@ -2737,13 +2737,24 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "Once the uploaded package is verified and included in the archive, the "
+#| "maintainer signature is stripped off, and an MD5 sum of the package is "
+#| "computed and put in the Packages file. The MD5 sums of all of the "
+#| "Packages files are then computed and put into the Release file. The "
+#| "Release file is then signed by the archive key (which is created once a "
+#| "year) and distributed through the FTP server. This key is also on the "
+#| "Debian keyring."
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
-"maintainer signature is stripped off, an MD5 sum of the package is computed "
-"and put in the Packages file. The MD5 sum of all of the packages files are "
-"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"maintainer signature is stripped off, and checksums of the package are "
+"computed and put in the Packages file. The checksums of all of the Packages "
+"files are then computed and put into the Release file. The Release file is "
+"then signed by the archive key for this Debian release and distributed "
+"alongside the packages and the Packages files on Debian mirrors. The keys "
+"are in the Debian archive keyring available in the <package>debian-archive-"
+"keyring</package> package."
 msgstr ""
 "アップロードされたパッケージが検証されてアーカイブに格納されると、メンテナの"
 "署名をはがし、パッケージの MD5 sum を計算して、Packages ファイルに格納しま"
@@ -2753,13 +2764,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:113
+#, fuzzy
+#| msgid ""
+#| "Any end user can check the signature of the Release file, extract the MD5 "
+#| "sum of a package from it and compare it with the MD5 sum of the package "
+#| "he downloaded. Prior to version 0.6 only the MD5 sum of the downloaded "
+#| "Debian package was checked. Now both the MD5 sum and the signature of the "
+#| "Release file are checked."
 msgid ""
-"Any end user can check the signature of the Release file, extract the MD5 "
-"sum of a package from it and compare it with the MD5 sum of the package he "
-"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian "
-"package was checked. Now both the MD5 sum and the signature of the Release "
-"file are checked."
+"End users can check the signature of the Release file, extract a checksum of "
+"a package from it and compare it with the checksum of the package they "
+"downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
 "エンドユーザは誰でも、Release ファイルの署名をチェックし、パッケージの MD5 "
 "sum を抽出して、ダウンロードしたパッケージの MD5 sum と比較できます。バージョ"
@@ -2769,7 +2785,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:119
+#: apt-secure.8.xml:118
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2779,23 +2795,23 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:124
+#: apt-secure.8.xml:123
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
-"checking, a malicious agent can introduce himself in the package download "
-"process and provide malicious software either by controlling a network "
-"element (router, switch, etc.) or by redirecting traffic to a rogue server "
-"(through arp or DNS spoofing attacks)."
+"checking, malicious agents can introduce themselves into the package "
+"download process and provide malicious software either by controlling a "
+"network element (router, switch, etc.) or by redirecting traffic to a rogue "
+"server (through ARP or DNS spoofing attacks)."
 msgstr ""
 "<literal>ネットワーク中間者攻撃</literal> 署名をチェックしないと、悪意ある"
 "エージェントがパッケージダウンロードプロセスに割り込んだり、ネットワーク構成"
 "要素 (ルータ、スイッチなど) の制御や、悪漢サーバへのネットワークトラフィック"
-"のリダイレクトなど (arp スプーフィング攻撃や DNS スプーフィング攻撃) で、悪意"
+"のリダイレクトなど (ARP スプーフィング攻撃や DNS スプーフィング攻撃) で、悪意"
 "あるソフトウェアを掴まされたりします。"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:131
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2808,7 +2824,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:139
+#: apt-secure.8.xml:138
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2821,17 +2837,17 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:145
+#: apt-secure.8.xml:144
 msgid "User configuration"
 msgstr "ユーザの設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:146
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys although an installation of "
-"this release will automatically provide the default Debian archive signing "
+"by apt. It can be used to add or remove keys, although an installation of "
+"this release will automatically contain the default Debian archive signing "
 "keys used in the Debian package repositories."
 msgstr ""
 "<command>apt-key</command> は、apt が使用するキーリストを管理するプログラムで"
@@ -2841,7 +2857,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:153
 #, fuzzy
 #| msgid ""
 #| "In order to add a new key you need to first download it (you should make "
@@ -2867,13 +2883,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:162
 msgid "Archive configuration"
 msgstr "アーカイブの設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:164
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2883,7 +2899,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:170
+#: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2895,7 +2911,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:174
 #, fuzzy
 #| msgid ""
 #| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
@@ -2910,7 +2926,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:178
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2922,18 +2938,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:185
 msgid ""
-"Whenever the contents of the archive changes (new packages are added or "
-"removed) the archive maintainer has to follow the first two steps previously "
-"outlined."
+"Whenever the contents of the archive change (new packages are added or "
+"removed) the archive maintainer has to follow the first two steps outlined "
+"above."
 msgstr ""
 "アーカイブの内容に変化がある場合 (新しいパッケージの追加や削除)、アーカイブメ"
 "ンテナは前述の最初の 1, 2 ステップに従わなければなりません。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:194
+#: apt-secure.8.xml:193
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
@@ -2943,7 +2959,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:198
+#: apt-secure.8.xml:197
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2960,13 +2976,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:211
+#: apt-secure.8.xml:210
 msgid "Manpage Authors"
 msgstr "マニュアルページ作者"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:213
+#: apt-secure.8.xml:212
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -5482,24 +5498,18 @@ msgstr ""
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:187
-#, fuzzy
-#| msgid ""
-#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-#| "specified packages and specified version or version range.  For example, "
-#| "the following record assigns a high priority to all versions of the "
-#| "<filename>perl</filename> package whose version number begins with "
-#| "\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
 "the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
-"\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
+"\"<literal>&good-perl;</literal>\".  Multiple packages can be separated by "
+"spaces."
 msgstr ""
 "特定形式は、優先度 (\"Pin-Priority\") を、指定したパッケージの指定したバー"
-"ジョン (範囲) について割り当てます。例えば以下のレコードは、\"<literal>5.8</"
-"literal>\" で始まる <filename>perl</filename> パッケージを、高い優先度に設定"
-"します。"
+"ジョン (範囲) について割り当てます。例えば以下のレコードは、\"<literal>&good-"
+"perl;</literal>\" で始まる <filename>perl</filename> パッケージを、高い優先度"
+"に設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -5507,11 +5517,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 
@@ -5680,10 +5690,10 @@ msgstr ""
 #: apt_preferences.5.xml:264
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
-"surrounded by slashes. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a &glob;"
-"-like expression) or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
+"surrounded by slashes. For example, the following example assigns the "
+"priority 500 to all packages from experimental where the name starts with "
+"gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
+"extended regular expression surrounded by slashes)."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -5869,7 +5879,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -5881,7 +5891,7 @@ msgid ""
 "Pin-Priority: 50\n"
 msgstr ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -5905,14 +5915,14 @@ msgstr "すると、以下のように動作します。"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>5.8</literal>\".  If <emphasis>any</emphasis> 5.8* version of "
-"<literal>perl</literal> is available and the installed version is 5.9*, then "
-"<literal>perl</literal> will be downgraded."
-msgstr ""
-"バージョン番号が \"<literal>5.8</literal>\" で始まっていれば、<literal>perl</"
-"literal> の最新の利用可能パッケージがインストールされます。バージョン 5.8* が"
-"利用可能で、バージョン 5.9* がインストールされている場合、<literal>perl</"
-"literal> はダウングレードされます。"
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
+"* version of <literal>perl</literal> is available and the installed version "
+"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+msgstr ""
+"バージョン番号が \"<literal>&good-perl;</literal>\" で始まっていれば、"
+"<literal>perl</literal> の最新の利用可能パッケージがインストールされます。"
+"バージョン &good-perl;* が利用可能で、バージョン &bad-perl;* がインストールさ"
+"れている場合、<literal>perl</literal> はダウングレードされます。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

doc/po/pl.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.5.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 14:56+0300\n"
+"POT-Creation-Date: 2012-06-06 23:46+0300\n"
 "PO-Revision-Date: 2012-06-02 11:31+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -1666,7 +1666,7 @@ msgstr "Pliki"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:192 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
 #: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
@@ -2670,10 +2670,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:60
 msgid ""
-"If a package comes from a archive without a signature or with a signature "
-"that apt does not have a key for that package is considered untrusted and "
+"If a package comes from a archive without a signature, or with a signature "
+"that apt does not have a key for, that package is considered untrusted, and "
 "installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives, future releases might force all "
+"currently only warn for unsigned archives; future releases might force all "
 "sources to be verified before downloading packages from them."
 msgstr ""
 "Jeśli pakiet pochodzi z archiwum niemającego sygnatury lub mającego "
@@ -2700,12 +2700,12 @@ msgstr "Zaufane archiwa"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:77
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of "
-"different steps. <command>apt-secure</command> is the last step in this "
-"chain, trusting an archive does not mean that the packages that you trust it "
-"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
-"archive integrity is correct."
+"The chain of trust from an apt archive to the end user is made up of several "
+"steps. <command>apt-secure</command> is the last step in this chain; "
+"trusting an archive does not mean that you trust its packages not to contain "
+"malicious code, but means that you trust the archive maintainer. It's the "
+"archive maintainer's responsibility to ensure that the archive's integrity "
+"is preserved."
 msgstr ""
 "Łańcuch zaufania prowadzący z archiwum APT do użytkownika końcowego składa "
 "się z kilku różnych kroków. <command>apt-secure</command> jest ostatnim z "
@@ -2730,11 +2730,11 @@ msgstr ""
 #: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. This upload in order to "
-"become effective needs to be signed by a key of a maintainer within the "
-"Debian maintainer's keyring (available in the debian-keyring package). "
-"Maintainer's keys are signed by other maintainers following pre-established "
-"procedures to ensure the identity of the key holder."
+"or a new version of a package to the Debian archive. In order to become "
+"effective, this upload needs to be signed by a key contained in the Debian "
+"Maintainers keyring (available in the debian-keyring package). Maintainers' "
+"keys are signed by other maintainers following pre-established procedures to "
+"ensure the identity of the key holder."
 msgstr ""
 "Łańcuch zaufania w Debianie zaczyna się od wgrania nowego pakietu lub nowej "
 "wersji pakietu przez jego opiekuna do archiwum Debiana. Dostarczony przez "
@@ -2745,13 +2745,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "Once the uploaded package is verified and included in the archive, the "
+#| "maintainer signature is stripped off, and an MD5 sum of the package is "
+#| "computed and put in the Packages file. The MD5 sums of all of the "
+#| "Packages files are then computed and put into the Release file. The "
+#| "Release file is then signed by the archive key (which is created once a "
+#| "year) and distributed through the FTP server. This key is also on the "
+#| "Debian keyring."
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
-"maintainer signature is stripped off, an MD5 sum of the package is computed "
-"and put in the Packages file. The MD5 sum of all of the packages files are "
-"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"maintainer signature is stripped off, and checksums of the package are "
+"computed and put in the Packages file. The checksums of all of the Packages "
+"files are then computed and put into the Release file. The Release file is "
+"then signed by the archive key for this Debian release and distributed "
+"alongside the packages and the Packages files on Debian mirrors. The keys "
+"are in the Debian archive keyring available in the <package>debian-archive-"
+"keyring</package> package."
 msgstr ""
 "Po tym jak dostarczony przez opiekuna pakiet zostanie zweryfikowany i "
 "dołączony do archiwum, sygnatura opiekuna jest usuwana, a suma MD5 pakietu "
@@ -2762,13 +2773,18 @@ msgstr ""
 "archiwum znajduje się także w składnicy kluczy Debiana."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:113
+#, fuzzy
+#| msgid ""
+#| "Any end user can check the signature of the Release file, extract the MD5 "
+#| "sum of a package from it and compare it with the MD5 sum of the package "
+#| "he downloaded. Prior to version 0.6 only the MD5 sum of the downloaded "
+#| "Debian package was checked. Now both the MD5 sum and the signature of the "
+#| "Release file are checked."
 msgid ""
-"Any end user can check the signature of the Release file, extract the MD5 "
-"sum of a package from it and compare it with the MD5 sum of the package he "
-"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian "
-"package was checked. Now both the MD5 sum and the signature of the Release "
-"file are checked."
+"End users can check the signature of the Release file, extract a checksum of "
+"a package from it and compare it with the checksum of the package they "
+"downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
 "Użytkownik końcowy może sprawdzić sygnaturę pliku Release, wydobyć z niego "
 "sumę kontrolną MD5 pakietu i porównać ją z sumą kontrolną MD5 pobranego "
@@ -2777,7 +2793,7 @@ msgstr ""
 "Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:119
+#: apt-secure.8.xml:118
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2787,13 +2803,13 @@ msgstr ""
 "dwoma możliwymi typami ataków:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:124
+#: apt-secure.8.xml:123
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
-"checking, a malicious agent can introduce himself in the package download "
-"process and provide malicious software either by controlling a network "
-"element (router, switch, etc.) or by redirecting traffic to a rogue server "
-"(through arp or DNS spoofing attacks)."
+"checking, malicious agents can introduce themselves into the package "
+"download process and provide malicious software either by controlling a "
+"network element (router, switch, etc.) or by redirecting traffic to a rogue "
+"server (through ARP or DNS spoofing attacks)."
 msgstr ""
 "<literal>Ataki sieciowe \"człowiek pośrodku\" (ang. \"man in the middle\")</"
 "literal>. Jeżeli sygnatury nie są sprawdzane, to ktoś złośliwy może "
@@ -2804,7 +2820,7 @@ msgstr ""
 "\"ARP (DNS) spoofing\")."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:131
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2818,7 +2834,7 @@ msgstr ""
 "pobierającym pakiety z tego serwera."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:139
+#: apt-secure.8.xml:138
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2831,16 +2847,16 @@ msgstr ""
 "dla sprawdzania sygnatur poszczególnych pakietów."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:145
+#: apt-secure.8.xml:144
 msgid "User configuration"
 msgstr "Konfiguracja użytkownika"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:146
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys although an installation of "
-"this release will automatically provide the default Debian archive signing "
+"by apt. It can be used to add or remove keys, although an installation of "
+"this release will automatically contain the default Debian archive signing "
 "keys used in the Debian package repositories."
 msgstr ""
 "<command>apt-key</command> jest programem służącym do zarządzania listą "
@@ -2850,7 +2866,7 @@ msgstr ""
 "Debiana."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:153
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2866,19 +2882,19 @@ msgstr ""
 "<filename>Release.gpg</filename> ze skonfigurowanych archiwów."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:162
 msgid "Archive configuration"
 msgstr "Konfiguracja archiwum"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:164
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr "Aby dołączyć sygnatury do archiwum, którym się opiekujesz, należy:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:170
+#: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2889,7 +2905,7 @@ msgstr ""
 "release</command> (dostarczanego w pakiecie apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2900,7 +2916,7 @@ msgstr ""
 "o Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:178
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2911,17 +2927,17 @@ msgstr ""
 "autoryzować plików w archiwum."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:185
 msgid ""
-"Whenever the contents of the archive changes (new packages are added or "
-"removed) the archive maintainer has to follow the first two steps previously "
-"outlined."
+"Whenever the contents of the archive change (new packages are added or "
+"removed) the archive maintainer has to follow the first two steps outlined "
+"above."
 msgstr ""
 "Po każdej zmianie zawartości archiwum (dodaniu lub usunięciu pakietów), "
 "opiekun archiwum musi wykonać pierwsze dwa z wymienionych powyżej kroków."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:194
+#: apt-secure.8.xml:193
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
@@ -2930,7 +2946,7 @@ msgstr ""
 "&debsign; &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:198
+#: apt-secure.8.xml:197
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2946,12 +2962,12 @@ msgstr ""
 "Distribution HOWTO</ulink>\" napisanym przez V. Alexa Brennena."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:211
+#: apt-secure.8.xml:210
 msgid "Manpage Authors"
 msgstr "Autorzy strony podręcznika"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:213
+#: apt-secure.8.xml:212
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -5014,37 +5030,31 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:187
-#, fuzzy
-#| msgid ""
-#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-#| "specified packages and specified version or version range.  For example, "
-#| "the following record assigns a high priority to all versions of the "
-#| "<filename>perl</filename> package whose version number begins with "
-#| "\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
 "the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
-"\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
+"\"<literal>&good-perl;</literal>\".  Multiple packages can be separated by "
+"spaces."
 msgstr ""
 "Postać szczegółowa przypisuje priorytet (\"Pin-Priority\") do jednego lub "
 "większej liczby podanych pakietów i podanych wersji lub zakresów wersji. Na "
 "przykład następujący rekord ustawia wysoki priorytet wszystkim wersjom "
 "pakietu <filename>perl</filename>, których numer wersji zaczyna się od "
-"\"<literal>5.8</literal>\". Można podać wiele nazw pakietów, rozdzielając je "
-"od siebie spacjami."
+"\"<literal>&good-bad;</literal>\". Można podać wiele nazw pakietów, "
+"rozdzielając je od siebie spacjami."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 "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>
@@ -5204,10 +5214,10 @@ msgstr "Składnia wyrażeń regularnych i &glob;"
 #: apt_preferences.5.xml:264
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
-"surrounded by slashes. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a &glob;"
-"-like expression) or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
+"surrounded by slashes. For example, the following example assigns the "
+"priority 500 to all packages from experimental where the name starts with "
+"gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
+"extended regular expression surrounded by slashes)."
 msgstr ""
 "APT także wspiera dopasowywanie przy użyciu wzorców &glob; i wyrażeń "
 "regularnych otoczonych znakami /. Następujący przykład ustawia priorytet 500 "
@@ -5394,7 +5404,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -5406,7 +5416,7 @@ msgid ""
 "Pin-Priority: 50\n"
 msgstr ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -5427,15 +5437,16 @@ msgstr "Wtedy:"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>5.8</literal>\".  If <emphasis>any</emphasis> 5.8* version of "
-"<literal>perl</literal> is available and the installed version is 5.9*, then "
-"<literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
+"* version of <literal>perl</literal> is available and the installed version "
+"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "Zostanie zainstalowana najnowsza dostępna wersja pakietu <literal>perl</"
-"literal>, jeśli tylko numer tej wersji zaczyna się od \"<literal>5.8</"
-"literal>\". Jeśli <emphasis>jakakolwiek</emphasis> wersja 5.8* jest "
-"dostępna, ale  zainstalowana jest już wersja 5.9.*, to pakiet <literal>perl</"
-"literal> zostanie zastąpiony tą dostępną wcześniejszą wersją 5.8*."
+"literal>, jeśli tylko numer tej wersji zaczyna się od \"<literal>&good-perl;"
+"</literal>\". Jeśli <emphasis>jakakolwiek</emphasis> wersja &good-perl;* "
+"jest dostępna, ale  zainstalowana jest już wersja &bad-perl;*, to pakiet "
+"<literal>perl</literal> zostanie zastąpiony tą dostępną wcześniejszą wersją "
+"&good-perl;*."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:379

doc/po/pt.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 14:56+0300\n"
+"POT-Creation-Date: 2012-06-06 23:46+0300\n"
 "PO-Revision-Date: 2010-08-25 23:07+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1583,7 +1583,7 @@ msgstr "Ficheiros"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:192 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
 #: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
@@ -2592,10 +2592,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:60
 msgid ""
-"If a package comes from a archive without a signature or with a signature "
-"that apt does not have a key for that package is considered untrusted and "
+"If a package comes from a archive without a signature, or with a signature "
+"that apt does not have a key for, that package is considered untrusted, and "
 "installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives, future releases might force all "
+"currently only warn for unsigned archives; future releases might force all "
 "sources to be verified before downloading packages from them."
 msgstr ""
 "Se um pacote vem dum arquivo sem assinatura ou com uma assinatura para a "
@@ -2622,12 +2622,12 @@ msgstr "Arquivos de confiança"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:77
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of "
-"different steps. <command>apt-secure</command> is the last step in this "
-"chain, trusting an archive does not mean that the packages that you trust it "
-"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
-"archive integrity is correct."
+"The chain of trust from an apt archive to the end user is made up of several "
+"steps. <command>apt-secure</command> is the last step in this chain; "
+"trusting an archive does not mean that you trust its packages not to contain "
+"malicious code, but means that you trust the archive maintainer. It's the "
+"archive maintainer's responsibility to ensure that the archive's integrity "
+"is preserved."
 msgstr ""
 "A corrente de confiança desde um arquivo apt até ao utilizador final é feita "
 "em diferentes passos. O <command>apt-secure</command> é o último passo nesta "
@@ -2653,11 +2653,11 @@ msgstr ""
 #: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. This upload in order to "
-"become effective needs to be signed by a key of a maintainer within the "
-"Debian maintainer's keyring (available in the debian-keyring package). "
-"Maintainer's keys are signed by other maintainers following pre-established "
-"procedures to ensure the identity of the key holder."
+"or a new version of a package to the Debian archive. In order to become "
+"effective, this upload needs to be signed by a key contained in the Debian "
+"Maintainers keyring (available in the debian-keyring package). Maintainers' "
+"keys are signed by other maintainers following pre-established procedures to "
+"ensure the identity of the key holder."
 msgstr ""
 "A corrente de confiança em Debian começa quando o responsável faz o upload "
 "de um novo pacote ou de uma nova versão de um pacote para o arquivo Debian. "
@@ -2669,13 +2669,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "Once the uploaded package is verified and included in the archive, the "
+#| "maintainer signature is stripped off, and an MD5 sum of the package is "
+#| "computed and put in the Packages file. The MD5 sums of all of the "
+#| "Packages files are then computed and put into the Release file. The "
+#| "Release file is then signed by the archive key (which is created once a "
+#| "year) and distributed through the FTP server. This key is also on the "
+#| "Debian keyring."
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
-"maintainer signature is stripped off, an MD5 sum of the package is computed "
-"and put in the Packages file. The MD5 sum of all of the packages files are "
-"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"maintainer signature is stripped off, and checksums of the package are "
+"computed and put in the Packages file. The checksums of all of the Packages "
+"files are then computed and put into the Release file. The Release file is "
+"then signed by the archive key for this Debian release and distributed "
+"alongside the packages and the Packages files on Debian mirrors. The keys "
+"are in the Debian archive keyring available in the <package>debian-archive-"
+"keyring</package> package."
 msgstr ""
 "Após o upload, o pacote é verificado e incluído no arquivo, a assinatura do "
 "responsável é despojada, é computado um sumário MD5 do pacote e colocado no "
@@ -2686,13 +2697,18 @@ msgstr ""
 "Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:113
+#, fuzzy
+#| msgid ""
+#| "Any end user can check the signature of the Release file, extract the MD5 "
+#| "sum of a package from it and compare it with the MD5 sum of the package "
+#| "he downloaded. Prior to version 0.6 only the MD5 sum of the downloaded "
+#| "Debian package was checked. Now both the MD5 sum and the signature of the "
+#| "Release file are checked."
 msgid ""
-"Any end user can check the signature of the Release file, extract the MD5 "
-"sum of a package from it and compare it with the MD5 sum of the package he "
-"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian "
-"package was checked. Now both the MD5 sum and the signature of the Release "
-"file are checked."
+"End users can check the signature of the Release file, extract a checksum of "
+"a package from it and compare it with the checksum of the package they "
+"downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
 "Qualquer utilizador final pode verificar a assinatura do ficheiro Release, "
 "extrair o sumário MD5 de um pacote a partir dele, e compará-lo com o sumário "
@@ -2701,7 +2717,7 @@ msgstr ""
 "sumário MD5 e a assinatura do ficheiro Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:119
+#: apt-secure.8.xml:118
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2710,22 +2726,22 @@ msgstr ""
 "desenhado para prevenir dois ataques possíveis:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:124
+#: apt-secure.8.xml:123
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
-"checking, a malicious agent can introduce himself in the package download "
-"process and provide malicious software either by controlling a network "
-"element (router, switch, etc.) or by redirecting traffic to a rogue server "
-"(through arp or DNS spoofing attacks)."
+"checking, malicious agents can introduce themselves into the package "
+"download process and provide malicious software either by controlling a "
+"network element (router, switch, etc.) or by redirecting traffic to a rogue "
+"server (through ARP or DNS spoofing attacks)."
 msgstr ""
 "<literal>Ataques de rede \"man in the middle\"</literal>. Sem verificação de "
 "assinatura, um agente malicioso pode introduzir-se ele próprio no processo "
 "de descarga de pacotes e disponibilizar software malicioso seja ao controlar "
 "um elemento de rede (router, switch, etc.) ou ao redireccionar tráfego para "
-"um servidor impostor (através de ataques de fraude de arp ou DNS)."
+"um servidor impostor (através de ataques de fraude de ARP ou DNS)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:131
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2738,7 +2754,7 @@ msgstr ""
 "descarregam pacotes a partir dessa máquina."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:139
+#: apt-secure.8.xml:138
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -2751,16 +2767,16 @@ msgstr ""
 "mecanismo pode complementar uma assinatura por-pacote."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:145
+#: apt-secure.8.xml:144
 msgid "User configuration"
 msgstr "Configuração do utilizador"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:146
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys although an installation of "
-"this release will automatically provide the default Debian archive signing "
+"by apt. It can be used to add or remove keys, although an installation of "
+"this release will automatically contain the default Debian archive signing "
 "keys used in the Debian package repositories."
 msgstr ""
 "<command>apt-key</command> é o programa que gere a lista de chaves usada "
@@ -2770,7 +2786,7 @@ msgstr ""
 "pacotes Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:153
 #, fuzzy
 #| msgid ""
 #| "In order to add a new key you need to first download it (you should make "
@@ -2795,12 +2811,12 @@ msgstr ""
 "arquivos que você configurou."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:162
 msgid "Archive configuration"
 msgstr "Configuração de arquivos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:164
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2809,7 +2825,7 @@ msgstr ""
 "manutenção, você tem que:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:170
+#: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2820,7 +2836,7 @@ msgstr ""
 "command> (disponibilizado no apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:174
 #, fuzzy
 #| msgid ""
 #| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
@@ -2834,7 +2850,7 @@ msgstr ""
 "abs -o Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:178
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2845,18 +2861,18 @@ msgstr ""
 "autenticar os ficheiros no arquivo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:185
 msgid ""
-"Whenever the contents of the archive changes (new packages are added or "
-"removed) the archive maintainer has to follow the first two steps previously "
-"outlined."
+"Whenever the contents of the archive change (new packages are added or "
+"removed) the archive maintainer has to follow the first two steps outlined "
+"above."
 msgstr ""
 "Sempre que o conteúdo do arquivo mude (são adicionados novos pacotes ou "
 "removidos), o responsável do arquivo tem que seguir os primeiros dois passos "
 "previamente delineados."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:194
+#: apt-secure.8.xml:193
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
@@ -2865,7 +2881,7 @@ msgstr ""
 "&debsign; &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:198
+#: apt-secure.8.xml:197
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2882,12 +2898,12 @@ msgstr ""
 "ulink> de V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:211
+#: apt-secure.8.xml:210
 msgid "Manpage Authors"
 msgstr "Autores do manual"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:213
+#: apt-secure.8.xml:212
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -5629,37 +5645,31 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:187
-#, fuzzy
-#| msgid ""
-#| "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
-#| "specified packages and specified version or version range.  For example, "
-#| "the following record assigns a high priority to all versions of the "
-#| "<filename>perl</filename> package whose version number begins with "
-#| "\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
 "the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
-"\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
+"\"<literal>&good-perl;</literal>\".  Multiple packages can be separated by "
+"spaces."
 msgstr ""
 "O formato específico atribui um prioridade (um \"Pin-Priority\") a um ou "
 "mais pacotes específicos e versão específica ou série de versões. Por "
 "exemplo, o seguinte registo atribui uma alta prioridade a todas as versões "
 "do pacote <filename>perl</filename> cujo número de versão começa com "
-"\"<literal>5.8</literal>\". Múltiplos pacotes podem ser separados por "
-"espaços."
+"\"<literal>&good-perl;</literal>\". Múltiplos pacotes podem ser separados "
+"por espaços."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 "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>
@@ -5820,10 +5830,10 @@ msgstr ""
 #: apt_preferences.5.xml:264
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
-"surrounded by slashes. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a &glob;"
-"-like expression) or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
+"surrounded by slashes. For example, the following example assigns the "
+"priority 500 to all packages from experimental where the name starts with "
+"gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
+"extended regular expression surrounded by slashes)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -5999,7 +6009,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -6011,7 +6021,7 @@ msgid ""
 "Pin-Priority: 50\n"
 msgstr ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -6032,15 +6042,15 @@ msgstr "Então:"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>5.8</literal>\".  If <emphasis>any</emphasis> 5.8* version of "
-"<literal>perl</literal> is available and the installed version is 5.9*, then "
-"<literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
+"* version of <literal>perl</literal> is available and the installed version "
+"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "Será instalada a versão mais recente disponível do pacote <literal>perl</"
-"literal>, desde que o número da versão comece com \"<literal>5.8</literal>"
-"\". Se <emphasis>qualquer</emphasis> versão 5.8* do <literal>perl</literal> "
-"estiver disponível e a versão instalada for 5.9*, então será feito um "
-"downgrade ao <literal>perl</literal>."
+"literal>, desde que o número da versão comece com \"<literal>&good-perl;</"
+"literal>\". Se <emphasis>qualquer</emphasis> versão &good-perl;* do "
+"<literal>perl</literal> estiver disponível e a versão instalada for &bad-"
+"perl;*, então será feito um downgrade ao <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:379

doc/po/pt_BR.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 15:23+0300\n"
+"POT-Creation-Date: 2012-06-06 23:46+0300\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1097,7 +1097,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:192 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
 #: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
@@ -1806,10 +1806,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:60
 msgid ""
-"If a package comes from a archive without a signature or with a signature "
-"that apt does not have a key for that package is considered untrusted and "
+"If a package comes from a archive without a signature, or with a signature "
+"that apt does not have a key for, that package is considered untrusted, and "
 "installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives, future releases might force all "
+"currently only warn for unsigned archives; future releases might force all "
 "sources to be verified before downloading packages from them."
 msgstr ""
 
@@ -1828,12 +1828,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:77
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of "
-"different steps. <command>apt-secure</command> is the last step in this "
-"chain, trusting an archive does not mean that the packages that you trust it "
-"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
-"archive integrity is correct."
+"The chain of trust from an apt archive to the end user is made up of several "
+"steps. <command>apt-secure</command> is the last step in this chain; "
+"trusting an archive does not mean that you trust its packages not to contain "
+"malicious code, but means that you trust the archive maintainer. It's the "
+"archive maintainer's responsibility to ensure that the archive's integrity "
+"is preserved."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1849,53 +1849,53 @@ msgstr ""
 #: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. This upload in order to "
-"become effective needs to be signed by a key of a maintainer within the "
-"Debian maintainer's keyring (available in the debian-keyring package). "
-"Maintainer's keys are signed by other maintainers following pre-established "
-"procedures to ensure the identity of the key holder."
+"or a new version of a package to the Debian archive. In order to become "
+"effective, this upload needs to be signed by a key contained in the Debian "
+"Maintainers keyring (available in the debian-keyring package). Maintainers' "
+"keys are signed by other maintainers following pre-established procedures to "
+"ensure the identity of the key holder."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:102
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
-"maintainer signature is stripped off, an MD5 sum of the package is computed "
-"and put in the Packages file. The MD5 sum of all of the packages files are "
-"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"maintainer signature is stripped off, and checksums of the package are "
+"computed and put in the Packages file. The checksums of all of the Packages "
+"files are then computed and put into the Release file. The Release file is "
+"then signed by the archive key for this Debian release and distributed "
+"alongside the packages and the Packages files on Debian mirrors. The keys "
+"are in the Debian archive keyring available in the <package>debian-archive-"
+"keyring</package> package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:113
 msgid ""
-"Any end user can check the signature of the Release file, extract the MD5 "
-"sum of a package from it and compare it with the MD5 sum of the package he "
-"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian "
-"package was checked. Now both the MD5 sum and the signature of the Release "
-"file are checked."
+"End users can check the signature of the Release file, extract a checksum of "
+"a package from it and compare it with the checksum of the package they "
+"downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:119
+#: apt-secure.8.xml:118
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:124
+#: apt-secure.8.xml:123
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
-"checking, a malicious agent can introduce himself in the package download "
-"process and provide malicious software either by controlling a network "
-"element (router, switch, etc.) or by redirecting traffic to a rogue server "
-"(through arp or DNS spoofing attacks)."
+"checking, malicious agents can introduce themselves into the package "
+"download process and provide malicious software either by controlling a "
+"network element (router, switch, etc.) or by redirecting traffic to a rogue "
+"server (through ARP or DNS spoofing attacks)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:131
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -1904,7 +1904,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:139
+#: apt-secure.8.xml:138
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -1913,21 +1913,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:145
+#: apt-secure.8.xml:144
 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:146
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys although an installation of "
-"this release will automatically provide the default Debian archive signing "
+"by apt. It can be used to add or remove keys, although an installation of "
+"this release will automatically contain the default Debian archive signing "
 "keys used in the Debian package repositories."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:153
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -1938,19 +1938,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:162
 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:164
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:170
+#: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -1958,7 +1958,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -1966,7 +1966,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:178
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -1974,22 +1974,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:185
 msgid ""
-"Whenever the contents of the archive changes (new packages are added or "
-"removed) the archive maintainer has to follow the first two steps previously "
-"outlined."
+"Whenever the contents of the archive change (new packages are added or "
+"removed) the archive maintainer has to follow the first two steps outlined "
+"above."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:194
+#: apt-secure.8.xml:193
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:198
+#: apt-secure.8.xml:197
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2000,12 +2000,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:211
+#: apt-secure.8.xml:210
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:213
+#: apt-secure.8.xml:212
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -3910,7 +3910,8 @@ msgid ""
 "specified packages with a specified version or version range.  For example, "
 "the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
-"\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
+"\"<literal>&good-perl;</literal>\".  Multiple packages can be separated by "
+"spaces."
 msgstr ""
 "A forma específica atribui uma uma prioridade (uma \"Pin-Priority\") para um "
 "pacote e versão ou faixa de versão especificados. Por exemplo, o registro a "
@@ -3923,7 +3924,7 @@ msgstr ""
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 "<programlisting>\n"
@@ -4121,7 +4122,7 @@ msgstr ""
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -4129,7 +4130,7 @@ msgstr ""
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
 "Pin-Priority: 990\n"
 msgstr ""
 "<programlisting>\n"
@@ -4143,7 +4144,7 @@ msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
 "of all package names it matches. It is undecided whether this will change in "
-"the future, thus you should always list wild-card pins first, so later "
+"the future; thus you should always list wild-card pins first, so later "
 "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
 "Package field is not considered a &glob; expression in itself."
 msgstr ""
@@ -4289,7 +4290,7 @@ msgstr ""
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -4324,9 +4325,9 @@ msgstr ""
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>5.8</literal>\".  If <emphasis>any</emphasis> 5.8* version of "
-"<literal>perl</literal> is available and the installed version is 5.9*, then "
-"<literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
+"* version of <literal>perl</literal> is available and the installed version "
+"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "A versão mais recente disponível do pacote <literal>perl</literal> será "
 "instalado, contanto que esse número de versão da versão inicie com "
@@ -7328,6 +7329,17 @@ msgstr ""
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Package: *\n"
+#~ "Pin: release n=karmic*\n"
+#~ "Pin-Priority: 990\n"
+#~ msgstr ""
+#~ "<programlisting>\n"
+#~ "Package: *\n"
+#~ "Pin: release a=unstable\n"
+#~ "Pin-Priority: 50\n"
+
 #, fuzzy
 #~ msgid "Dir Section"
 #~ msgstr "Descrição"