diff -Nru anthy-7900.old/cannadic/Makefile.orig anthy-7900/cannadic/Makefile.orig
--- anthy-7900.old/cannadic/Makefile.orig	2007-01-20 17:34:22.653386152 +0100
+++ anthy-7900/cannadic/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-#
-# Makefile
-# 
-# Copyright Masao SUGIMOTO. 2000, 2001, 2002, 2003
-#
-# Author: Masao SUGIMOTO <sugimoto@oucrc.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-MAINTXTDIC      = gcanna.ctd
-SUBTXTDIC       = gcannaf.ctd
-
-all: help
-
-help:
-	@echo "see README"
-
-maindic:
-	crxdic -m -o ${MAINTXTDIC:.ctd=.cbd} ${MAINTXTDIC}
-	crfreq -div 512 ${MAINTXTDIC:.ctd=.cbd} ${MAINTXTDIC:.ctd=.mwd}
-
-maindic-old-version:
-	perl convert-old-cannadic.pl
-	crxdic -m -o ${MAINTXTDIC:.ctd=.cbd}.orig ${MAINTXTDIC}
-	crfreq ${MAINTXTDIC:.ctd=.cbd} ${MAINTXTDIC:.ctd=.mwd}
-
-subdic:
-	crxdic -s -o ${SUBTXTDIC:.ctd=.cbd} ${SUBTXTDIC}
-	crfreq ${SUBTXTDIC:.ctd=.cbd} ${SUBTXTDIC:.ctd=.swd}
diff -Nru anthy-7900.old/debian/changelog anthy-7900/debian/changelog
--- anthy-7900.old/debian/changelog	2007-01-20 17:34:24.505501902 +0100
+++ anthy-7900/debian/changelog	2007-01-20 18:20:45.367294902 +0100
@@ -1,3 +1,14 @@
+anthy (7900-3.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix l10n issues
+  * Debconf translation updates:
+    - German. Closes: #398868
+    - French. Closes: #400824
+    - Russian. Closes: #404413
+    - Japanese. Closes: #407347
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 20 Jan 2007 18:19:27 +0100
+
 anthy (7900-3) unstable; urgency=low
 
   * Acknowledge the NMU fix.
diff -Nru anthy-7900.old/debian/po/de.po anthy-7900/debian/po/de.po
--- anthy-7900.old/debian/po/de.po	1970-01-01 01:00:00.000000000 +0100
+++ anthy-7900/debian/po/de.po	2007-01-20 18:21:26.009834902 +0100
@@ -0,0 +1,50 @@
+# translation of po-debconf template to German
+# Copyright (C) 2006, Matthias Julius
+# This file is distributed under the same license as the anthy package.
+#
+# Matthias Julius <mdeb@julius-net.net>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: anthy 7900-2\n"
+"Report-Msgid-Bugs-To: omote@debian.org\n"
+"POT-Creation-Date: 2006-11-25 00:36+0900\n"
+"PO-Revision-Date: 2006-11-15 22:14-0500\n"
+"Last-Translator: Matthias Julius <mdeb@julius-net.net>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: multiselect
+#. Description
+#: ../anthy.templates:1001
+#, fuzzy
+msgid "Add-on dictionaries to use:"
+msgstr "Welche Erweiterungswörterbücher möchten Sie nutzen:"
+
+#. Type: multiselect
+#. Description
+#: ../anthy.templates:1001
+#, fuzzy
+msgid ""
+"The anthy package can use add-on dictionaries to the system dictionary. the "
+"following dictionaries are currently available:"
+msgstr ""
+"Das anthy-Paket kann Erweiterungswörterbücher zum Systemwörterbuch "
+"hinzufügen. Die folgenden Wörterbücher sind verfügbar:"
+
+#. Type: multiselect
+#. Description
+#: ../anthy.templates:1001
+#, fuzzy
+msgid ""
+" base.t: Anthy specific words which are compatible with cannadic.\n"
+" extra.t: Anthy specific words which are not compatible with cannadic.\n"
+" 2ch.t: Dialects used in 2ch, the biggest Japanese web discussion group."
+msgstr ""
+" base.t:  anthy-spezifische Wörter, welche mit Cannadic kompatibel sind.\n"
+" extra.t: anthy-spezifische Wörter, welche nicht mit Cannadic kompatibel "
+"sind.\n"
+" 2ch.t:   Dialekte, die in 2ch, der größten japanischen Web-Diskussions-\n"
+"          Gruppe, verwendet werden."
diff -Nru anthy-7900.old/debian/po/fr.po anthy-7900/debian/po/fr.po
--- anthy-7900.old/debian/po/fr.po	2007-01-20 17:34:24.761517902 +0100
+++ anthy-7900/debian/po/fr.po	2007-01-20 18:18:44.239724902 +0100
@@ -7,7 +7,7 @@
 "Project-Id-Version: anthy_7900-2\n"
 "Report-Msgid-Bugs-To: omote@debian.org\n"
 "POT-Creation-Date: 2006-11-25 00:36+0900\n"
-"PO-Revision-Date: 2006-10-23 11:16+0200\n"
+"PO-Revision-Date: 2006-11-28 01:52+0100\n"
 "Last-Translator: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,13 +33,12 @@
 #. Type: multiselect
 #. Description
 #: ../anthy.templates:1001
-#, fuzzy
 msgid ""
 " base.t: Anthy specific words which are compatible with cannadic.\n"
 " extra.t: Anthy specific words which are not compatible with cannadic.\n"
 " 2ch.t: Dialects used in 2ch, the biggest Japanese web discussion group."
 msgstr ""
-" - base.t  : Mots spécifiques à anthy, compatibles avec cannadic ;\n"
-" - extra.t : Mots spécifiques à anthy, compatibles avec cannadic ;\n"
-" - 2ch.t   : Dialectes utilisés sur 2ch, le plus grand groupe de\n"
-"             discussions japonais."
+" base.t  : Mots spécifiques à anthy, compatibles avec cannadic ;\n"
+" extra.t : Mots spécifiques à anthy, incompatibles avec cannadic ;\n"
+" 2ch.t   : Dialectes utilisés sur 2ch, le plus grand groupe de\n"
+"           discussions japonais."
diff -Nru anthy-7900.old/debian/po/ja.po anthy-7900/debian/po/ja.po
--- anthy-7900.old/debian/po/ja.po	1970-01-01 01:00:00.000000000 +0100
+++ anthy-7900/debian/po/ja.po	2007-01-20 18:19:15.213660652 +0100
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 7900-3\n"
+"Report-Msgid-Bugs-To: omote@debian.org\n"
+"POT-Creation-Date: 2006-11-25 00:36+0900\n"
+"PO-Revision-Date: 2007-01-18 03:58+0900\n"
+"Last-Translator: Jonny <jonny@csc.jp>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../anthy.templates:1001
+msgid "Add-on dictionaries to use:"
+msgstr "使用するアドオン辞書:"
+
+#. Type: multiselect
+#. Description
+#: ../anthy.templates:1001
+msgid ""
+"The anthy package can use add-on dictionaries to the system dictionary. the "
+"following dictionaries are currently available:"
+msgstr ""
+"anthy パッケージはシステム辞書にアドオン辞書を使用することができます。次の"
+"辞書が現在利用可能です:"
+
+#. Type: multiselect
+#. Description
+#: ../anthy.templates:1001
+msgid ""
+" base.t: Anthy specific words which are compatible with cannadic.\n"
+" extra.t: Anthy specific words which are not compatible with cannadic.\n"
+" 2ch.t: Dialects used in 2ch, the biggest Japanese web discussion group."
+msgstr ""
+" base.t: cannadic と互換性のある Anthy 独特の単語。\n"
+" extra.t: cannadic と互換性のない Anthy 独特の単語。\n"
+" 2ch.t: 最も大きな日本のウェブディスカッショングループ、2ch で使われる方言。"
diff -Nru anthy-7900.old/debian/po/ru.po anthy-7900/debian/po/ru.po
--- anthy-7900.old/debian/po/ru.po	2007-01-20 17:34:24.761517902 +0100
+++ anthy-7900/debian/po/ru.po	2007-01-20 18:18:59.716692000 +0100
@@ -1,4 +1,4 @@
-# translation of anthy_debconf_ru.po to Russian
+# translation of anthy_7900-3_ru.po to Russian
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -13,18 +13,17 @@
 # Yuri Kozlov <kozlov.y@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: 7900-2\n"
+"Project-Id-Version: 7900-3\n"
 "Report-Msgid-Bugs-To: omote@debian.org\n"
 "POT-Creation-Date: 2006-11-25 00:36+0900\n"
-"PO-Revision-Date: 2006-11-22 21:50+0300\n"
+"PO-Revision-Date: 2006-12-24 18:37+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: multiselect
 #. Description
@@ -45,12 +44,12 @@
 #. Type: multiselect
 #. Description
 #: ../anthy.templates:1001
-#, fuzzy
 msgid ""
 " base.t: Anthy specific words which are compatible with cannadic.\n"
 " extra.t: Anthy specific words which are not compatible with cannadic.\n"
 " 2ch.t: Dialects used in 2ch, the biggest Japanese web discussion group."
 msgstr ""
 " base.t: Anthy-специфичные слова, совместимые с cannadic.\n"
-" extra.t: Anthy-специфичные слова, совместимые с cannadic.\n"
+" extra.t: Anthy-специфичные слова, несовместимые с cannadic.\n"
 " 2ch.t: Диалекты, используемые в 2ch, самом большом японском веб-форуме."
+
