replace the per language addendum with a global addendum and

add a explanation why translations include (maybe) english
parts to this new global addendum (Closes: #561636)

debian/changelog

@@ -38,6 +38,10 @@ apt (0.7.25.2) UNRELEASED; urgency=low
   * apt-pkg/deb/dpkgpm.cc:
     - don't segfault if term.log file can't be opened.
       Thanks Sam Brightman for the patch! (Closes: #475770)
+  * doc/*:
+    - replace the per language addendum with a global addendum
+    - add a explanation why translations include (maybe) english
+      parts to the new global addendum (Closes: #561636)
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 16 Jan 2010 21:06:38 +0100
 

doc/apt.ent

@@ -366,3 +366,22 @@
      Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>
      </varlistentry>
 ">
+
+<!ENTITY translation-title "TRANSLATION">
+
+<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed
+     to the translation in the past, who is responsible now and maybe further information
+     specially related to your translation. -->
+<!ENTITY translation-holder "
+     The english translation was done by John Doe <email>john@doe.org</email> in 2009,
+     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the
+     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.
+">
+
+<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings
+     in a shipped manpage will maybe appear english parts. -->
+<!ENTITY translation-english "
+     Note that this translated document may contain untranslated parts.
+     This is done on purpose, to avoid losing content when the
+     translation is lagging behind the original content.
+">

doc/de/addendum/debiandoc_de.add

@@ -1,6 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Übersetzung</title>
-   <para>Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt
-   in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.</para>
- </refsect1>
-

doc/de/addendum/xml_de.add

@@ -1,6 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Übersetzung</title>
-   <para>Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt
-   in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.</para>
- </refsect1>
-

doc/es/addendum/xml_es.add

@@ -1,9 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Translation</title>
-   <para>The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003),
-   Rudy Godoy <email>rudy@kernel-panik.org</email> (2003),
-   Gustavo Saldumbide <email>gsal@adinet.com.uy</email> (2003),
-   Javier Fernández-Sanguino <email>jfs@computer.org</email> (2003)
-   and Rubén Porras Campo <email>nahoo@inicia.es</email> (2003, 2004)
-   under the aegis of the debian spanish-l10n-team <email>debian-l10n-spanish@lists.debian.org</email>.
- </refsect1>

doc/fr/addendum/xml_fr.add

@@ -1,7 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Traducteurs</title>
-   <para>Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009),
-   Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>
-   </para>
- </refsect1>
-

doc/ja/addendum/xml_ja.add

@@ -1,7 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>訳者</title>
-   <para>倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009),
-   Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>
-   </para>
- </refsect1>
-

doc/po4a.conf

@@ -7,32 +7,19 @@
 # define source file and translated file (one file per line)
 [type: man]     apt.8 $lang:$lang/apt.$lang.8
 [type: entity]  apt.ent $lang:$lang/apt.ent
-[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml \
-                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add
+[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add
+[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add
+[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml add_$lang:xml.add
+[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml add_$lang:xml.add
+[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml add_$lang:xml.add
 
 [type: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml
 #                 add_$lang::$lang/addendum/debiandoc_$lang.add

doc/pt_BR/addendum/xml_pt_BR.add

@@ -1,5 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Tradução</title>
-   Esta página de manual foi traduzida para o Português do Brasil por
-   André Luís Lopes <email>andrelop@ig.com.br</email>.
- </refsect1>

doc/xml.add

@@ -0,0 +1,5 @@
+PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
+ <refsect1><title>&translation-title;</title>
+   <para>&translation-holder;</para>
+   <para>&translation-english;</para>
+ </refsect1>