merge with my po4a branch & update both pot's

Thanks again for the initial patch from KURASAWA Nozomu and
for the improvements and cleanups done by Nicolas François
to get po4a up and running for apt man page translations!

diff --cc configure.in
Simple merge

diff --cc debian/changelog
index e351198c5ce241f49a6da8aa4b7ae90d75b6b35b,c3f9881ac680acde4c4c431ec08d68619387b6e8..10afb5ef96e7f12b1f40c08fdef0e31f516dbf46
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,4 +1,35 @@@
 -apt (0.7.22.3) unstable; urgency=low
++apt (0.7.24) UNRELEASED; urgency=low
++
++  [ Nicolas François ]
++  * Cleaned up the first patch draft from KURASAWA Nozomu to finally
++    get po4a support for translating the man pages.
++    Many thanks to both for this excellent work! (Closes: #441608)
++  * doc/ja/*, doc/po/ja.po:
++    - remove the old ja man page translation and replace it with
++      the new po4a-powered translation by KURASAWA Nozomu.
++  * doc/*.?.xml (manpages):
++    - add contrib to author tags and also add refmiscinfo to fix warnings
++  * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak:
++    - fix a few typos in the comments of this files
++
++  [ David Kalnischkies ]
++  * doc/Doxyfile.in:
++    - update file with doxygen 1.6.1 (current unstable)
++    - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9
++  * buildlib/po4a_manpage.mak, doc/makefile, configure:
++    - simplify the makefiles needed for po4a manpages
++
++ -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 28 Aug 2009 09:40:08 +0200
++
 +apt (0.7.23) unstable; urgency=low
 +
 +  [ Eugene V. Lyubimkin ]
 +  * methods/{http,https,ftp}, doc/apt.conf.5.xml:
 +    - Changed and unified the code that determines which proxy to use. Now
 +      'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority,
 +      and '{http,ftp}_proxy' environment variables are used only if options
 +      mentioned above are not specified.
 +      (Closes: #445985, #157759, #320184, #365880, #479617)
  
    [ David Kalnischkies ]
    * cmdline/apt-get.cc:

diff --cc doc/apt.conf.5.xml
Simple merge

diff --cc po/apt-all.pot
index 518a3a1c1e7ac820e0b6131cc7286ae5c7d899ef,518a3a1c1e7ac820e0b6131cc7286ae5c7d899ef..1b763f62017a0e64a742425ca9b3c7e62874fa1d
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -994,7 -994,7 +994,7 @@@ msgstr "
  msgid "Calculating upgrade... "
  msgstr ""
  
--#: cmdline/apt-get.cc:1933 methods/ftp.cc:702 methods/connect.cc:112
++#: cmdline/apt-get.cc:1933 methods/ftp.cc:707 methods/connect.cc:112
  msgid "Failed"
  msgstr ""
  
@@@ -1566,147 -1566,147 +1566,147 @@@ msgid "Invalid URI, local URIS must no
  msgstr ""
  
  #. Login must be before getpeername otherwise dante won't work.
--#: methods/ftp.cc:162
++#: methods/ftp.cc:167
  msgid "Logging in"
  msgstr ""
  
--#: methods/ftp.cc:168
++#: methods/ftp.cc:173
  msgid "Unable to determine the peer name"
  msgstr ""
  
--#: methods/ftp.cc:173
++#: methods/ftp.cc:178
  msgid "Unable to determine the local name"
  msgstr ""
  
--#: methods/ftp.cc:204 methods/ftp.cc:232
++#: methods/ftp.cc:209 methods/ftp.cc:237
  #, c-format
  msgid "The server refused the connection and said: %s"
  msgstr ""
  
--#: methods/ftp.cc:210
++#: methods/ftp.cc:215
  #, c-format
  msgid "USER failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:217
++#: methods/ftp.cc:222
  #, c-format
  msgid "PASS failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:237
++#: methods/ftp.cc:242
  msgid ""
  "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
  "is empty."
  msgstr ""
  
--#: methods/ftp.cc:265
++#: methods/ftp.cc:270
  #, c-format
  msgid "Login script command '%s' failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:291
++#: methods/ftp.cc:296
  #, c-format
  msgid "TYPE failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
++#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
  msgid "Connection timeout"
  msgstr ""
  
--#: methods/ftp.cc:335
++#: methods/ftp.cc:340
  msgid "Server closed the connection"
  msgstr ""
  
--#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
++#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
  msgid "Read error"
  msgstr ""
  
--#: methods/ftp.cc:345 methods/rsh.cc:197
++#: methods/ftp.cc:350 methods/rsh.cc:197
  msgid "A response overflowed the buffer."
  msgstr ""
  
--#: methods/ftp.cc:362 methods/ftp.cc:374
++#: methods/ftp.cc:367 methods/ftp.cc:379
  msgid "Protocol corruption"
  msgstr ""
  
--#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
++#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
  msgid "Write error"
  msgstr ""
  
--#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
++#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
  msgid "Could not create a socket"
  msgstr ""
  
--#: methods/ftp.cc:698
++#: methods/ftp.cc:703
  msgid "Could not connect data socket, connection timed out"
  msgstr ""
  
--#: methods/ftp.cc:704
++#: methods/ftp.cc:709
  msgid "Could not connect passive socket."
  msgstr ""
  
--#: methods/ftp.cc:722
++#: methods/ftp.cc:727
  msgid "getaddrinfo was unable to get a listening socket"
  msgstr ""
  
--#: methods/ftp.cc:736
++#: methods/ftp.cc:741
  msgid "Could not bind a socket"
  msgstr ""
  
--#: methods/ftp.cc:740
++#: methods/ftp.cc:745
  msgid "Could not listen on the socket"
  msgstr ""
  
--#: methods/ftp.cc:747
++#: methods/ftp.cc:752
  msgid "Could not determine the socket's name"
  msgstr ""
  
--#: methods/ftp.cc:779
++#: methods/ftp.cc:784
  msgid "Unable to send PORT command"
  msgstr ""
  
--#: methods/ftp.cc:789
++#: methods/ftp.cc:794
  #, c-format
  msgid "Unknown address family %u (AF_*)"
  msgstr ""
  
--#: methods/ftp.cc:798
++#: methods/ftp.cc:803
  #, c-format
  msgid "EPRT failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:818
++#: methods/ftp.cc:823
  msgid "Data socket connect timed out"
  msgstr ""
  
--#: methods/ftp.cc:825
++#: methods/ftp.cc:830
  msgid "Unable to accept connection"
  msgstr ""
  
--#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
++#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
--#: methods/ftp.cc:877
++#: methods/ftp.cc:882
  #, c-format
  msgid "Unable to fetch file, server said '%s'"
  msgstr ""
  
--#: methods/ftp.cc:892 methods/rsh.cc:322
++#: methods/ftp.cc:897 methods/rsh.cc:322
  msgid "Data socket timed out"
  msgstr ""
  
--#: methods/ftp.cc:922
++#: methods/ftp.cc:927
  #, c-format
  msgid "Data transfer failed, server said '%s'"
  msgstr ""
  
  #. Get the files information
--#: methods/ftp.cc:997
++#: methods/ftp.cc:1002
  msgid "Query"
  msgstr ""
  
--#: methods/ftp.cc:1109
++#: methods/ftp.cc:1114
  msgid "Unable to invoke "
  msgstr ""
  
@@@ -1814,80 -1814,80 +1814,80 @@@ msgstr "
  msgid "Read error from %s process"
  msgstr ""
  
--#: methods/http.cc:379
++#: methods/http.cc:384
  msgid "Waiting for headers"
  msgstr ""
  
--#: methods/http.cc:525
++#: methods/http.cc:530
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr ""
  
--#: methods/http.cc:533
++#: methods/http.cc:538
  msgid "Bad header line"
  msgstr ""
  
--#: methods/http.cc:552 methods/http.cc:559
++#: methods/http.cc:557 methods/http.cc:564
  msgid "The HTTP server sent an invalid reply header"
  msgstr ""
  
--#: methods/http.cc:588
++#: methods/http.cc:593
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  
--#: methods/http.cc:603
++#: methods/http.cc:608
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  
--#: methods/http.cc:605
++#: methods/http.cc:610
  msgid "This HTTP server has broken range support"
  msgstr ""
  
--#: methods/http.cc:629
++#: methods/http.cc:634
  msgid "Unknown date format"
  msgstr ""
  
--#: methods/http.cc:782
++#: methods/http.cc:787
  msgid "Select failed"
  msgstr ""
  
--#: methods/http.cc:787
++#: methods/http.cc:792
  msgid "Connection timed out"
  msgstr ""
  
--#: methods/http.cc:810
++#: methods/http.cc:815
  msgid "Error writing to output file"
  msgstr ""
  
--#: methods/http.cc:841
++#: methods/http.cc:846
  msgid "Error writing to file"
  msgstr ""
  
--#: methods/http.cc:869
++#: methods/http.cc:874
  msgid "Error writing to the file"
  msgstr ""
  
--#: methods/http.cc:883
++#: methods/http.cc:888
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
--#: methods/http.cc:885
++#: methods/http.cc:890
  msgid "Error reading from server"
  msgstr ""
  
--#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:215
++#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
  msgid "Failed to truncate file"
  msgstr ""
  
--#: methods/http.cc:1141
++#: methods/http.cc:1146
  msgid "Bad header data"
  msgstr ""
  
--#: methods/http.cc:1158 methods/http.cc:1213
++#: methods/http.cc:1163 methods/http.cc:1218
  msgid "Connection failed"
  msgstr ""
  
--#: methods/http.cc:1305
++#: methods/http.cc:1310
  msgid "Internal error"
  msgstr ""