Michael Vogt 11 years ago
parent
commit
5a66868c03
27 changed files with 8779 additions and 12725 deletions
  1. +1
    -0
      apt-pkg/deb/deblistparser.cc
  2. +5
    -2
      buildlib/po4a_manpage.mak
  3. +13
    -3
      debian/changelog
  4. +3
    -0
      doc/apt-cache.8.xml
  5. +3
    -0
      doc/apt-cdrom.8.xml
  6. +3
    -0
      doc/apt-config.8.xml
  7. +3
    -0
      doc/apt-extracttemplates.1.xml
  8. +3
    -0
      doc/apt-ftparchive.1.xml
  9. +3
    -0
      doc/apt-get.8.xml
  10. +3
    -0
      doc/apt-key.8.xml
  11. +3
    -0
      doc/apt-mark.8.xml
  12. +3
    -0
      doc/apt-secure.8.xml
  13. +3
    -0
      doc/apt-sortpkgs.1.xml
  14. +188
    -0
      doc/apt-verbatim.ent
  15. +3
    -0
      doc/apt.conf.5.xml
  16. +1
    -191
      doc/apt.ent
  17. +3
    -0
      doc/apt_preferences.5.xml
  18. +915
    -1250
      doc/po/apt-doc.pot
  19. +1046
    -1545
      doc/po/de.po
  20. +939
    -1438
      doc/po/es.po
  21. +939
    -1438
      doc/po/fr.po
  22. +937
    -1272
      doc/po/it.po
  23. +939
    -1438
      doc/po/ja.po
  24. +939
    -1436
      doc/po/pl.po
  25. +939
    -1438
      doc/po/pt.po
  26. +939
    -1274
      doc/po/pt_BR.po
  27. +3
    -0
      doc/sources.list.5.xml

+ 1
- 0
apt-pkg/deb/deblistparser.cc View File

@@ -481,6 +481,7 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
*/
static string CompleteArch(std::string& arch) {
if (arch == "armel") return "linux-arm";
if (arch == "armhf") return "linux-arm";
if (arch == "lpia") return "linux-i386";
if (arch == "powerpcspe") return "linux-powerpc";
if (arch == "uclibc-linux-armel") return "linux-arm";


+ 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
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



+ 13
- 3
debian/changelog View File

@@ -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
@@ -26,7 +26,17 @@ apt (0.8.7) UNRELEASED; urgency=low
uncompressed data. This fixes cache building progress going way
over 100%.

-- Christian Perrier <bubulle@debian.org> Tue, 05 Oct 2010 05:35:58 +0200
[ David Kalnischkies ]
* 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)
* doc/apt-verbatim.ent:
- change the codenames to reflect the situation after squeeze release

-- David Kalnischkies <kalnischkies@gmail.com> Thu, 14 Oct 2010 00:07:20 +0200

apt (0.8.6) unstable; urgency=low



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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


+ 3
- 0
doc/apt-key.8.xml View File

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


+ 188
- 0
doc/apt-verbatim.ent View File

@@ -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 "lenny">
<!ENTITY stable-codename "squeeze">
<!ENTITY testing-codename "wheezy">

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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


+ 1
- 191
doc/apt.ent View File

@@ -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
- 0
doc/apt_preferences.5.xml View File

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


+ 915
- 1250
doc/po/apt-doc.pot
File diff suppressed because it is too large
View File


+ 1046
- 1545
doc/po/de.po
File diff suppressed because it is too large
View File


+ 939
- 1438
doc/po/es.po
File diff suppressed because it is too large
View File


+ 939
- 1438
doc/po/fr.po
File diff suppressed because it is too large
View File


+ 937
- 1272
doc/po/it.po
File diff suppressed because it is too large
View File


+ 939
- 1438
doc/po/ja.po
File diff suppressed because it is too large
View File


+ 939
- 1436
doc/po/pl.po
File diff suppressed because it is too large
View File


+ 939
- 1438
doc/po/pt.po
File diff suppressed because it is too large
View File


+ 939
- 1274
doc/po/pt_BR.po
File diff suppressed because it is too large
View File


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

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

<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
%aptverbatiment;

]>

<refentry>


Loading…
Cancel
Save