From 694ef56e802bbab94595fc491fdc6ef8b4f525c1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Nov 2013 19:15:02 +0100 Subject: [PATCH] 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. --- .gitignore | 1 + buildlib/po4a_manpage.mak | 7 ++++-- doc/apt-cache.8.xml | 2 ++ doc/apt-cdrom.8.xml | 2 ++ doc/apt-config.8.xml | 2 ++ doc/apt-extracttemplates.1.xml | 2 ++ doc/apt-ftparchive.1.xml | 2 ++ doc/apt-get.8.xml | 2 ++ doc/apt-key.8.xml | 12 +++++----- doc/apt-mark.8.xml | 2 ++ doc/apt-secure.8.xml | 8 ++++--- doc/apt-sortpkgs.1.xml | 2 ++ doc/apt.conf.5.xml | 2 ++ doc/apt_preferences.5.xml | 2 ++ doc/en/makefile | 7 ++++-- doc/makefile | 5 ++++- doc/po/apt-doc.pot | 20 ++++++++--------- doc/po/de.po | 38 ++++++++++++++++---------------- doc/po/es.po | 40 +++++++++++++++++----------------- doc/po/fr.po | 36 +++++++++++++++--------------- doc/po/it.po | 36 +++++++++++++++--------------- doc/po/ja.po | 38 ++++++++++++++++---------------- doc/po/pl.po | 39 ++++++++++++++++----------------- doc/po/pt.po | 37 +++++++++++++++---------------- doc/po/pt_BR.po | 20 ++++++++--------- doc/sources.list.5.xml | 2 ++ vendor/debian/apt-vendor.ent | 5 +++++ vendor/ubuntu/apt-vendor.ent | 5 +++++ 28 files changed, 210 insertions(+), 166 deletions(-) create mode 100644 vendor/debian/apt-vendor.ent create mode 100644 vendor/ubuntu/apt-vendor.ent diff --git a/.gitignore b/.gitignore index d840ae48c..76b24f9c5 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 1e778cf11..b3d586b2f 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -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 "// i\ diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 0955c1c9e..a53a64446 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index b076a98a3..2fcd8e494 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index 39205e737..b84d25f7a 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index 4374c5ec3..d27e05075 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 91fdfe1e0..6482b4632 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 4c050ec03..90f2b40f7 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 6a36d08ca..5dbbaaf26 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> @@ -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 archive-keyring package of your - distribution, e.g. the debian-archive-keyring package in Debian. + distribution, e.g. the &keyring-package; package in &keyring-distro;. @@ -180,12 +182,12 @@ Local trust database of archive keys. - /usr/share/keyrings/debian-archive-keyring.gpg - Keyring of Debian archive trusted keys. + &keyring-filename; + Keyring of &keyring-distro; archive trusted keys. - /usr/share/keyrings/debian-archive-removed-keys.gpg - Keyring of Debian archive removed trusted keys. + &keyring-removed-filename; + Keyring of &keyring-distro; archive removed trusted keys. diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 3503ece8f..d00e5b9e2 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 8cdfe3ab6..981351615 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> @@ -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 debian-archive-keyring package. + &keyring-distro; mirrors. The keys are in the &keyring-distro; archive keyring + available in the &keyring-package; package. diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml index 482035b37..9bb03d624 100644 --- a/doc/apt-sortpkgs.1.xml +++ b/doc/apt-sortpkgs.1.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 428c0d2db..bfc43ba29 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index f56958fcc..d8c3efab7 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/doc/en/makefile b/doc/en/makefile index a4fb232d4..247ce38b5 100644 --- a/doc/en/makefile +++ b/doc/en/makefile @@ -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 diff --git a/doc/makefile b/doc/makefile index ebaca908f..49f3e1b56 100644 --- a/doc/makefile +++ b/doc/makefile @@ -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 diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 43c184106..43e14b779 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -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 archive-keyring package of your " -"distribution, e.g. the debian-archive-keyring package in " -"Debian." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" #. type: Content of: @@ -1670,22 +1670,22 @@ msgstr "" #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "&keyring-filename;" msgstr "" #. type: Content of: #: apt-key.8.xml:184 -msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of &keyring-distro; archive trusted keys." msgstr "" #. type: Content of: #: apt-key.8.xml:187 -msgid "/usr/share/keyrings/debian-archive-removed-keys.gpg" +msgid "&keyring-removed-filename;" msgstr "" #. type: Content of: #: 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: @@ -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 " -"debian-archive-keyring 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: diff --git a/doc/po/de.po b/doc/po/de.po index 8ecbf4cbf..808fcd126 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -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 archive-keyring package of your " -"distribution, e.g. the debian-archive-keyring 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 archive-" "keyring Ihrer Distribution mitgeliefert, z.B. dem Paket " -"debian-archive-keyring in Debian." +"&keyring-package; in &keyring-distro;." #. type: Content of: #: apt-key.8.xml:144 @@ -2335,26 +2335,26 @@ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel" #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" -msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: #: 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: #: apt-key.8.xml:187 msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" msgstr "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" #. type: Content of: #: 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: #: 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 debian-archive-" -"keyring 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 debian-" -"archive-keyring 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: #: apt-secure.8.xml:113 diff --git a/doc/po/es.po b/doc/po/es.po index 38b2645ea..6b2e77914 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -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 archive-keyring package of your " -"distribution, e.g. the debian-archive-keyring 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 archive-" -"keyring de su distribución; esto es, el paquete debian-" -"archive-keyring en Debian." +"keyring de su distribución; esto es, el paquete &keyring-package; " +"en &keyring-distro;." #. type: Content of: #: 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: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" -msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: #: 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: #: apt-key.8.xml:187 msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" msgstr "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" #. type: Content of: #: 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: #: 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 debian-archive-" -"keyring 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 " -"debian-archive-keyring 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: #: apt-secure.8.xml:113 diff --git a/doc/po/fr.po b/doc/po/fr.po index c2f4b6d83..3849630b5 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -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 archive-keyring package of your " -"distribution, e.g. the debian-archive-keyring 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 archive-keyring de la distribution, par exemple le paquet debian-archive-" -"keyring dans Debian." +"literal> de la distribution, par exemple le paquet &keyring-package; " +"dans &keyring-distro;." #. type: Content of: #: 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: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" -msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: #: 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: #: apt-key.8.xml:187 msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" msgstr "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" #. type: Content of: #: 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: #: apt-key.8.xml:197 @@ -2587,15 +2587,16 @@ msgstr "" #. type: Content of: #: 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 debian-archive-" -"keyring 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 debian-archive-" -"keyring." +"miroirs. Les clés sont fournies par le paquet &keyring-package;." #. type: Content of: #: apt-secure.8.xml:113 diff --git a/doc/po/it.po b/doc/po/it.po index df144e2b7..9f614a468 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -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 archive-keyring package of your " -"distribution, e.g. the debian-archive-keyring 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 archive-keyring delle diverse distribuzioni, ad esempio il pacchetto " -"debian-archive-keyring in Debian." +"&keyring-package; in &keyring-distro;." #. type: Content of: #: apt-key.8.xml:144 @@ -2370,25 +2370,25 @@ msgstr "Database locale di fiducia delle chiavi archiviate." #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" -msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: #: 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: #: apt-key.8.xml:187 msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" msgstr "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" #. type: Content of: #: 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: #: 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 debian-archive-" -"keyring 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 debian-archive-keyring." +"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: #: apt-secure.8.xml:113 diff --git a/doc/po/ja.po b/doc/po/ja.po index 6b767f195..7370e21d8 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -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 archive-keyring package of your " -"distribution, e.g. the debian-archive-keyring package in " -"Debian." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" "ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ" "イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の" "ディストリビューションにある archive-keyring パッケージ " -"(例: Debian では debian-archive-keyring パッケージ) で提供" +"(例: &keyring-distro; では &keyring-package; パッケージ) で提供" "されています。" #. type: Content of: @@ -2287,25 +2287,25 @@ msgstr "アーカイブキーのローカル信頼データベースです。" #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" -msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: #: 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: #: apt-key.8.xml:187 msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" msgstr "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" #. type: Content of: #: 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: #: 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 debian-archive-" -"keyring 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 ファイルとともに配布されま" -"す。このキーは、debian-archive-keyring パッケージに収録さ" -"れている、Debian アーカイブキーリングに含まれます。" +"に格納します。Release ファイルは、その &keyring-distro; リリースのアーカイブキーで署名" +"され、&keyring-distro; ミラーサイトでパッケージや Packages ファイルとともに配布されま" +"す。このキーは、&keyring-package; パッケージに収録さ" +"れている、&keyring-distro; アーカイブキーリングに含まれます。" #. type: Content of: #: apt-secure.8.xml:113 diff --git a/doc/po/pl.po b/doc/po/pl.po index 2b33324b6..81edfb704 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -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 archive-keyring package of your " -"distribution, e.g. the debian-archive-keyring 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 archive-keyring " -"Twojej dystrybucji, np. pakiet debian-archive-keyring w " -"systemach Debiana." +"Twojej dystrybucji, np. pakiet &keyring-package; w " +"systemach &keyring-distro;." #. type: Content of: #: apt-key.8.xml:144 @@ -2436,25 +2436,25 @@ msgstr "Lokalna składnica zaufanych kluczy archiwum." #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" -msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: #: 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: #: apt-key.8.xml:187 msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" msgstr "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" #. type: Content of: #: 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: #: 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 debian-archive-" -"keyring 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 debian-archive-" -"keyring." +"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: #: apt-secure.8.xml:113 diff --git a/doc/po/pt.po b/doc/po/pt.po index 726b184d0..b06026154 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -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 archive-keyring package of your " -"distribution, e.g. the debian-archive-keyring 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 archive-keyring da sua distribuição, " -"por exemplo o pacote debian-archive-keyring em Debian." +"por exemplo o pacote &keyring-package; em &keyring-distro;." #. type: Content of: #: apt-key.8.xml:144 @@ -2349,25 +2349,25 @@ msgstr "Base de dados local de confiança de chaves de arquivos." #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" -msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: #: 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: #: apt-key.8.xml:187 msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" msgstr "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" #. type: Content of: #: 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: #: 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 debian-archive-" -"keyring 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 debian-archive-keyring." +"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: #: apt-secure.8.xml:113 diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 00619cd22..a5df9e80e 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -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 archive-keyring package of your " -"distribution, e.g. the debian-archive-keyring package in " -"Debian." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" #. type: Content of: @@ -1669,23 +1669,23 @@ msgstr "" #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "&keyring-filename;" msgstr "" #. type: Content of: #: apt-key.8.xml:184 -msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of &keyring-distro; archive trusted keys." msgstr "" #. type: Content of: #: apt-key.8.xml:187 msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"&keyring-removed-filename;" msgstr "" #. type: Content of: #: 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: @@ -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 debian-archive-" -"keyring 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: diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index fa32297c2..87fb4d71e 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -8,6 +8,8 @@ %aptverbatiment; + +%aptvendor; ]> diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent new file mode 100644 index 000000000..56775bbaa --- /dev/null +++ b/vendor/debian/apt-vendor.ent @@ -0,0 +1,5 @@ + + +debian-archive-keyring"> +/usr/share/keyrings/debian-archive-keyring.gpg"> +/usr/share/keyrings/debian-archive-removed-keys.gpg"> diff --git a/vendor/ubuntu/apt-vendor.ent b/vendor/ubuntu/apt-vendor.ent new file mode 100644 index 000000000..fd5e5a7cf --- /dev/null +++ b/vendor/ubuntu/apt-vendor.ent @@ -0,0 +1,5 @@ + + +ubuntu-keyring"> +/usr/share/keyrings/ubuntu-archive-keyring.gpg"> +/usr/share/keyrings/ubuntu-archive-removed-keys.gpg"> -- 2.45.2