Browse Source

add a vendor specific file to have configurable entities

manpages sometimes refer to distro-specific things like the name of the
package providing the achive-keyring. Having a central place to
configure this helps in having it consistent in the manpages and allows
to load this info from other places in the buildsystem as well later.
tags/devuan/2.0.1+devuan1
David Kalnischkies 7 years ago
parent
commit
694ef56e80
28 changed files with 210 additions and 166 deletions
  1. +1
    -0
      .gitignore
  2. +5
    -2
      buildlib/po4a_manpage.mak
  3. +2
    -0
      doc/apt-cache.8.xml
  4. +2
    -0
      doc/apt-cdrom.8.xml
  5. +2
    -0
      doc/apt-config.8.xml
  6. +2
    -0
      doc/apt-extracttemplates.1.xml
  7. +2
    -0
      doc/apt-ftparchive.1.xml
  8. +2
    -0
      doc/apt-get.8.xml
  9. +7
    -5
      doc/apt-key.8.xml
  10. +2
    -0
      doc/apt-mark.8.xml
  11. +5
    -3
      doc/apt-secure.8.xml
  12. +2
    -0
      doc/apt-sortpkgs.1.xml
  13. +2
    -0
      doc/apt.conf.5.xml
  14. +2
    -0
      doc/apt_preferences.5.xml
  15. +5
    -2
      doc/en/makefile
  16. +4
    -1
      doc/makefile
  17. +10
    -10
      doc/po/apt-doc.pot
  18. +19
    -19
      doc/po/de.po
  19. +20
    -20
      doc/po/es.po
  20. +18
    -18
      doc/po/fr.po
  21. +18
    -18
      doc/po/it.po
  22. +19
    -19
      doc/po/ja.po
  23. +19
    -20
      doc/po/pl.po
  24. +18
    -19
      doc/po/pt.po
  25. +10
    -10
      doc/po/pt_BR.po
  26. +2
    -0
      doc/sources.list.5.xml
  27. +5
    -0
      vendor/debian/apt-vendor.ent
  28. +5
    -0
      vendor/ubuntu/apt-vendor.ent

+ 1
- 0
.gitignore View File

@@ -31,6 +31,7 @@
/debian/apt-transport-https/

# generated from *.in files
/doc/apt-vendor.ent
/doc/examples/sources.list
/debian/libapt-pkg*.install
/debian/libapt-inst*.install


+ 5
- 2
buildlib/po4a_manpage.mak View File

@@ -11,7 +11,7 @@

# generate a list of accepted man page translations
SOURCE = $(patsubst %.xml,%,$(wildcard *.$(LC).?.xml))
INCLUDES = apt.ent apt-verbatim.ent
INCLUDES = apt.ent apt-verbatim.ent apt-vendor.ent

manpages:

@@ -29,7 +29,10 @@ clean: clean/$(LOCAL)
veryclean: veryclean/$(LOCAL)

apt-verbatim.ent: ../apt-verbatim.ent
cp ../apt-verbatim.ent .
cp -a ../apt-verbatim.ent .

apt-vendor.ent: ../apt-vendor.ent
cp -a ../apt-vendor.ent .

manpage-style.xsl: ../manpage-style.xsl
sed "/<!-- LANGUAGE -->/ i\


+ 2
- 0
doc/apt-cache.8.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 2
- 0
doc/apt-cdrom.8.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 2
- 0
doc/apt-config.8.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 2
- 0
doc/apt-extracttemplates.1.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 2
- 0
doc/apt-ftparchive.1.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 2
- 0
doc/apt-get.8.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 7
- 5
doc/apt-key.8.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>
@@ -130,7 +132,7 @@
Update the local keyring with the archive keyring and remove from
the local keyring the archive keys which are no longer valid.
The archive keyring is shipped in the <literal>archive-keyring</literal> package of your
distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian.
distribution, e.g. the &keyring-package; package in &keyring-distro;.

</para>

@@ -180,12 +182,12 @@
<listitem><para>Local trust database of archive keys.</para></listitem>
</varlistentry>

<varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
<listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
<varlistentry><term>&keyring-filename;</term>
<listitem><para>Keyring of &keyring-distro; archive trusted keys.</para></listitem>
</varlistentry>

<varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
<listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
<varlistentry><term>&keyring-removed-filename;</term>
<listitem><para>Keyring of &keyring-distro; archive removed trusted keys.</para></listitem>
</varlistentry>

</variablelist>


+ 2
- 0
doc/apt-mark.8.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 5
- 3
doc/apt-secure.8.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>
@@ -103,10 +105,10 @@
the maintainer signature is stripped off, and checksums of the package
are computed and put in the Packages file. The checksums of all of the
Packages files are then computed and put into the Release file. The
Release file is then signed by the archive key for this Debian release,
Release file is then signed by the archive key for this &keyring-distro; release,
and distributed alongside the packages and the Packages files on
Debian mirrors. The keys are in the Debian archive keyring available in
the <package>debian-archive-keyring</package> package.
&keyring-distro; mirrors. The keys are in the &keyring-distro; archive keyring
available in the &keyring-package; package.
</para>

<para>


+ 2
- 0
doc/apt-sortpkgs.1.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 2
- 0
doc/apt.conf.5.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 2
- 0
doc/apt_preferences.5.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 5
- 2
doc/en/makefile View File

@@ -9,12 +9,15 @@ include ../../buildlib/defaults.mak
ifdef XSLTPROC
# generate a list of accepted man page translations
SOURCE = $(patsubst ../%.xml,%,$(wildcard ../*.?.xml))
INCLUDES = ../apt.ent ../apt-verbatim.ent
INCLUDES = ../apt.ent ../apt-verbatim.ent apt-vendor.ent
STYLESHEET=../manpage-style.xsl

LOCAL := manpage-$(firstword $(SOURCE))
$(LOCAL)-LIST := $(SOURCE)

apt-vendor.ent: ../../vendor/current/apt-vendor.ent
ln -sf $(shell readlink -f $^) $@

# Install generation hooks
manpages: $($(LOCAL)-LIST) apt.8

@@ -30,7 +33,7 @@ apt.8: ../apt.8
veryclean: clean/$(LOCAL)
clean: clean/$(LOCAL)
clean/$(LOCAL):
-rm -rf $($(@F)-LIST) apt.8
-rm -rf $($(@F)-LIST) apt.8 apt-vendor.ent
endif

# Chain to the manpage rule


+ 4
- 1
doc/makefile View File

@@ -15,6 +15,8 @@ doc: manpages debiandoc
examples/sources.list: ../vendor/current/sources.list
ln -sf $(shell readlink -f $^) $@

apt-vendor.ent: ../vendor/current/apt-vendor.ent
ln -sf $(shell readlink -f $^) $@

# Examples
SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
@@ -26,7 +28,7 @@ include $(COPY_H)

clean: clean/subdirs clean/examples
veryclean: veryclean/subdirs clean/examples
manpages: manpages/subdirs
manpages: manpages/subdirs apt-vendor.ent
debiandoc: debiandoc/subdirs

DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
@@ -44,6 +46,7 @@ debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs:

clean/examples:
rm -f examples/sources.list
rm -f apt-vendor.ent

stats:
for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done


+ 10
- 10
doc/po/apt-doc.pot View File

@@ -1620,8 +1620,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
"Debian."
"distribution, e.g. the &keyring-package; package in "
"&keyring-distro;."
msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1670,22 +1670,22 @@ msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgid "&keyring-filename;"
msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
msgid "Keyring of Debian archive trusted keys."
msgid "Keyring of &keyring-distro; archive trusted keys."
msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid "&keyring-removed-filename;"
msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
msgid "Keyring of Debian archive removed trusted keys."
msgid "Keyring of &keyring-distro; archive removed trusted keys."
msgstr ""

#. type: Content of: <refentry><refsect1><para>
@@ -1862,10 +1862,10 @@ msgid ""
"maintainer signature is stripped off, and checksums of the package are "
"computed and put in the Packages file. The checksums of all of the Packages "
"files are then computed and put into the Release file. The Release file is "
"then signed by the archive key for this Debian release, and distributed "
"alongside the packages and the Packages files on Debian mirrors. The keys "
"are in the Debian archive keyring available in the "
"<package>debian-archive-keyring</package> package."
"then signed by the archive key for this &keyring-distro; release, and distributed "
"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys "
"are in the &keyring-distro; archive keyring available in the "
"&keyring-package; package."
msgstr ""

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


+ 19
- 19
doc/po/de.po View File

@@ -2265,14 +2265,14 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
"Debian."
"distribution, e.g. the &keyring-package; package in "
"&keyring-distro;."
msgstr ""
"aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
"entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
"Schlüsselbund. Der Archivschlüsselbund wird im Paket <literal>archive-"
"keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem Paket "
"<literal>debian-archive-keyring</literal> in Debian."
"&keyring-package; in &keyring-distro;."

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:144
@@ -2335,26 +2335,26 @@ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgid "&keyring-filename;"
msgstr "&keyring-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
msgid "Keyring of Debian archive trusted keys."
msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs"
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:187
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
msgid "Keyring of Debian archive removed trusted keys."
msgid "Keyring of &keyring-distro; archive removed trusted keys."
msgstr ""
"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs"
"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des &keyring-distro;-Archivs"

#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:197
@@ -2600,19 +2600,19 @@ msgid ""
"maintainer signature is stripped off, and checksums of the package are "
"computed and put in the Packages file. The checksums of all of the Packages "
"files are then computed and put into the Release file. The Release file is "
"then signed by the archive key for this Debian release, and distributed "
"alongside the packages and the Packages files on Debian mirrors. The keys "
"are in the Debian archive keyring available in the <package>debian-archive-"
"keyring</package> package."
"then signed by the archive key for this &keyring-distro; release, and distributed "
"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys "
"are in the &keyring-distro; archive keyring available in the &keyring-package; "
"package."
msgstr ""
"Sobald das hochgeladene Paket überprüft und dem Archiv hinzugefügt wurde, "
"wird die Betreuersignatur entfernt, Prüfsummen des Pakets werden berechnet "
"und in die Datei Packages abgelegt. Die Prüfsummen aller Paketdateien werden "
"berechnet und in der Release-Datei abgelegt. Dann wird die Release-Datei "
"durch den Archivschlüssel für diese Debian-Veröffentlichung signiert und "
"zusammen mit den Paketen und Packages-Dateien auf Debian-Spiegel verteilt. "
"Die Schlüssel sind im Debian-Archivschlüsselbund im Paket <package>debian-"
"archive-keyring</package> verfügbar."
"durch den Archivschlüssel für diese &keyring-distro;-Veröffentlichung signiert und "
"zusammen mit den Paketen und Packages-Dateien auf &keyring-distro;-Spiegel verteilt. "
"Die Schlüssel sind im &keyring-distro;-Archivschlüsselbund im Paket &keyring-package; "
"verfügbar."

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


+ 20
- 20
doc/po/es.po View File

@@ -2334,14 +2334,14 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
"Debian."
"distribution, e.g. the &keyring-package; package in "
"&keyring-distro;."
msgstr ""
"Actualiza el registro de claves local con el registro de claves del archivo "
"y elimina del registro local las claves de archivo que ya no son válidas. El "
"registro de claves del archivo se encuentra en el paquete <literal>archive-"
"keyring</literal> de su distribución; esto es, el paquete <literal>debian-"
"archive-keyring</literal> en Debian."
"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:144
@@ -2404,25 +2404,25 @@ 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:183
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgid "&keyring-filename;"
msgstr "&keyring-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
msgid "Keyring of Debian archive trusted keys."
msgstr "Registro de las claves de confianza del archivo de Debian."
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:187
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Registro de las claves de confianza eliminadas del archivo de Debian."
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:197
@@ -2664,20 +2664,20 @@ msgid ""
"maintainer signature is stripped off, and checksums of the package are "
"computed and put in the Packages file. The checksums of all of the Packages "
"files are then computed and put into the Release file. The Release file is "
"then signed by the archive key for this Debian release, and distributed "
"alongside the packages and the Packages files on Debian mirrors. The keys "
"are in the Debian archive keyring available in the <package>debian-archive-"
"keyring</package> package."
"then signed by the archive key for this &keyring-distro; release, and distributed "
"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys "
"are in the &keyring-distro; archive keyring available in the &keyring-package; "
"package."
msgstr ""
"Una vez que el paquete enviado se ha verificado e incluido en el archivo, se "
"elimina la firma del mantenedor, y se realizan las sumas de control del "
"paquete, que se incluyen en el fichero «Packages». A continuación, se "
"realiza una suma de control de todos los ficheros «Package», y se incluyen "
"en el fichero «Release». Acto seguido, el fichero «Release» se firma con la "
"clave del archivo de esta distribución de Debian, y se distribuye junto con "
"los paquetes y los ficheros «Packages» de las réplicas de Debian. Las claves "
"están disponibles en el registro de claves del archivo Debian en el paquete "
"<package>debian-archive-keyring</package> package."
"clave del archivo de esta distribución de &keyring-distro;, y se distribuye junto con "
"los paquetes y los ficheros «Packages» de las réplicas de &keyring-distro;. Las claves "
"están disponibles en el registro de claves del archivo &keyring-distro; en el paquete "
"&keyring-package; package."

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


+ 18
- 18
doc/po/fr.po View File

@@ -2261,14 +2261,14 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
"Debian."
"distribution, e.g. the &keyring-package; package in "
"&keyring-distro;."
msgstr ""
"Mettre à jour le trousseau de clés local avec le trousseau de clés de "
"l'archive et y supprimer les clés qui ne sont plus valables. Le trousseau de "
"clés de l'archive est fourni dans le paquet <literal>archive-keyring</"
"literal> de la distribution, par exemple le paquet <literal>debian-archive-"
"keyring</literal> dans Debian."
"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:144
@@ -2331,25 +2331,25 @@ 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:183
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgid "&keyring-filename;"
msgstr "&keyring-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
msgid "Keyring of Debian archive trusted keys."
msgstr "Trousseau des clés fiables de l'archive Debian."
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:187
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
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:197
@@ -2587,15 +2587,16 @@ msgstr ""

#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:102
#, fuzzy
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, and checksums of the package are "
"computed and put in the Packages file. The checksums of all of the Packages "
"files are then computed and put into the Release file. The Release file is "
"then signed by the archive key for this Debian release, and distributed "
"alongside the packages and the Packages files on Debian mirrors. The keys "
"are in the Debian archive keyring available in the <package>debian-archive-"
"keyring</package> package."
"then signed by the archive key for this &keyring-distro; release, and distributed "
"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys "
"are in the &keyring-distro; archive keyring available in the &keyring-package; "
"package."
msgstr ""
"Une fois que le paquet envoyé a été vérifié et inclus dans l'archive, la "
"signature du responsable est enlevée, une somme de contrôle du paquet est "
@@ -2603,8 +2604,7 @@ msgstr ""
"paquets est ensuite calculée et mise dans le fichier Release. Ce fichier est "
"signé par la clé de l'archive pour la version courante de la distribution et "
"distribuée en même temps que les paquets et les fichiers Packages sur les "
"miroirs. Les clés sont fournies par le paquet <package>debian-archive-"
"keyring</package>."
"miroirs. Les clés sont fournies par le paquet &keyring-package;."

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


+ 18
- 18
doc/po/it.po View File

@@ -2300,14 +2300,14 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
"Debian."
"distribution, e.g. the &keyring-package; package in "
"&keyring-distro;."
msgstr ""
"Aggiorna il portachiavi locale con il portachiavi dell'archivio e rimuove "
"dal portachiavi locale le chiavi di archivio che non sono più valide. Il "
"portachiavi degli archivi è fornito nel pacchetto <literal>archive-keyring</"
"literal> delle diverse distribuzioni, ad esempio il pacchetto "
"<literal>debian-archive-keyring</literal> in Debian."
"&keyring-package; in &keyring-distro;."

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:144
@@ -2370,25 +2370,25 @@ msgstr "Database locale di fiducia delle chiavi archiviate."

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgid "&keyring-filename;"
msgstr "&keyring-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
msgid "Keyring of Debian archive trusted keys."
msgstr "Portachiavi delle chiavi fidate degli archivi Debian."
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:187
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Portachiavi delle chiavi fidate rimosse degli archivi Debian."
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:197
@@ -2633,19 +2633,19 @@ msgid ""
"maintainer signature is stripped off, and checksums of the package are "
"computed and put in the Packages file. The checksums of all of the Packages "
"files are then computed and put into the Release file. The Release file is "
"then signed by the archive key for this Debian release, and distributed "
"alongside the packages and the Packages files on Debian mirrors. The keys "
"are in the Debian archive keyring available in the <package>debian-archive-"
"keyring</package> package."
"then signed by the archive key for this &keyring-distro; release, and distributed "
"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys "
"are in the &keyring-distro; archive keyring available in the &keyring-package; "
"package."
msgstr ""
"Una volta che il pacchetto caricato è verificato e incluso nell'archivio, la "
"firma del manutentore viene rimossa e i codici di controllo del pacchetto "
"vengono calcolati e messi nel file Packages. Vengono quindi calcolati i "
"codici di controllo di tutti i file Packages e vengono messi nel file "
"Release. Il file Release viene poi firmato con la chiave dell'archivio per "
"questo rilascio di Debian e viene distribuito insieme ai pacchetti e ai file "
"Packages nei mirror Debian. Le chiavi sono nel portachiavi degli archivi "
"Debian, disponibile nel pacchetto <package>debian-archive-keyring</package>."
"questo rilascio di &keyring-distro; e viene distribuito insieme ai pacchetti e ai file "
"Packages nei mirror &keyring-distro;. Le chiavi sono nel portachiavi degli archivi "
"&keyring-distro;, disponibile nel pacchetto &keyring-package;."

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


+ 19
- 19
doc/po/ja.po View File

@@ -2219,13 +2219,13 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
"Debian."
"distribution, e.g. the &keyring-package; package in "
"&keyring-distro;."
msgstr ""
"ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ"
"イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の"
"ディストリビューションにある <literal>archive-keyring</literal> パッケージ "
"(例: Debian では <literal>debian-archive-keyring</literal> パッケージ) で提供"
"(例: &keyring-distro; では &keyring-package; パッケージ) で提供"
"されています。"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2287,25 +2287,25 @@ msgstr "アーカイブキーのローカル信頼データベースです。"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgid "&keyring-filename;"
msgstr "&keyring-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
msgid "Keyring of Debian archive trusted keys."
msgstr "Debian アーカイブ信頼キーのキーリングです。"
msgid "Keyring of &keyring-distro; archive trusted keys."
msgstr "&keyring-distro; アーカイブ信頼キーのキーリングです。"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
msgid "Keyring of Debian archive removed trusted keys."
msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
msgid "Keyring of &keyring-distro; archive removed trusted keys."
msgstr "削除された &keyring-distro; アーカイブ信頼キーのキーリングです。"

#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:197
@@ -2541,18 +2541,18 @@ msgid ""
"maintainer signature is stripped off, and checksums of the package are "
"computed and put in the Packages file. The checksums of all of the Packages "
"files are then computed and put into the Release file. The Release file is "
"then signed by the archive key for this Debian release, and distributed "
"alongside the packages and the Packages files on Debian mirrors. The keys "
"are in the Debian archive keyring available in the <package>debian-archive-"
"keyring</package> package."
"then signed by the archive key for this &keyring-distro; release, and distributed "
"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys "
"are in the &keyring-distro; archive keyring available in the &keyring-package; "
"package."
msgstr ""
"アップロードされたパッケージが検証されてアーカイブに格納されると、メンテナの"
"署名を取り外し、パッケージのチェックサムを計算して、Packages ファイルに格納し"
"ます。その後、全パッケージファイルのチェックサムを計算して、Release ファイル"
"に格納します。Release ファイルは、その Debian リリースのアーカイブキーで署名"
"され、Debian ミラーサイトでパッケージや Packages ファイルとともに配布されま"
"す。このキーは、<package>debian-archive-keyring</package> パッケージに収録さ"
"れている、Debian アーカイブキーリングに含まれます。"
"に格納します。Release ファイルは、その &keyring-distro; リリースのアーカイブキーで署名"
"され、&keyring-distro; ミラーサイトでパッケージや Packages ファイルとともに配布されま"
"す。このキーは、&keyring-package; パッケージに収録さ"
"れている、&keyring-distro; アーカイブキーリングに含まれます。"

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


+ 19
- 20
doc/po/pl.po View File

@@ -2366,14 +2366,14 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
"Debian."
"distribution, e.g. the &keyring-package; package in "
"&keyring-distro;."
msgstr ""
"Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum i "
"usuwa z lokalnej składnicy niepoprawne klucze archiwum. Składnica kluczy "
"archiwum jest dostarczana przez pakiet <literal>archive-keyring</literal> "
"Twojej dystrybucji, np. pakiet <literal>debian-archive-keyring</literal> w "
"systemach Debiana."
"Twojej dystrybucji, np. pakiet &keyring-package; w "
"systemach &keyring-distro;."

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:144
@@ -2436,25 +2436,25 @@ msgstr "Lokalna składnica zaufanych kluczy archiwum."

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgid "&keyring-filename;"
msgstr "&keyring-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
msgid "Keyring of Debian archive trusted keys."
msgstr "Składnica zaufanych kluczy archiwum Debiana."
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:187
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana."
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:197
@@ -2696,20 +2696,19 @@ msgid ""
"maintainer signature is stripped off, and checksums of the package are "
"computed and put in the Packages file. The checksums of all of the Packages "
"files are then computed and put into the Release file. The Release file is "
"then signed by the archive key for this Debian release, and distributed "
"alongside the packages and the Packages files on Debian mirrors. The keys "
"are in the Debian archive keyring available in the <package>debian-archive-"
"keyring</package> package."
"then signed by the archive key for this &keyring-distro; release, and distributed "
"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys "
"are in the &keyring-distro; archive keyring available in the &keyring-package; "
"package."
msgstr ""
"Po tym jak dostarczony przez opiekuna pakiet zostanie zweryfikowany i "
"dołączony do archiwum, sygnatura opiekuna jest usuwana, a sumy kontrolne "
"pakietu są wyliczane i umieszczane w pliku Packages. Sumy kontrolne "
"wszystkich plików Packages są następnie wyliczane i umieszczane w pliku "
"Release. Plik Release jest następnie podpisywany przy użyciu klucza archiwum "
"tego wydania dystrybucji Debiana i dystrybuowany wraz z pakietami i plikami "
"Packages przez serwery lustrzane Debiana. Klucze archiwum znajdują się w "
"składnicy kluczy Debiana dostępnej w pakiecie <package>debian-archive-"
"keyring</package>."
"tego wydania dystrybucji &keyring-distro; i dystrybuowany wraz z pakietami i plikami "
"Packages przez serwery lustrzane &keyring-distro;. Klucze archiwum znajdują się w "
"składnicy kluczy &keyring-distro; dostępnej w pakiecie &keyring-package;."

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


+ 18
- 19
doc/po/pt.po View File

@@ -2280,13 +2280,13 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
"Debian."
"distribution, e.g. the &keyring-package; package in "
"&keyring-distro;."
msgstr ""
"Actualiza o chaveiro local com o chaveiro do arquivo e remove do chaveiro "
"local as chaves de arquivo que já não são válidas. O chaveiro do arquivo é "
"submetido no pacote <literal>archive-keyring</literal> da sua distribuição, "
"por exemplo o pacote <literal>debian-archive-keyring</literal> em Debian."
"por exemplo o pacote &keyring-package; em &keyring-distro;."

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:144
@@ -2349,25 +2349,25 @@ msgstr "Base de dados local de confiança de chaves de arquivos."

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgid "&keyring-filename;"
msgstr "&keyring-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
msgid "Keyring of Debian archive trusted keys."
msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
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:187
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
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:197
@@ -2609,20 +2609,19 @@ msgid ""
"maintainer signature is stripped off, and checksums of the package are "
"computed and put in the Packages file. The checksums of all of the Packages "
"files are then computed and put into the Release file. The Release file is "
"then signed by the archive key for this Debian release, and distributed "
"alongside the packages and the Packages files on Debian mirrors. The keys "
"are in the Debian archive keyring available in the <package>debian-archive-"
"keyring</package> package."
"then signed by the archive key for this &keyring-distro; release, and distributed "
"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys "
"are in the &keyring-distro; archive keyring available in the &keyring-package; "
"package."
msgstr ""
"Assim que o pacote submetido é verificado e incluído no arquivo, a "
"assinatura do responsável é despojada, são computados sumários de "
"verificação do pacote e colocado no ficheiro Packages. Os sumários de "
"verificação de todos os ficheiros Packages são então computados e colocados "
"no ficheiro Release. O ficheiro Release é então assinado pela chave de "
"arquivo para este lançamento de Debian, e distribuído juntamente com os "
"pacotes e os ficheiros Packages em mirrors de Debian. As chaves estão no "
"chaveiro do arquivo Debian no pacote <package>debian-archive-keyring</"
"package>."
"arquivo para este lançamento de &keyring-distro;, e distribuído juntamente com os "
"pacotes e os ficheiros Packages em mirrors de &keyring-distro;. As chaves estão no "
"chaveiro do arquivo &keyring-distro; no pacote &keyring-package;."

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


+ 10
- 10
doc/po/pt_BR.po View File

@@ -1618,8 +1618,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
"Debian."
"distribution, e.g. the &keyring-package; package in "
"&keyring-distro;."
msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1669,23 +1669,23 @@ msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgid "&keyring-filename;"
msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
msgid "Keyring of Debian archive trusted keys."
msgid "Keyring of &keyring-distro; archive trusted keys."
msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
"&keyring-removed-filename;"
msgstr ""

#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
msgid "Keyring of Debian archive removed trusted keys."
msgid "Keyring of &keyring-distro; archive removed trusted keys."
msgstr ""

#. type: Content of: <refentry><refsect1><para>
@@ -1863,10 +1863,10 @@ msgid ""
"maintainer signature is stripped off, and checksums of the package are "
"computed and put in the Packages file. The checksums of all of the Packages "
"files are then computed and put into the Release file. The Release file is "
"then signed by the archive key for this Debian release, and distributed "
"alongside the packages and the Packages files on Debian mirrors. The keys "
"are in the Debian archive keyring available in the <package>debian-archive-"
"keyring</package> package."
"then signed by the archive key for this &keyring-distro; release, and distributed "
"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys "
"are in the &keyring-distro; archive keyring available in the &keyring-package; "
"package."
msgstr ""

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


+ 2
- 0
doc/sources.list.5.xml View File

@@ -8,6 +8,8 @@
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
%aptvendor;
]>

<refentry>


+ 5
- 0
vendor/debian/apt-vendor.ent View File

@@ -0,0 +1,5 @@
<!-- details about the keys used by the distribution -->
<!ENTITY keyring-distro "Debian">
<!ENTITY keyring-package "<package>debian-archive-keyring</package>">
<!ENTITY keyring-filename "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>">
<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>">

+ 5
- 0
vendor/ubuntu/apt-vendor.ent View File

@@ -0,0 +1,5 @@
<!-- details about the keys used by the distribution -->
<!ENTITY keyring-distro "Ubuntu">
<!ENTITY keyring-package "<package>ubuntu-keyring</package>">
<!ENTITY keyring-filename "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>">
<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>">

Loading…
Cancel
Save