diff --git a/configure.ac b/configure.ac
index 952c700..3397bd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ XDT_CHECK_PACKAGE([XFCE4_UTIL], [libxfce4util-1.0], [4.2.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.2.0])
 
 dnl Check for i18n support
-XDT_I18N([de eu fi fr hu pt_BR vi])
+XDT_I18N([de eu fi fr hu ja pt_BR vi])
 
 dnl Check for debugging support
 BM_DEBUG_SUPPORT()
diff --git a/po/ChangeLog b/po/ChangeLog
index 4201b0d..b63b2b2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,22 +1,53 @@
-2005-11-09 21:13  Johannes Zellner <webmaster@nebulon.de>
+2006-04-01  Daichi Kawahata <daichi@xfce.org>
+
+	* ja.po: Added Japanese translations.
+
+2006-03-28  Johannes Zellner <webmaster@nebulon.de>
+
+	* Makefile.in: Hey I'm active! :-)
+	  This is the initial commit for the 0.4.0 xfce4-taskmanager.
+
+2006-02-23  Daichi Kawahata <daichi@xfce.org>
+
+	* vi.po: Added Vietnamese translations by Phan Vinh Thinh
+	  <teppi@vnlinux.org>.
+
+2006-02-22  Daichi Kawahata <daichi@xfce.org>
+
+	* hu.po: Updated.
+
+2006-02-15  Daichi Kawahata <daichi@xfce.org>
+
+	* eu.po: Added Basque translations by Piarres Beobide
+	  <pi@beobide.net>.
+
+2006-02-11  Szervac Attila <sas@321.hu>
+
+	* hu.po: Add Hungarian Translations.
+
+2006-01-04  Daichi Kawahata <daichi@xfce.org>
+
+	* de.po, fi.po, fr.po, pt_BR.po: Updated and fixed i18n stuffs.
+
+2005-11-09  Johannes Zellner <webmaster@nebulon.de>
 
 	* pt_BR.po: Added Brazilian Portuguese translation.
 	* Makefile.in, fr.po, pt_BR.po: Updated.
 
-2005-10-09 10:20  Johannes Zellner <webmaster@nebulon.de>
+2005-10-09  Johannes Zellner <webmaster@nebulon.de>
 
 	* fr.po: Added French translation.
 	* xfce4-taskmanager-fr.po: Removed.
 
-2005-10-09 10:11  Johannes Zellner <webmaster@nebulon.de>
+2005-10-09  Johannes Zellner <webmaster@nebulon.de>
 
 	* Makefile, Makefile.in, Makefile.in.in: Replaced some old files.
 
-2005-10-09 10:00  Johannes Zellner <webmaster@nebulon.de>
+2005-10-09  Johannes Zellner <webmaster@nebulon.de>
 
 	* Makefile.in, Makefile.in.in: Replaced some old files.
 
-2005-09-07 04:38  Johannes Zellner <webmaster@nebulon.de>
+2005-09-07  Johannes Zellner <webmaster@nebulon.de>
 
 	* ChangeLog, Makefile, Makefile.in, Makefile.in.in, POTFILES,
 	  POTFILES.in, de.gmo, de.po, fi.po, xfce4-taskmanager-fr.po,
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 0000000..6e7c09e
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,83 @@
+# $Id$
+#
+# Japanese translations for xfce4-taskmanager package.
+# Copyright (C) 2005-2006 Johannes Zellner.
+# This file is distributed under the same license as
+#   the xfce4-taskmanager package.
+# Daichi Kawahata <daichi@xfce.org>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-04-01 17:42+0900\n"
+"PO-Revision-Date: 2006-04-01 17:57+0900\n"
+"Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
+"Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/interface.c:41 ../src/interface.c:246
+msgid "xfce4-taskmanager"
+msgstr "xfce4-taskmanager"
+
+#: ../src/interface.c:75
+msgid "more details"
+msgstr "さらに詳しく"
+
+#: ../src/interface.c:108
+msgid "Command"
+msgstr "コマンド"
+
+#: ../src/interface.c:114
+msgid "PID"
+msgstr "PID"
+
+#: ../src/interface.c:120
+msgid "PPID"
+msgstr "PPID"
+
+#: ../src/interface.c:126
+msgid "State"
+msgstr "状態"
+
+#: ../src/interface.c:132
+msgid "VM-Size"
+msgstr "VMサイズ"
+
+#: ../src/interface.c:138
+msgid "RSS"
+msgstr "RSS"
+
+#: ../src/interface.c:144
+msgid "User"
+msgstr "ユーザー"
+
+#: ../src/interface.c:163
+msgid "Stop"
+msgstr "中止"
+
+#: ../src/interface.c:167
+msgid "Continue"
+msgstr "続行"
+
+#: ../src/interface.c:171
+msgid "Term"
+msgstr "中断"
+
+#: ../src/interface.c:175
+msgid "Kill"
+msgstr "Kill"
+
+#: ../src/interface.c:210
+msgid "Show user tasks"
+msgstr "ユーザータスクを表示"
+
+#: ../src/interface.c:215
+msgid "Show root tasks"
+msgstr "ルートタスクを表示"
+
+#: ../src/interface.c:220
+msgid "Show other tasks"
+msgstr "その他のタスクを表示"