* sync with matt again

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-62
   Merge apt--mvo--0

 * apt@packages.debian.org/apt--main--0--patch-63
   Open 0.6.34

 * apt@packages.debian.org/apt--main--0--patch-64
   Add missing semicolon in configure-index (Debian #295773)

 * apt@packages.debian.org/apt--main--0--patch-65
   Update build-depends on gettext to 0.12

 * apt@packages.debian.org/apt--main--0--patch-66
   Merge from bubulle@debian.org--2005/apt--main--0 (translations)

 * bubulle@debian.org--2005/apt--main--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-48

 * bubulle@debian.org--2005/apt--main--0--patch-1
   French translation update

 * bubulle@debian.org--2005/apt--main--0--patch-2
   Remove useles tilde files

 * bubulle@debian.org--2005/apt--main--0--patch-3
   Updated Finnish and Basque translations

 * bubulle@debian.org--2005/apt--main--0--patch-4
   Update with files from apt-sarge. Complete French translation.

 * bubulle@debian.org--2005/apt--main--0--patch-5
   Correct typo in Usage message : s/arbitary/arbitrary. Unfuzzy translations. Closes: #291172

 * bubulle@debian.org--2005/apt--main--0--patch-6
   Updated French manpage. Closes: #291020

 * bubulle@debian.org--2005/apt--main--0--patch-7
   Japanese documentation update. Closes: #265720

 * bubulle@debian.org--2005/apt--main--0--patch-8
   Updated Traditional Chines translation

 * bubulle@debian.org--2005/apt--main--0--patch-9
   Updated Norwegian Bokmal translation from sarge branch

 * bubulle@debian.org--2005/apt--main--0--patch-10
   Updated Slovenian translation

 * bubulle@debian.org--2005/apt--main--0--patch-11
   Remove no_NO translation (not needed after sarge)

 * bubulle@debian.org--2005/apt--main--0--patch-12
   Hungarian translation updated from the sarge branch. Closes: #292204

 * bubulle@debian.org--2005/apt--main--0--patch-13
   Hungarian translation completed. Closes: #292204

 * bubulle@debian.org--2005/apt--main--0--patch-14
   Polish translation updated from sarge

 * bubulle@debian.org--2005/apt--main--0--patch-15
   Initiali Tagalog translation. Closes:#293132

 * bubulle@debian.org--2005/apt--main--0--patch-16
   Really add the Tagalog translation. Closes: #293132

 * bubulle@debian.org--2005/apt--main--0--patch-17
   Completed Tagalog translation. Closes: #293132

 * bubulle@debian.org--2005/apt--main--0--patch-18
   Merge with Matt and update French translation

 * bubulle@debian.org--2005/apt--main--0--patch-19
   Remove no_NO from LINGUAS

 * bubulle@debian.org--2005/apt--main--0--patch-20
   Rebuild the POT file

 * bubulle@debian.org--2005/apt--main--0--patch-21
   Update all PO files from the new apt-all.pot file

 * bubulle@debian.org--2005/apt--main--0--patch-22
   Complete French translation

 * bubulle@debian.org--2005/apt--main--0--patch-23
   Updated Basque translation for main by Piarres Beobide Egana

 * bubulle@debian.org--2005/apt--main--0--patch-24
   Updated Japanese and Norwegian Bokmal translations

 * bubulle@debian.org--2005/apt--main--0--patch-25
   Tagalog translation update by Eric Pareja

 * bubulle@debian.org--2005/apt--main--0--patch-26
   Updated Simplified Chinese translation by Kov Tchai

 * bubulle@debian.org--2005/apt--main--0--patch-27
   Updated Slovak translation by Peter Mann

 * bubulle@debian.org--2005/apt--main--0--patch-28
   Italian translation update

 * bubulle@debian.org--2005/apt--main--0--patch-29
   Dutch translation update by Bart Cornelis

 * bubulle@debian.org--2005/apt--main--0--patch-30
   Danish translation update by Claus Hindsgaul

 * bubulle@debian.org--2005/apt--main--0--patch-31
   Correct LINGUAS to include ru and tl

 * bubulle@debian.org--2005/apt--main--0--patch-32
   Polish translation update by Bartosz Fenski

 * bubulle@debian.org--2005/apt--main--0--patch-33
   Czech translation update by Miroslav Kure

 * bubulle@debian.org--2005/apt--main--0--patch-34
   Brazilian Portuguese translation update by Andre Luis Lopes

 * bubulle@debian.org--2005/apt--main--0--patch-35
   Complete Norwegian Nynorsk translation by H��vard Korsvoll

 * bubulle@debian.org--2005/apt--main--0--patch-36
   Updated Spanish translation by Ruben Porras

 * bubulle@debian.org--2005/apt--main--0--patch-37
   Russian translation update by Yuri Kozlov

 * bubulle@debian.org--2005/apt--main--0--patch-38
   German translation update by Michael Piefel

 * bubulle@debian.org--2005/apt--main--0--patch-39
   Swedish translation update by Peter Karlsson

 * bubulle@debian.org--2005/apt--main--0--patch-40
   Finnish translation update by Tapio Lehtonen

 * bubulle@debian.org--2005/apt--main--0--patch-41
   Hungarian translation update by Kelemen G��bor

 * bubulle@debian.org--2005/apt--main--0--patch-42
   Catalan translation update by Jordi Mallach

 * bubulle@debian.org--2005/apt--main--0--patch-43
   Korean translation update by Changwoo Ryu

 * bubulle@debian.org--2005/apt--main--0--patch-44
   Greek translation updated by George Papamichelakis

 * bubulle@debian.org--2005/apt--main--0--patch-45
   Important corrections to French translation by Mohamed Adn��neTrojette

 * bubulle@debian.org--2005/apt--main--0--patch-46
   Updated Slovenian translation by Jure Cuhalev

 * bubulle@debian.org--2005/apt--main--0--patch-47
   French translation update after proofreading

 * bubulle@debian.org--2005/apt--main--0--patch-48
   Updated Portuguese translation by Miguel Figuereido

 * bubulle@debian.org--2005/apt--main--0--patch-49
   Traditional Chinese translation update by Asho Yeh

 * bubulle@debian.org--2005/apt--main--0--patch-50
   Restored complete French translation

 * bubulle@debian.org--2005/apt--main--0--patch-51
   Remove de.UTF-8 from LINGUAS

 * bubulle@debian.org--2005/apt--main--0--patch-52
   Greek translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-53
   Traditional Chinese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-54
   Merge with matt

 * bubulle@debian.org--2005/apt--main--0--patch-55
   Regenerate apt-all.pot from the sources after merging with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-56
   Re-sync PO files with the POT file

 * bubulle@debian.org--2005/apt--main--0--patch-57
   Correct file permissions

3 files changed, 5 insertions, 5 deletions

diff --git a/doc/ja/apt-cache.ja.8.sgml b/doc/ja/apt-cache.ja.8.sgml
index f4f120c6d..020137021 100644
--- a/doc/ja/apt-cache.ja.8.sgml
+++ b/doc/ja/apt-cache.ja.8.sgml
@@ -245,9 +245,9 @@ Reverse Provides:
        (real or virtual) has been dropped from the distribution. Usually they
        are referenced from Conflicts statements.
 -->
-       <literal/Missing (ʶ¼º)/ ¤Ï¡¢°Í¸´Ø·¸Ãæ¤Ë¤Ï¸ºß¤¹¤ë¤Î¤Ë¡¢¤É¤Î¥Ñ¥Ã¥±¡¼¥¸
+       <literal/Missing (·çÍî)/ ¤Ï¡¢°Í¸´Ø·¸Ãæ¤Ë¤Ï¸ºß¤¹¤ë¤Î¤Ë¡¢¤É¤Î¥Ñ¥Ã¥±¡¼¥¸
        ¤Ë¤âÄ󶡤µ¤ì¤Æ¤¤¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¿ô¤òɽ¤·¤Þ¤¹¡£
-       ʶ¼º¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¤È¤¤¤¦¤³¤È¤Ï¡¢Á´¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¥¢¥¯¥»¥¹¤Ç
+       ¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¤È¤¤¤¦¤³¤È¤Ï¡¢Á´¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¥¢¥¯¥»¥¹¤Ç
        ¤­¤Æ¤¤¤Ê¤¤¤«¡¢(¼Â¤Ê¤¤¤·²¾ÁÛ) ¥Ñ¥Ã¥±¡¼¥¸¤¬¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤«¤é
        ¤Ï¤º¤µ¤ì¤Æ¤·¤Þ¤Ã¤¿¤«¤â¤·¤ì¤Ê¤¤¤³¤È¤òɽ¤·¤Þ¤¹¡£
        Ä̾¤³¤ì¤Ï¹½Ê¸¤¬Ì·½â¤¹¤ë¤³¤È¤Ç»²¾È¤µ¤ì¤Þ¤¹¡£
@@ -414,7 +414,7 @@ Reverse Provides:
 -->
      ·ë²Ì¤Î¥Î¡¼¥É¤Ï¿ô¼ïÎà¤Î·Á¾õ¤È¤Ê¤ê¤Þ¤¹¡£
      Ä̾ï¥Ñ¥Ã¥±¡¼¥¸¤Ï»Í³Ñ¡¢½ã²¾Áۥѥ屡¼¥¸¤Ï»°³Ñ¡¢Ê£²¾Áۥѥ屡¼¥¸¤ÏÉ©·Á¡¢
-     Ï»³Ñ·Á¤Ïʶ¼º¥Ñ¥Ã¥±¡¼¥¸¤ò¤½¤ì¤¾¤ìɽ¤·¤Þ¤¹¡£
+     Ï»³Ñ·Á¤Ï·çÍî¥Ñ¥Ã¥±¡¼¥¸¤ò¤½¤ì¤¾¤ìɽ¤·¤Þ¤¹¡£
      ¥ª¥ì¥ó¥¸¤Î»Í³Ñ¤ÏºÆµ¯¤¬½ªÎ»¤·¤¿¡Ö¥ê¡¼¥Õ¥Ñ¥Ã¥±¡¼¥¸¡×¡¢ÀĤ¤Àþ¤Ï pre-depends¡¢
      ÎФÎÀþ¤Ï¶¥¹ç¤òɽ¤·¤Þ¤¹¡£
      <para>
diff --git a/doc/ja/apt-get.ja.8.sgml b/doc/ja/apt-get.ja.8.sgml
index a3707458a..156f83699 100644
--- a/doc/ja/apt-get.ja.8.sgml
+++ b/doc/ja/apt-get.ja.8.sgml
@@ -416,7 +416,7 @@
      held back.
      Configuration Item: <literal/APT::Get::Fix-Missing/.
 -->
-     ¸«¤Ä¤«¤é¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤Î̵»ë - ¥Ñ¥Ã¥±¡¼¥¸¤¬¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¤ê¡¢
+     ·çÍî¥Ñ¥Ã¥±¡¼¥¸¤Î̵»ë - ¥Ñ¥Ã¥±¡¼¥¸¤¬¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¤ê¡¢
      (¥Ñ¥Ã¥±¡¼¥¸¤ÎÇË»¤Ç) ¼èÆÀ¤·¤¿¸å¤ÎÀ°¹çÀ­¥Á¥§¥Ã¥¯¤òÄ̤é¤Ê¤«¤Ã¤¿¾ì¹ç¡¢
      ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î½èÍý¤òÊÝα¤·ºÇ¸å¤Þ¤Ç½èÍý¤ò³¤±¤Þ¤¹¡£
      ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò <option/-f/ ¥ª¥×¥·¥ç¥ó¤ÈƱ»þ¤Ë»ÈÍѤ¹¤ë¤È¡¢
diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja
index 4abb9ccc8..495322997 100644
--- a/doc/ja/apt.ent.ja
+++ b/doc/ja/apt.ent.ja
@@ -114,7 +114,7 @@
 <!ENTITY translator "
  <RefSect1><Title>ËÝÌõ¼Ô</>
     <para>
-    ÁÒß· ˾ <email>nabetaro@slug.jp</> (2003)
+    ÁÒß· ˾ <email>nabetaro@mx1.avis.ne.jp</> (2003-2004)
     </para>
     <para>
     Debian JP Documentation ML <email>debian-doc@debian.or.jp</>