Browse Source

* doc/apt.ent:

- move some strings into apt-verbatim.ent to avoid showing them in
    apt-doc.pot as they are untranslatable anyway (e.g. manpage references)
debian/1.8.y
David Kalnischkies 12 years ago
parent
commit
0c1a7101fd
  1. 7
      buildlib/po4a_manpage.mak
  2. 10
      debian/changelog
  3. 3
      doc/apt-cache.8.xml
  4. 3
      doc/apt-cdrom.8.xml
  5. 3
      doc/apt-config.8.xml
  6. 3
      doc/apt-extracttemplates.1.xml
  7. 3
      doc/apt-ftparchive.1.xml
  8. 3
      doc/apt-get.8.xml
  9. 3
      doc/apt-key.8.xml
  10. 3
      doc/apt-mark.8.xml
  11. 3
      doc/apt-secure.8.xml
  12. 3
      doc/apt-sortpkgs.1.xml
  13. 188
      doc/apt-verbatim.ent
  14. 3
      doc/apt.conf.5.xml
  15. 192
      doc/apt.ent
  16. 3
      doc/apt_preferences.5.xml
  17. 2165
      doc/po/apt-doc.pot
  18. 2591
      doc/po/de.po
  19. 2377
      doc/po/es.po
  20. 2377
      doc/po/fr.po
  21. 2209
      doc/po/it.po
  22. 2377
      doc/po/ja.po
  23. 2375
      doc/po/pl.po
  24. 2377
      doc/po/pt.po
  25. 2213
      doc/po/pt_BR.po
  26. 3
      doc/sources.list.5.xml

7
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
INCLUDES = apt.ent apt-verbatim.ent
# Do not use XMLTO, build the manpages directly with XSLTPROC
ifdef XSLTPROC
@ -25,6 +25,9 @@ $(LOCAL)-LIST := $(SOURCE)
doc: $($(LOCAL)-LIST)
veryclean: veryclean/$(LOCAL)
apt-verbatim.ent: ../apt-verbatim.ent
cp ../apt-verbatim.ent .
$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
echo Creating man page $@
$(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here???
@ -34,7 +37,7 @@ $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
# Clean rule
.PHONY: veryclean/$(LOCAL)
veryclean/$(LOCAL):
-rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \
-rm -rf $($(@F)-LIST) apt.ent apt-verbatim.ent apt.$(LC).8 \
$(addsuffix .xml,$($(@F)-LIST)) \
offline.$(LC).sgml guide.$(LC).sgml

10
debian/changelog

@ -5,10 +5,10 @@ apt (0.8.7) UNRELEASED; urgency=low
* Another typo fixed in French ("Anfin"). Thanks to bubulle
* Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog
Closes: #599265
[ Michael Vogt ]
* debian/apt.cron.daily:
- source /etc/default/locale (if available) so that the
- source /etc/default/locale (if available) so that the
apt-get update cron job fetches the right translated package
descriptions
* fix test failure on amd64
@ -30,9 +30,11 @@ apt (0.8.7) UNRELEASED; urgency=low
* apt-pkg/deb/deblistparser.cc:
- support ArmHardFloat port in CompleteArch, thanks to Sebastian
Andrzej Siewior for the patch!
* doc/apt.ent:
- move some strings into apt-verbatim.ent to avoid showing them in
apt-doc.pot as they are untranslatable anyway (e.g. manpage references)
-- David Kalnischkies <kalnischkies@gmail.com> Thu, 07 Oct 2010 14:46:59 +0200
-- David Kalnischkies <kalnischkies@gmail.com> Thu, 14 Oct 2010 00:05:53 +0200
apt (0.8.6) unstable; urgency=low

3
doc/apt-cache.8.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

3
doc/apt-cdrom.8.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

3
doc/apt-config.8.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

3
doc/apt-extracttemplates.1.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

3
doc/apt-ftparchive.1.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

3
doc/apt-get.8.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

3
doc/apt-key.8.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

3
doc/apt-mark.8.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

3
doc/apt-secure.8.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

3
doc/apt-sortpkgs.1.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

188
doc/apt-verbatim.ent

@ -0,0 +1,188 @@
<!-- -*- mode: xml; mode: fold -*- -->
<!-- Some common paths.. -->
<!ENTITY docdir "/usr/share/doc/apt/">
<!ENTITY guidesdir "/usr/share/doc/apt-doc/">
<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
<!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
<!ENTITY statedir "/var/lib/apt">
<!ENTITY cachedir "/var/cache/apt">
<!-- Cross references to other man pages -->
<!ENTITY apt-conf "<citerefentry>
<refentrytitle><filename>apt.conf</filename></refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>"
>
<!ENTITY apt-get "<citerefentry>
<refentrytitle><command>apt-get</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-config "<citerefentry>
<refentrytitle><command>apt-config</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-cdrom "<citerefentry>
<refentrytitle><command>apt-cdrom</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-cache "<citerefentry>
<refentrytitle><command>apt-cache</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-preferences "<citerefentry>
<refentrytitle><command>apt_preferences</command></refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>"
>
<!ENTITY apt-key "<citerefentry>
<refentrytitle><command>apt-key</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-secure "<citerefentry>
<refentrytitle>apt-secure</refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-ftparchive "<citerefentry>
<refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY sources-list "<citerefentry>
<refentrytitle><filename>sources.list</filename></refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>"
>
<!ENTITY reportbug "<citerefentry>
<refentrytitle><command>reportbug</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY dpkg "<citerefentry>
<refentrytitle><command>dpkg</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY dpkg-buildpackage "<citerefentry>
<refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY gzip "<citerefentry>
<refentrytitle><command>gzip</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY dpkg-scanpackages "<citerefentry>
<refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY dpkg-scansources "<citerefentry>
<refentrytitle><command>dpkg-scansources</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY dselect "<citerefentry>
<refentrytitle><command>dselect</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY aptitude "<citerefentry>
<refentrytitle><command>aptitude</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY synaptic "<citerefentry>
<refentrytitle><command>synaptic</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY debsign "<citerefentry>
<refentrytitle><command>debsign</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY debsig-verify "<citerefentry>
<refentrytitle><command>debsig-verify</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY gpg "<citerefentry>
<refentrytitle><command>gpg</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY wajig "<citerefentry>
<refentrytitle><command>wajig</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!-- Boiler plate docinfo section -->
<!ENTITY apt-email "
<address>
<email>apt@packages.debian.org</email>
</address>
">
<!ENTITY apt-author.jgunthorpe "
<author>
<firstname>Jason</firstname>
<surname>Gunthorpe</surname>
<contrib></contrib>
</author>
">
<!ENTITY apt-author.moconnor "
<author>
<firstname>Mike</firstname>
<surname>O'Connor</surname>
<contrib></contrib>
</author>
">
<!ENTITY apt-copyright "
<copyright>
<holder>Jason Gunthorpe</holder>
<year>1998-2001</year>
</copyright>
">
<!ENTITY apt-product "
<productname>Linux</productname>
">
<!-- Codenames for debian releases -->
<!ENTITY oldstable-codename "etch">
<!ENTITY stable-codename "lenny">
<!ENTITY testing-codename "squeeze">

3
doc/apt.conf.5.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

192
doc/apt.ent

@ -1,153 +1,5 @@
<!-- -*- mode: sgml; mode: fold -*- -->
<!-- Some common paths.. -->
<!ENTITY docdir "/usr/share/doc/apt/">
<!ENTITY guidesdir "/usr/share/doc/apt-doc/">
<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
<!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
<!ENTITY statedir "/var/lib/apt">
<!ENTITY cachedir "/var/cache/apt">
<!-- Cross references to other man pages -->
<!ENTITY apt-conf "<citerefentry>
<refentrytitle><filename>apt.conf</filename></refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>"
>
<!ENTITY apt-get "<citerefentry>
<refentrytitle><command>apt-get</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-config "<citerefentry>
<refentrytitle><command>apt-config</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-cdrom "<citerefentry>
<refentrytitle><command>apt-cdrom</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-cache "<citerefentry>
<refentrytitle><command>apt-cache</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-preferences "<citerefentry>
<refentrytitle><command>apt_preferences</command></refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>"
>
<!ENTITY apt-key "<citerefentry>
<refentrytitle><command>apt-key</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-secure "<citerefentry>
<refentrytitle>apt-secure</refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY apt-ftparchive "<citerefentry>
<refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY sources-list "<citerefentry>
<refentrytitle><filename>sources.list</filename></refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>"
>
<!ENTITY reportbug "<citerefentry>
<refentrytitle><command>reportbug</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY dpkg "<citerefentry>
<refentrytitle><command>dpkg</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY dpkg-buildpackage "<citerefentry>
<refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY gzip "<citerefentry>
<refentrytitle><command>gzip</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY dpkg-scanpackages "<citerefentry>
<refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY dpkg-scansources "<citerefentry>
<refentrytitle><command>dpkg-scansources</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY dselect "<citerefentry>
<refentrytitle><command>dselect</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY aptitude "<citerefentry>
<refentrytitle><command>aptitude</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY synaptic "<citerefentry>
<refentrytitle><command>synaptic</command></refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>"
>
<!ENTITY debsign "<citerefentry>
<refentrytitle><command>debsign</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY debsig-verify "<citerefentry>
<refentrytitle><command>debsig-verify</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY gpg "<citerefentry>
<refentrytitle><command>gpg</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!ENTITY wajig "<citerefentry>
<refentrytitle><command>wajig</command></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
<!-- Boiler plate docinfo section -->
<!ENTITY apt-docinfo "
<refentryinfo>
@ -159,30 +11,7 @@
<copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
<date>28 October 2008</date>
<productname>Linux</productname>
</refentryinfo>
">
<!ENTITY apt-email "
<address>
<email>apt@packages.debian.org</email>
</address>
">
<!ENTITY apt-author.jgunthorpe "
<author>
<firstname>Jason</firstname>
<surname>Gunthorpe</surname>
<contrib></contrib>
</author>
">
<!ENTITY apt-author.moconnor "
<author>
<firstname>Mike</firstname>
<surname>O'Connor</surname>
<contrib></contrib>
</author>
">
<!ENTITY apt-author.team "
@ -192,21 +21,6 @@
</author>
">
<!ENTITY apt-product "
<productname>Linux</productname>
">
<!ENTITY apt-copyright "
<copyright>
<holder>Jason Gunthorpe</holder>
<year>1998-2001</year>
</copyright>
">
<!ENTITY apt-product "
<productname>Linux</productname>
">
<!ENTITY apt-qapage "
<para>
<ulink url='http://packages.qa.debian.org/a/apt.html'>QA Page</ulink>
@ -216,7 +30,7 @@
<!-- Boiler plate Bug reporting section -->
<!ENTITY manbugs "
<refsect1><title>Bugs</title>
<para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.
<para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.
If you wish to report a bug in APT, please see
<filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the
&reportbug; command.
@ -394,7 +208,3 @@
This is done on purpose, to avoid losing content when the
translation is lagging behind the original content.
">
<!ENTITY oldstable-codename "etch">
<!ENTITY stable-codename "lenny">
<!ENTITY testing-codename "squeeze">

3
doc/apt_preferences.5.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

2165
doc/po/apt-doc.pot

File diff suppressed because it is too large

2591
doc/po/de.po

File diff suppressed because it is too large

2377
doc/po/es.po

File diff suppressed because it is too large

2377
doc/po/fr.po

File diff suppressed because it is too large

2209
doc/po/it.po

File diff suppressed because it is too large

2377
doc/po/ja.po

File diff suppressed because it is too large

2375
doc/po/pl.po

File diff suppressed because it is too large

2377
doc/po/pt.po

File diff suppressed because it is too large

2213
doc/po/pt_BR.po

File diff suppressed because it is too large

3
doc/sources.list.5.xml

@ -5,6 +5,9 @@
<!ENTITY % aptent SYSTEM "apt.ent">
%aptent;
<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;
]>
<refentry>

Loading…
Cancel
Save