Release 1.3~pre1

diff --git a/configure.ac b/configure.ac
index 4e08cc473fc045185017542c2412138c2a38ac36..ee8b5669a732018f57f4ebfac0f091f570898665 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"

-PACKAGE_VERSION="1.3~exp3"
+PACKAGE_VERSION="1.3~pre1"

 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")

diff --git a/debian/changelog b/debian/changelog
index 5aa64c41de55bb441737451dbe2985813cb6054c..0e0c387e8613a43ca6e18bd3ea3f7fdf36a6d76a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,57 @@
+apt (1.3~pre1) unstable; urgency=medium
+
+  Upload to unstable from the pub because Niels wanted it
+
+  [ David Kalnischkies ]
+  * show right binary name in simulation notice (Closes: 825216)
+  * imbue datetime parsing with C.UTF-8 locale (Closes: 828011)
+  * imbue .diff/Index parsing with C.UTF-8 as well
+  * close server if parsing of header field failed
+  * add myself to Uploaders
+  * eipp: implement version 0.1 of the protocol
+  * eipp: provide the internal planer as an external one
+  * eipp: make no difference between remove & purge
+  * eipp: properly handle arch-specific provides
+  * eipp: implement Immediate-Configuration flag
+  * eipp: add Allow-Temporary-Remove-of-Essentials
+  * eipp: rename stanza 'Install' to 'Unpack'
+  * eipp: enable xz-compressed scenario logging
+  * if conf unset, don't read / as conf/pref/sources dir
+  * don't do atomic overrides with failed files (Closes: 828908)
+  * if reading of autobit state failed, let write fail
+  * write auto-bits before calling dpkg & again after if needed
+  * protect only the latest same-source providers from autoremove
+  * reinstalling local deb file is no downgrade
+  * do not treat same-version local debs as downgrade
+  * alias apt-key list to finger (Closes: 829232)
+  * warn if apt-key is used in scripts/its output parsed
+  * deprecate 'apt-key update' and no-op it in Debian
+  * use +0000 instead of UTC by default as timezone in output
+  * avoid 416 response teardown binding to null pointer
+  * report write errors in EDSP/EIPP properly back to caller
+  * EIPP/EDSP log can't be written is a warning, not an error
+  * don't change owner/perms/times through file:// symlinks
+  * report all instead of first error up the acquire chain
+  * keep trying with next if connection to a SRV host failed
+
+  [ Zhou Mo ]
+  * zh_CN.po: update simplified chinese translation
+
+  [ Julian Andres Klode ]
+  * methods/ftp: Cope with weird PASV responses.
+    Thanks to Lukasz Stelmach for the initial patch (Closes: #420940)
+  * Fix buffer overflow in debListParser::VersionHash() (Closes: #828812)
+  * cache: Bump minor version to 6
+  * indextargets: Check that cache could be built before using it
+    (Closes: #829651)
+
+  [ Nicolas Le Cam ]
+  * Use the ConditionACPower feature of systemd in the apt-daily service
+    (Closes: #827930)
+  * Add a apt suggests powermgmt-base
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 07 Jul 2016 20:25:18 +0200
+

 apt (1.3~exp3) experimental; urgency=medium
 
   [ Petter Reinholdtsen ]
 apt (1.3~exp3) experimental; urgency=medium
 
   [ Petter Reinholdtsen ]

diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index c9e5ba28ea71975e228ef7365d58833c1c420fce..7abbda9040c10e1871c077cc30c43b0789803b3d 100644 (file)
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>2016-06-11T00:00:00Z</date>
+   <date>2016-06-22T00:00:00Z</date>

  </refentryinfo>
  
  <refmeta>
  </refentryinfo>
  
  <refmeta>

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index e1cdbc3cfb21f04c4a46217bba468a19ed7f0105..99919e13470f516b72ead9245a28781b0e00f45d 100644 (file)
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>2016-03-18T00:00:00Z</date>
+   <date>2016-06-22T00:00:00Z</date>

  </refentryinfo>
  
  <refmeta>
  </refentryinfo>
  
  <refmeta>

diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 23e64d000c108bd25f10965665b330edc1a0352e..093abfe8aab25b3a7162c551b1bab322754d3557 100644 (file)
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -13,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>2016-07-01T00:00:00Z</date>
+   <date>2016-07-07T00:00:00Z</date>

  </refentryinfo>
 
  <refmeta>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 491c40f62d59a3817f6cbada0252114567b54432..0ae4728d9a3be47f8de7a8869227ad3d54c44142 100644 (file)
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -13,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>2016-06-20T00:00:00Z</date>
+   <date>2016-06-22T00:00:00Z</date>

  </refentryinfo>
 
  <refmeta>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index d9c9c0f06ca0c49b3b4dbba088918a0712af9974..9727d468298e7f5a8994c43bc1ee48750afd0105 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -239,7 +239,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
 ">
 
 <!-- this will be updated by 'prepare-release' -->

-<!ENTITY apt-product-version "1.3~exp3">
+<!ENTITY apt-product-version "1.3~pre1">

 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "wheezy">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "wheezy">

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 23ff061f0a336051c6e0aa3c1896283baccd923e..6139e5b38e2af18f3f60401395cc4f3eb90cea02 100644 (file)
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -19,7 +19,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>2016-06-20T00:00:00Z</date>
+   <date>2016-06-22T00:00:00Z</date>

  </refentryinfo>
  
  <refmeta>
  </refentryinfo>
  
  <refmeta>

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 09954b4429655030e3b97547da577222c3332081..edbe2ba9ef532e4549c55e96244842e279b201d4 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: apt-doc 1.3~exp3\n"
+"Project-Id-Version: apt-doc 1.3~pre1\n"

 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-06-22 14:50+0200\n"
+"POT-Creation-Date: 2016-07-07 20:38+0200\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


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

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

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


@@ -1887,6 +1887,19 @@ msgid ""
 "keys will be considered trusted."
 msgstr ""
 
 "keys will be considered trusted."
 msgstr ""
 

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

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


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

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

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

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

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

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

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

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

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

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

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


@@ -1943,6 +1960,11 @@ msgid ""
 "care."
 msgstr ""
 
 "care."
 msgstr ""
 

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

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


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

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

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


@@ -1986,36 +2018,6 @@ msgid ""
 "e.g. new keys are added to this one."
 msgstr ""
 
 "e.g. new keys are added to this one."
 msgstr ""
 

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

 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml:1
 msgid "&apt-get;, &apt-secure;"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml:1
 msgid "&apt-get;, &apt-secure;"

diff --git a/doc/po/de.po b/doc/po/de.po
index 78c08b126afc90ac7ebd4cec4541f14479345567..2d6037a069c248fef623405f9883630e8b7da162 100644 (file)
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-06-22 14:50+0200\n"
+"POT-Creation-Date: 2016-07-07 20:38+0200\n"

 "PO-Revision-Date: 2014-09-14 14:46+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "PO-Revision-Date: 2014-09-14 14:46+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"


@@ -713,7 +713,7 @@ msgstr ""
 "Paketkonflikts nötig ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "Paketkonflikts nötig ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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


@@ -2685,6 +2685,18 @@ msgstr ""
 "Benutzung dieser Schlüssel authentifiziert wurden, werden als "
 "vertrauenswürdig betrachtet."
 
 "Benutzung dieser Schlüssel authentifiziert wurden, werden als "
 "vertrauenswürdig betrachtet."
 

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

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


@@ -2709,6 +2721,15 @@ msgid ""
 "otherwise the &apt-secure; infrastructure is completely undermined."
 msgstr ""
 
 "otherwise the &apt-secure; infrastructure is completely undermined."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Instead of using this command a keyring can be placed directly in the "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+"name (same rules for filename apply as for &apt-conf; files) and "
+"\"<literal>gpg</literal>\" as file extension."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."


@@ -2727,14 +2748,11 @@ msgstr "gibt alle vertrauenswürdigen Schlüssel auf der Standardausgabe aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "List trusted keys."
+#, fuzzy
+#| msgid "List trusted keys."
+msgid "List trusted keys with fingerprints."

 msgstr "listet vertrauenswürdige Schlüssel auf."
 
 msgstr "listet vertrauenswürdige Schlüssel auf."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "List fingerprints of trusted keys."
-msgstr "listet Fingerabdrücke vertrauenswürdiger Schlüssel auf."
-

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


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

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

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


@@ -2758,6 +2781,16 @@ msgstr ""
 "keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem Paket &keyring-"
 "package; in &keyring-distro;."
 
 "keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem Paket &keyring-"
 "package; in &keyring-distro;."
 

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

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


@@ -2807,39 +2840,6 @@ msgstr ""
 "<filename>trusted.gpg</filename> der primäre Schlüsselbund wird, d.h. neue "
 "Schlüssel werden zu diesem hinzugefügt."
 
 "<filename>trusted.gpg</filename> der primäre Schlüsselbund wird, d.h. neue "
 "Schlüssel werden zu diesem hinzugefügt."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Local trust database of archive keys."
-msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-filename;"
-msgstr "&keyring-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive trusted keys."
-msgstr ""
-"Schlüsselbund vertrauenswürdiger Schlüssel des &keyring-distro;-Archivs"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-removed-filename;"
-msgstr "&keyring-removed-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive removed trusted keys."
-msgstr ""
-"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des &keyring-distro;-"
-"Archivs"
-

 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"


@@ -11334,6 +11334,30 @@ msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 

+#~ msgid "List fingerprints of trusted keys."
+#~ msgstr "listet Fingerabdrücke vertrauenswürdiger Schlüssel auf."
+
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#~ msgid "Local trust database of archive keys."
+#~ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
+
+#~ msgid "&keyring-filename;"
+#~ msgstr "&keyring-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive trusted keys."
+#~ msgstr ""
+#~ "Schlüsselbund vertrauenswürdiger Schlüssel des &keyring-distro;-Archivs"
+
+#~ msgid "&keyring-removed-filename;"
+#~ msgstr "&keyring-removed-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive removed trusted keys."
+#~ msgstr ""
+#~ "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des &keyring-"
+#~ "distro;-Archivs"
+

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

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

-"POT-Creation-Date: 2016-06-22 14:50+0200\n"
+"POT-Creation-Date: 2016-07-07 20:38+0200\n"

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


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

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

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


@@ -2757,6 +2757,18 @@ msgstr ""
 "usa para autenticar paquetes. Los paquetes autenticados mediante estas "
 "claves se consideran de confianza."
 
 "usa para autenticar paquetes. Los paquetes autenticados mediante estas "
 "claves se consideran de confianza."
 

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

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


@@ -2781,6 +2793,15 @@ msgid ""
 "otherwise the &apt-secure; infrastructure is completely undermined."
 msgstr ""
 
 "otherwise the &apt-secure; infrastructure is completely undermined."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Instead of using this command a keyring can be placed directly in the "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+"name (same rules for filename apply as for &apt-conf; files) and "
+"\"<literal>gpg</literal>\" as file extension."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."


@@ -2798,14 +2819,11 @@ msgstr "Devuelve todas las claves de confianza por la salida estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "List trusted keys."
+#, fuzzy
+#| msgid "List trusted keys."
+msgid "List trusted keys with fingerprints."

 msgstr "Lista las claves de confianza."
 
 msgstr "Lista las claves de confianza."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "List fingerprints of trusted keys."
-msgstr "Lista las huellas digitales de las claves de confianza."
-

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


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

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

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


@@ -2829,6 +2852,16 @@ msgstr ""
 "keyring</literal> de su distribución; esto es, el paquete &keyring-package; "
 "en &keyring-distro;."
 
 "keyring</literal> de su distribución; esto es, el paquete &keyring-package; "
 "en &keyring-distro;."
 

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

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


@@ -2878,38 +2911,6 @@ msgstr ""
 "<filename>trusted.gpg</filename> es el registro de claves principal, esto "
 "es, por ejemplo, que las claves nuevas se añaden a este fichero."
 
 "<filename>trusted.gpg</filename> es el registro de claves principal, esto "
 "es, por ejemplo, que las claves nuevas se añaden a este fichero."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Local trust database of archive keys."
-msgstr "Base de datos local de las claves de confianza de archivos Debian"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-filename;"
-msgstr "&keyring-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive trusted keys."
-msgstr "Registro de las claves de confianza del archivo de &keyring-distro;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-removed-filename;"
-msgstr "&keyring-removed-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive removed trusted keys."
-msgstr ""
-"Registro de las claves de confianza eliminadas del archivo de &keyring-"
-"distro;."
-

 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"


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

+#~ msgid "List fingerprints of trusted keys."
+#~ msgstr "Lista las huellas digitales de las claves de confianza."
+
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#~ msgid "Local trust database of archive keys."
+#~ msgstr "Base de datos local de las claves de confianza de archivos Debian"
+
+#~ msgid "&keyring-filename;"
+#~ msgstr "&keyring-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive trusted keys."
+#~ msgstr ""
+#~ "Registro de las claves de confianza del archivo de &keyring-distro;."
+
+#~ msgid "&keyring-removed-filename;"
+#~ msgstr "&keyring-removed-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive removed trusted keys."
+#~ msgstr ""
+#~ "Registro de las claves de confianza eliminadas del archivo de &keyring-"
+#~ "distro;."
+

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

diff --git a/doc/po/fr.po b/doc/po/fr.po
index dc01f12fa8c286988071bac9bee56cf03ecde58c..5853bf251fb1fe2fd1ac89736b34caa3179783bc 100644 (file)
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-06-22 14:50+0200\n"
+"POT-Creation-Date: 2016-07-07 20:38+0200\n"

 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"


@@ -710,7 +710,7 @@ msgstr ""
 "nécessaire pour résoudre un conflit entre des paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "nécessaire pour résoudre un conflit entre des paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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


@@ -2682,6 +2682,18 @@ msgstr ""
 "<command>apt-key</command> gère les clés dont se sert apt pour authentifier "
 "les paquets. Les paquets authentifiés par ces clés seront réputés fiables."
 
 "<command>apt-key</command> gère les clés dont se sert apt pour authentifier "
 "les paquets. Les paquets authentifiés par ces clés seront réputés fiables."
 

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

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


@@ -2706,6 +2718,15 @@ msgid ""
 "otherwise the &apt-secure; infrastructure is completely undermined."
 msgstr ""
 
 "otherwise the &apt-secure; infrastructure is completely undermined."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Instead of using this command a keyring can be placed directly in the "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+"name (same rules for filename apply as for &apt-conf; files) and "
+"\"<literal>gpg</literal>\" as file extension."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."


@@ -2723,14 +2744,11 @@ msgstr "Afficher toutes les clés fiables sur la sortie standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "List trusted keys."
+#, fuzzy
+#| msgid "List trusted keys."
+msgid "List trusted keys with fingerprints."

 msgstr "Afficher la liste des clés fiables."
 
 msgstr "Afficher la liste des clés fiables."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "List fingerprints of trusted keys."
-msgstr "Afficher les empreintes des clés fiables."
-

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


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

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

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


@@ -2754,6 +2777,16 @@ msgstr ""
 "literal> de la distribution, par exemple le paquet &keyring-package; dans "
 "&keyring-distro;."
 
 "literal> de la distribution, par exemple le paquet &keyring-package; dans "
 "&keyring-distro;."
 

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

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


@@ -2803,36 +2836,6 @@ msgstr ""
 "gpg</filename> reste le fichier principal pour les clés donc, par exemple, "
 "les nouvelles clés y seront ajoutées."
 
 "gpg</filename> reste le fichier principal pour les clés donc, par exemple, "
 "les nouvelles clés y seront ajoutées."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Local trust database of archive keys."
-msgstr "Base de données locale de fiabilité des clés de l'archive."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-filename;"
-msgstr "&keyring-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive trusted keys."
-msgstr "Trousseau des clés fiables de l'archive &keyring-distro;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-removed-filename;"
-msgstr "&keyring-removed-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive removed trusted keys."
-msgstr "Trousseau des clés fiables supprimées de l'archive &keyring-distro;."
-

 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"


@@ -11290,6 +11293,28 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 

+#~ msgid "List fingerprints of trusted keys."
+#~ msgstr "Afficher les empreintes des clés fiables."
+
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#~ msgid "Local trust database of archive keys."
+#~ msgstr "Base de données locale de fiabilité des clés de l'archive."
+
+#~ msgid "&keyring-filename;"
+#~ msgstr "&keyring-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive trusted keys."
+#~ msgstr "Trousseau des clés fiables de l'archive &keyring-distro;."
+
+#~ msgid "&keyring-removed-filename;"
+#~ msgstr "&keyring-removed-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive removed trusted keys."
+#~ msgstr ""
+#~ "Trousseau des clés fiables supprimées de l'archive &keyring-distro;."
+

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

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

-"POT-Creation-Date: 2016-06-22 14:50+0200\n"
+"POT-Creation-Date: 2016-07-07 20:38+0200\n"

 "PO-Revision-Date: 2015-12-27 21:26+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "PO-Revision-Date: 2015-12-27 21:26+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"


@@ -765,7 +765,7 @@ msgstr ""
 "aggiornare il sistema nel suo complesso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "aggiornare il sistema nel suo complesso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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


@@ -2712,6 +2712,18 @@ msgstr ""
 "usate da apt per autenticare i pacchetti. I pacchetti che sono stati "
 "autenticati usando queste chiavi verranno considerati fidati."
 
 "usate da apt per autenticare i pacchetti. I pacchetti che sono stati "
 "autenticati usando queste chiavi verranno considerati fidati."
 

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

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


@@ -2740,6 +2752,15 @@ msgstr ""
 "cui dichiarano di essere, altrimenti l'infrastruttura &apt-secure; viene "
 "completamente minata alla base."
 
 "cui dichiarano di essere, altrimenti l'infrastruttura &apt-secure; viene "
 "completamente minata alla base."
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Instead of using this command a keyring can be placed directly in the "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+"name (same rules for filename apply as for &apt-conf; files) and "
+"\"<literal>gpg</literal>\" as file extension."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."


@@ -2758,14 +2779,11 @@ msgstr "Visualizza sullo standard output tutte le chiavi fidate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "List trusted keys."
+#, fuzzy
+#| msgid "List trusted keys."
+msgid "List trusted keys with fingerprints."

 msgstr "Elenca le chiavi fidate."
 
 msgstr "Elenca le chiavi fidate."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "List fingerprints of trusted keys."
-msgstr "Elenca le impronte digitali delle chiavi fidate."
-

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


@@ -2780,6 +2798,11 @@ msgstr ""
 "effettuato alcun controllo, perciò è facile minare completamente "
 "l'infrastruttura &apt-secure; se viene usato senza cautela."
 
 "effettuato alcun controllo, perciò è facile minare completamente "
 "l'infrastruttura &apt-secure; se viene usato senza cautela."
 

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

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


@@ -2794,6 +2817,16 @@ msgstr ""
 "literal> delle diverse distribuzioni, ad esempio il pacchetto &keyring-"
 "package; in &keyring-distro;."
 
 "literal> delle diverse distribuzioni, ad esempio il pacchetto &keyring-"
 "package; in &keyring-distro;."
 

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

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


@@ -2843,37 +2876,6 @@ msgstr ""
 "gpg</filename> è però il portachiavi primario il che significa, ad esempio, "
 "che le nuove chiavi sono aggiunte ad esso."
 
 "gpg</filename> è però il portachiavi primario il che significa, ad esempio, "
 "che le nuove chiavi sono aggiunte ad esso."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Local trust database of archive keys."
-msgstr "Database locale di fiducia delle chiavi archiviate."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-filename;"
-msgstr "&keyring-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive trusted keys."
-msgstr "Portachiavi delle chiavi fidate degli archivi &keyring-distro;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-removed-filename;"
-msgstr "&keyring-removed-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive removed trusted keys."
-msgstr ""
-"Portachiavi delle chiavi fidate rimosse degli archivi &keyring-distro;."
-

 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"


@@ -11416,6 +11418,28 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 

+#~ msgid "List fingerprints of trusted keys."
+#~ msgstr "Elenca le impronte digitali delle chiavi fidate."
+
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#~ msgid "Local trust database of archive keys."
+#~ msgstr "Database locale di fiducia delle chiavi archiviate."
+
+#~ msgid "&keyring-filename;"
+#~ msgstr "&keyring-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive trusted keys."
+#~ msgstr "Portachiavi delle chiavi fidate degli archivi &keyring-distro;."
+
+#~ msgid "&keyring-removed-filename;"
+#~ msgstr "&keyring-removed-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive removed trusted keys."
+#~ msgstr ""
+#~ "Portachiavi delle chiavi fidate rimosse degli archivi &keyring-distro;."
+

 #~ msgid ""
 #~ "In the future APT will refuse to work with unauthenticated repositories "
 #~ "by default until support for them is removed entirely. Users have the "
 #~ msgid ""
 #~ "In the future APT will refuse to work with unauthenticated repositories "
 #~ "by default until support for them is removed entirely. Users have the "

diff --git a/doc/po/ja.po b/doc/po/ja.po
index 6ce6be988a6e98c348b9f417e958f8bddb00fb60..2e9263aa3c4269b85be0144e2c3d442708cc1257 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-06-22 14:50+0200\n"
+"POT-Creation-Date: 2016-07-07 20:38+0200\n"

 "PO-Revision-Date: 2016-03-23 09:39+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "PO-Revision-Date: 2016-03-23 09:39+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"


@@ -762,7 +762,7 @@ msgstr ""
 "パッケージを削除することができます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "パッケージを削除することができます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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


@@ -2615,6 +2615,18 @@ msgstr ""
 "一覧を管理するのに使用します。このキーで認証されたパッケージは、信頼するに足"
 "ると見なせるでしょう。"
 
 "一覧を管理するのに使用します。このキーで認証されたパッケージは、信頼するに足"
 "ると見なせるでしょう。"
 

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

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


@@ -2642,6 +2654,15 @@ msgstr ""
 "者に所属していることが確認されていることが重要です。そうでなければ、&apt-"
 "secure; インフラが完全に損なわれます。"
 
 "者に所属していることが確認されていることが重要です。そうでなければ、&apt-"
 "secure; インフラが完全に損なわれます。"
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Instead of using this command a keyring can be placed directly in the "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+"name (same rules for filename apply as for &apt-conf; files) and "
+"\"<literal>gpg</literal>\" as file extension."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."


@@ -2659,14 +2680,11 @@ msgstr "信頼するキーをすべて標準出力に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "List trusted keys."
+#, fuzzy
+#| msgid "List trusted keys."
+msgid "List trusted keys with fingerprints."

 msgstr "信頼キーを一覧表示します。"
 
 msgstr "信頼キーを一覧表示します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "List fingerprints of trusted keys."
-msgstr "信頼キーのフィンガープリントを一覧表示します。"
-

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


@@ -2680,6 +2698,11 @@ msgstr ""
 "できます。チェックが<emphasis>行われない</emphasis>ことに注意してください。注"
 "意せず使用するなら、容易に &apt-secure; インフラを完全に傷つけます。"
 
 "できます。チェックが<emphasis>行われない</emphasis>ことに注意してください。注"
 "意せず使用するなら、容易に &apt-secure; インフラを完全に傷つけます。"
 

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

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


@@ -2694,6 +2717,16 @@ msgstr ""
 "(例えば &keyring-distro; では &keyring-package; パッケージ) で提供されていま"
 "す。"
 
 "(例えば &keyring-distro; では &keyring-package; パッケージ) で提供されていま"
 "す。"
 

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

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


@@ -2741,36 +2774,6 @@ msgstr ""
 "ます。とはいえ、<filename>trusted.gpg</filename> がプライマリキーリングになり"
 "ます。つまり新しいキーはこのファイルに追加されます。"
 
 "ます。とはいえ、<filename>trusted.gpg</filename> がプライマリキーリングになり"
 "ます。つまり新しいキーはこのファイルに追加されます。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Local trust database of archive keys."
-msgstr "アーカイブキーのローカル信頼データベースです。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-filename;"
-msgstr "&keyring-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive trusted keys."
-msgstr "&keyring-distro; アーカイブ信頼キーのキーリングです。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-removed-filename;"
-msgstr "&keyring-removed-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive removed trusted keys."
-msgstr "削除された &keyring-distro; アーカイブ信頼キーのキーリングです。"
-

 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"


@@ -10949,6 +10952,27 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 

+#~ msgid "List fingerprints of trusted keys."
+#~ msgstr "信頼キーのフィンガープリントを一覧表示します。"
+
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#~ msgid "Local trust database of archive keys."
+#~ msgstr "アーカイブキーのローカル信頼データベースです。"
+
+#~ msgid "&keyring-filename;"
+#~ msgstr "&keyring-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive trusted keys."
+#~ msgstr "&keyring-distro; アーカイブ信頼キーのキーリングです。"
+
+#~ msgid "&keyring-removed-filename;"
+#~ msgstr "&keyring-removed-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive removed trusted keys."
+#~ msgstr "削除された &keyring-distro; アーカイブ信頼キーのキーリングです。"
+

 #~ msgid ""
 #~ "In the future APT will refuse to work with unauthenticated repositories "
 #~ "by default until support for them is removed entirely. Users have the "
 #~ msgid ""
 #~ "In the future APT will refuse to work with unauthenticated repositories "
 #~ "by default until support for them is removed entirely. Users have the "

diff --git a/doc/po/nl.po b/doc/po/nl.po
index 5de47b459bf6a16a8165d9b9ca81abf4eeb188ca..6cd0fb5234a5b648fba2cd3349b6b83d6fd6d8da 100644 (file)
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.1.10-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.1.10-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-06-22 14:50+0200\n"
+"POT-Creation-Date: 2016-07-07 20:38+0200\n"

 "PO-Revision-Date: 2016-02-01 16:17+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "PO-Revision-Date: 2016-02-01 16:17+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"


@@ -770,7 +770,7 @@ msgstr ""
 "systeem volledig op te waarderen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "systeem volledig op te waarderen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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


@@ -2754,6 +2754,18 @@ msgstr ""
 "Pakketten die met deze sleutels geauthenticeerd werden, worden als "
 "betrouwbaar beschouwd."
 
 "Pakketten die met deze sleutels geauthenticeerd werden, worden als "
 "betrouwbaar beschouwd."
 

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

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


@@ -2784,6 +2796,15 @@ msgstr ""
 "werkelijkheid overeenkomt, anders wordt de &apt-secure;-infrastructuur "
 "volledig ondermijnd."
 
 "werkelijkheid overeenkomt, anders wordt de &apt-secure;-infrastructuur "
 "volledig ondermijnd."
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Instead of using this command a keyring can be placed directly in the "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+"name (same rules for filename apply as for &apt-conf; files) and "
+"\"<literal>gpg</literal>\" as file extension."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."


@@ -2801,14 +2822,11 @@ msgstr "Alle betrouwbare sleutels op de standaarduitvoer weergeven."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "List trusted keys."
+#, fuzzy
+#| msgid "List trusted keys."
+msgid "List trusted keys with fingerprints."

 msgstr "Betrouwbare sleutels weergeven."
 
 msgstr "Betrouwbare sleutels weergeven."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "List fingerprints of trusted keys."
-msgstr "De vingerafdrukken van de betrouwbare sleutels weergeven."
-

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


@@ -2824,6 +2842,11 @@ msgstr ""
 "secure;-infrastructuur volledig ondermijnen als het onzorgvuldig gebruikt "
 "wordt."
 
 "secure;-infrastructuur volledig ondermijnen als het onzorgvuldig gebruikt "
 "wordt."
 

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

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


@@ -2838,6 +2861,16 @@ msgstr ""
 "<literal>archive-keyring</literal> van uw distributie, bijvoorbeeld het "
 "pakket &keyring-package; in &keyring-distro;."
 
 "<literal>archive-keyring</literal> van uw distributie, bijvoorbeeld het "
 "pakket &keyring-package; in &keyring-distro;."
 

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

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


@@ -2888,38 +2921,6 @@ msgstr ""
 "de primaire sleutelbos is, wat betekent dat bijvoorbeeld alle nieuwe "
 "sleutels daar toegevoegd worden."
 
 "de primaire sleutelbos is, wat betekent dat bijvoorbeeld alle nieuwe "
 "sleutels daar toegevoegd worden."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Local trust database of archive keys."
-msgstr "Lokale database van betrouwbare archiefsleutels."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-filename;"
-msgstr "&keyring-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive trusted keys."
-msgstr "Sleutelbos met betrouwbare sleutels van het archief &keyring-distro;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-removed-filename;"
-msgstr "&keyring-removed-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive removed trusted keys."
-msgstr ""
-"Sleutelbos met uit het archief &keyring-distro; verwijderde betrouwbare "
-"sleutels."
-

 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"


@@ -11651,6 +11652,30 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
 
 msgstr ""
 "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
 

+#~ msgid "List fingerprints of trusted keys."
+#~ msgstr "De vingerafdrukken van de betrouwbare sleutels weergeven."
+
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#~ msgid "Local trust database of archive keys."
+#~ msgstr "Lokale database van betrouwbare archiefsleutels."
+
+#~ msgid "&keyring-filename;"
+#~ msgstr "&keyring-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive trusted keys."
+#~ msgstr ""
+#~ "Sleutelbos met betrouwbare sleutels van het archief &keyring-distro;."
+
+#~ msgid "&keyring-removed-filename;"
+#~ msgstr "&keyring-removed-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive removed trusted keys."
+#~ msgstr ""
+#~ "Sleutelbos met uit het archief &keyring-distro; verwijderde betrouwbare "
+#~ "sleutels."
+

 #~ msgid ""
 #~ "In the future APT will refuse to work with unauthenticated repositories "
 #~ "by default until support for them is removed entirely. Users have the "
 #~ msgid ""
 #~ "In the future APT will refuse to work with unauthenticated repositories "
 #~ "by default until support for them is removed entirely. Users have the "

diff --git a/doc/po/pl.po b/doc/po/pl.po
index 8d828b8cbf11a2f62fd2e4b97e6400709dc842c2..b5ae895e1f9be0758d4f820c33fe11c6ff83b9b2 100644 (file)
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-06-22 14:50+0200\n"
+"POT-Creation-Date: 2016-07-07 20:38+0200\n"

 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"


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

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

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


@@ -2793,6 +2793,18 @@ msgstr ""
 "autentyczność została sprawdzona przy użyciu tych kluczy, są uznawane za "
 "zaufane."
 
 "autentyczność została sprawdzona przy użyciu tych kluczy, są uznawane za "
 "zaufane."
 

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

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


@@ -2817,6 +2829,15 @@ msgid ""
 "otherwise the &apt-secure; infrastructure is completely undermined."
 msgstr ""
 
 "otherwise the &apt-secure; infrastructure is completely undermined."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Instead of using this command a keyring can be placed directly in the "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+"name (same rules for filename apply as for &apt-conf; files) and "
+"\"<literal>gpg</literal>\" as file extension."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."


@@ -2834,14 +2855,11 @@ msgstr "Wypisuje na standardowe wyjście wszystkie zaufane klucze."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "List trusted keys."
+#, fuzzy
+#| msgid "List trusted keys."
+msgid "List trusted keys with fingerprints."

 msgstr "Wyświetla listę zaufanych kluczy."
 
 msgstr "Wyświetla listę zaufanych kluczy."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "List fingerprints of trusted keys."
-msgstr "Wyświetla listę odcisków zaufanych kluczy."
-

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


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

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

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


@@ -2865,6 +2888,16 @@ msgstr ""
 "Twojej dystrybucji, np. pakiet &keyring-package; w systemach &keyring-"
 "distro;."
 
 "Twojej dystrybucji, np. pakiet &keyring-package; w systemach &keyring-"
 "distro;."
 

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

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


@@ -2914,36 +2947,6 @@ msgstr ""
 "składnicą kluczy, co oznacza na przykład to, że nowe klucze będą dodawane "
 "właśnie tam."
 
 "składnicą kluczy, co oznacza na przykład to, że nowe klucze będą dodawane "
 "właśnie tam."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Local trust database of archive keys."
-msgstr "Lokalna składnica zaufanych kluczy archiwum."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-filename;"
-msgstr "&keyring-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive trusted keys."
-msgstr "Składnica zaufanych kluczy archiwum &keyring-distro;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-removed-filename;"
-msgstr "&keyring-removed-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive removed trusted keys."
-msgstr "Składnica usuniętych zaufanych kluczy archiwum &keyring-distro;."
-

 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"


@@ -10366,6 +10369,27 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 

+#~ msgid "List fingerprints of trusted keys."
+#~ msgstr "Wyświetla listę odcisków zaufanych kluczy."
+
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#~ msgid "Local trust database of archive keys."
+#~ msgstr "Lokalna składnica zaufanych kluczy archiwum."
+
+#~ msgid "&keyring-filename;"
+#~ msgstr "&keyring-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive trusted keys."
+#~ msgstr "Składnica zaufanych kluczy archiwum &keyring-distro;."
+
+#~ msgid "&keyring-removed-filename;"
+#~ msgstr "&keyring-removed-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive removed trusted keys."
+#~ msgstr "Składnica usuniętych zaufanych kluczy archiwum &keyring-distro;."
+

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

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 9dc7681723d83c81e92281c4d22de683c0a397f9..a2ffc40124750d2c2acb7da2855a7c422c47700f 100644 (file)
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-06-22 14:50+0200\n"
+"POT-Creation-Date: 2016-07-07 20:38+0200\n"

 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"


@@ -758,7 +758,7 @@ msgstr ""
 "conflito de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "conflito de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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


@@ -2695,6 +2695,18 @@ msgstr ""
 "pelo apt para autenticar pacotes. Os pacotes que foram autenticados com "
 "estas chaves serão considerados de confiança."
 
 "pelo apt para autenticar pacotes. Os pacotes que foram autenticados com "
 "estas chaves serão considerados de confiança."
 

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

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


@@ -2719,6 +2731,15 @@ msgid ""
 "otherwise the &apt-secure; infrastructure is completely undermined."
 msgstr ""
 
 "otherwise the &apt-secure; infrastructure is completely undermined."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Instead of using this command a keyring can be placed directly in the "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+"name (same rules for filename apply as for &apt-conf; files) and "
+"\"<literal>gpg</literal>\" as file extension."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."


@@ -2736,14 +2757,11 @@ msgstr "Escreve todas as chaves de confiança na saída standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml

-msgid "List trusted keys."
+#, fuzzy
+#| msgid "List trusted keys."
+msgid "List trusted keys with fingerprints."

 msgstr "Lista as chaves de confiança."
 
 msgstr "Lista as chaves de confiança."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "List fingerprints of trusted keys."
-msgstr "Lista as fingerprints das chaves de confiança."
-

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


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

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

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


@@ -2766,6 +2789,16 @@ msgstr ""
 "submetido no pacote <literal>archive-keyring</literal> da sua distribuição, "
 "por exemplo o pacote &keyring-package; em &keyring-distro;."
 
 "submetido no pacote <literal>archive-keyring</literal> da sua distribuição, "
 "por exemplo o pacote &keyring-package; em &keyring-distro;."
 

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

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


@@ -2815,37 +2848,6 @@ msgstr ""
 "filename> é o chaveiro principal o que significa que, por exemplo, as novas "
 "chaves são adicionadas a este."
 
 "filename> é o chaveiro principal o que significa que, por exemplo, as novas "
 "chaves são adicionadas a este."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Local trust database of archive keys."
-msgstr "Base de dados local de confiança de chaves de arquivos."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-filename;"
-msgstr "&keyring-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive trusted keys."
-msgstr "Chaveiro das chaves de confiança dos arquivos &keyring-distro;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "&keyring-removed-filename;"
-msgstr "&keyring-removed-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml
-msgid "Keyring of &keyring-distro; archive removed trusted keys."
-msgstr ""
-"Chaveiro das chaves de confiança removidas dos arquivos &keyring-distro;."
-

 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"


@@ -11202,6 +11204,28 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 

+#~ msgid "List fingerprints of trusted keys."
+#~ msgstr "Lista as fingerprints das chaves de confiança."
+
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#~ msgid "Local trust database of archive keys."
+#~ msgstr "Base de dados local de confiança de chaves de arquivos."
+
+#~ msgid "&keyring-filename;"
+#~ msgstr "&keyring-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive trusted keys."
+#~ msgstr "Chaveiro das chaves de confiança dos arquivos &keyring-distro;."
+
+#~ msgid "&keyring-removed-filename;"
+#~ msgstr "&keyring-removed-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive removed trusted keys."
+#~ msgstr ""
+#~ "Chaveiro das chaves de confiança removidas dos arquivos &keyring-distro;."
+

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

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

-"POT-Creation-Date: 2016-06-22 14:50+0200\n"
+"POT-Creation-Date: 2016-07-07 20:38+0200\n"

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


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

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

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


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

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

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


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

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

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

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

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

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

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

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

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

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

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


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

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

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


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

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

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


@@ -1964,37 +1995,6 @@ msgid ""
 "this one."
 msgstr ""
 
 "this one."
 msgstr ""
 

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

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


@@ -8292,6 +8292,10 @@ msgstr ""
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 

+#, fuzzy
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt.conf</>"
+

 #, fuzzy
 #~ msgid "&apt-get;, &apt-conf;"
 #~ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 #, fuzzy
 #~ msgid "&apt-get;, &apt-conf;"
 #~ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index e6d82b1e79af05c0a82011949740ab7ace282917..bbd312e69ced57ea9b76f3d5148b8aee6f24dfef 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>2016-06-20T00:00:00Z</date>
+   <date>2016-06-22T00:00:00Z</date>

  </refentryinfo>
  
  <refmeta>
  </refentryinfo>
  
  <refmeta>