Index: Makefile.am
===================================================================
--- Makefile.am	(revision 2324)
+++ Makefile.am	(working copy)
@@ -11,7 +11,9 @@
 pkgconfig_DATA = uim.pc
 
 desktopdir = $(datadir)/applications
-desktop_DATA = uim.desktop
+desktop_in_files = uim.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
 
 ACLOCAL_AMFLAGS = -I m4
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 2324)
+++ configure.ac	(working copy)
@@ -845,7 +845,7 @@
 		 pixmaps/Makefile
 		 replace/Makefile
 		 uim.pc
-		 uim.desktop
+		 uim.desktop.in
 		 ])
 
 AC_OUTPUT
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in	(revision 2324)
+++ po/POTFILES.in	(working copy)
@@ -1,90 +1,54 @@
 helper/GNOME_UimApplet.server.in.in
-helper/im-switcher-gtk.c
-helper/dict-main-gtk.c
 helper/dict-anthy.c
-helper/dict-anthy.h
-helper/dict-canna.c
-helper/dict-canna.h
-helper/dict-word-win-gtk.c
-helper/dict-word-win-gtk.h
-helper/dict-word-list-win-gtk.c
-helper/dict-word-list-win-gtk.h
-helper/dict-util.c
-helper/dict-word-list-view-gtk.c
-helper/dict-word-list-view-gtk.h
-helper/dict-word.c
-helper/dict-word.h
-helper/dict-dict.c
-helper/dict-dict.h
 helper/dict-cclass-dialog.c
-helper/dict-cclass-dialog.h
-helper/pref-gtk.c
+helper/dict-main-gtk.c
+helper/dict-word-list-view-gtk.c
+helper/dict-word-list-win-gtk.c
+helper/dict-word-win-gtk.c
+helper/im-switcher-gtk.c
+helper/input-pad-ja.c
 helper/pref-gtk-custom-widgets.c
-helper/pref-gtk-custom-widgets.h
+helper/pref-gtk.c
+helper/toolbar-applet-gnome.c
 helper/toolbar-common-gtk.c
-helper/input-pad-ja.c
-qt/candwin-qt.cpp
+helper/toolbar-standalone-gtk.c
+qt/chardict-bushuviewwidget.cpp
+qt/chardict-qt.cpp
+qt/chardict-unicodeviewwidget.cpp
+qt/pref-customwidgets.cpp
+qt/pref-qt.cpp
+qt/qtgettext.h
 qt/switcher-qt.cpp
 qt/toolbar-common-quimhelpertoolbar.cpp
-qt/toolbar-standalone-qt.cpp
-qt/pref-qt.cpp
-qt/pref-customwidgets.cpp
-scm/py.scm
 scm/action.scm
 scm/anthy-custom.scm
 scm/anthy-key-custom.scm
-scm/anthy.scm
 scm/byeoru-custom.scm
-scm/byeoru-dic.scm
 scm/byeoru-key-custom.scm
-scm/byeoru-symbols.scm
-scm/byeoru.scm
 scm/canna-custom.scm
 scm/canna-key-custom.scm
-scm/canna.scm
-scm/default.scm
+scm/custom.scm
 scm/direct.scm
 scm/generic-custom.scm
 scm/generic-key-custom.scm
 scm/generic.scm
 scm/hangul.scm
-scm/hangul2.scm
-scm/hangul3.scm
-scm/i18n.scm
 scm/im-custom.scm
-scm/im.scm
 scm/ipa-x-sampa.scm
-scm/japanese-azik.scm
-scm/japanese-kana.scm
-scm/japanese.scm
-scm/key.scm
 scm/latin.scm
-scm/lazy-load.scm
-scm/load-action.scm
-scm/init.scm
 scm/m17nlib.scm
-scm/pinyin-big5.scm
+scm/mana-custom.scm
+scm/mana-key-custom.scm
 scm/prime-custom.scm
 scm/prime-key-custom.scm
-scm/prime.scm
 scm/pyload.scm
-scm/pyunihan.scm
-scm/rk.scm
-scm/romaja.scm
+scm/scim.scm
 scm/skk-custom.scm
-scm/skk-dialog.scm
-scm/skk-editor.scm
 scm/skk-key-custom.scm
-scm/skk.scm
 scm/spellcheck-custom.scm
-scm/spellcheck.scm
 scm/tcode.scm
-scm/tutcode.scm
 scm/tutcode-key-custom.scm
-scm/uim-sh.scm
-scm/ustr.scm
-scm/util.scm
+scm/tutcode.scm
 scm/viqr.scm
-scm/zaurus.scm
-gtk/gtk-im-uim.c
+uim.desktop.in.in
 uim/iso-639-1.def
Index: uim.desktop.in
===================================================================
--- uim.desktop.in	(revision 2324)
+++ uim.desktop.in	(working copy)
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=Preference of uim
-Name[ja]=uimの設定
-Comment=
-Comment[ja]=
-Exec=uim-pref-gtk
-Icon=@uim_pixmapsdir@/uim-icon.png
-Terminal=false
-MimeType=text/plain
-Categories=Settings
Index: uim.desktop.in.in
===================================================================
--- uim.desktop.in.in	(revision 0)
+++ uim.desktop.in.in	(revision 0)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+_Name=Preference of UIM
+_Comment=Input method settings
+Exec=uim-pref-gtk
+Icon=@uim_pixmapsdir@/uim-icon.png
+Terminal=false
+MimeType=text/plain
+Categories=Settings