diff --git a/scim-wnn/po/POTFILES.in b/scim-wnn/po/POTFILES.in
index cb522de..cf80f20 100644
--- a/scim-wnn/po/POTFILES.in
+++ b/scim-wnn/po/POTFILES.in
@@ -3,3 +3,5 @@
 src/scim_wnn_imengine_setup.cpp
 src/romkan.h
 src/romkan.cpp
+src/kanainput.h
+src/kanainput.cpp
diff --git a/scim-wnn/po/ja.po b/scim-wnn/po/ja.po
index ce81e19..d811deb 100644
--- a/scim-wnn/po/ja.po
+++ b/scim-wnn/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
-"POT-Creation-Date: 2004-12-10 23:15+0900\n"
+"POT-Creation-Date: 2004-12-13 10:38+0900\n"
 "PO-Revision-Date: 2004-12-01 14:29+0900\n"
 "Last-Translator: ＴＡＭ (Teppei Tamra) <tam-t@par.odn.ne.jp>\n"
 "Language-Team: Japanese\n"
@@ -35,19 +35,23 @@
 msgid "SCIM-WNN HELP"
 msgstr "適当にそれっぽく操作して下さい。"
 
-#: src/scim_wnn_imengine.cpp:276
-msgid "mode status"
+#: src/scim_wnn_imengine.cpp:292
+msgid "input mode"
 msgstr "入力モード"
 
-#: src/scim_wnn_imengine.cpp:282
+#: src/scim_wnn_imengine.cpp:296 src/scim_wnn_imengine.cpp:299
+msgid "mode status"
+msgstr "状態"
+
+#: src/scim_wnn_imengine.cpp:310
 msgid "Kanji"
 msgstr "[漢]"
 
-#: src/scim_wnn_imengine.cpp:652 src/scim_wnn_imengine.cpp:659
+#: src/scim_wnn_imengine.cpp:678 src/scim_wnn_imengine.cpp:685
 msgid "could not connect to jserver."
 msgstr "サーバに接続できませんでした"
 
-#: src/scim_wnn_imengine.cpp:700
+#: src/scim_wnn_imengine.cpp:726
 msgid "lookup result"
 msgstr "候補一覧"
 
@@ -275,5 +279,17 @@
 msgid "Wide Latin"
 msgstr "[ａ]"
 
+#: src/romkan.cpp:361
+msgid "Roma"
+msgstr "ローマ字"
+
+#: src/kanainput.cpp:132
+msgid "KANA"
+msgstr "[あ]"
+
+#: src/kanainput.cpp:140
+msgid "Kana"
+msgstr "かな入力"
+
 #~ msgid "WNN"
 #~ msgstr "WNN"
diff --git a/scim-wnn/po/scim-wnn.pot b/scim-wnn/po/scim-wnn.pot
index 653fda7..c03131f 100644
--- a/scim-wnn/po/scim-wnn.pot
+++ b/scim-wnn/po/scim-wnn.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-12-10 23:15+0900\n"
+"POT-Creation-Date: 2004-12-13 10:38+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,19 +32,23 @@
 msgid "SCIM-WNN HELP"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:276
+#: src/scim_wnn_imengine.cpp:292
+msgid "input mode"
+msgstr ""
+
+#: src/scim_wnn_imengine.cpp:296 src/scim_wnn_imengine.cpp:299
 msgid "mode status"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:282
+#: src/scim_wnn_imengine.cpp:310
 msgid "Kanji"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:652 src/scim_wnn_imengine.cpp:659
+#: src/scim_wnn_imengine.cpp:678 src/scim_wnn_imengine.cpp:685
 msgid "could not connect to jserver."
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:700
+#: src/scim_wnn_imengine.cpp:726
 msgid "lookup result"
 msgstr ""
 
@@ -271,3 +275,15 @@
 #: src/romkan.cpp:292
 msgid "Wide Latin"
 msgstr ""
+
+#: src/romkan.cpp:361
+msgid "Roma"
+msgstr ""
+
+#: src/kanainput.cpp:132
+msgid "KANA"
+msgstr ""
+
+#: src/kanainput.cpp:140
+msgid "Kana"
+msgstr ""
diff --git a/scim-wnn/src/kanainput.h b/scim-wnn/src/kanainput.h
index ad13afa..cde08fd 100644
--- a/scim-wnn/src/kanainput.h
+++ b/scim-wnn/src/kanainput.h
@@ -42,6 +42,7 @@
     virtual bool inputEvent(const KeyEvent &key);
     virtual String getName();
     virtual String getModeName();
+    virtual String getPropertyName() {return(String("KanaInput"));};
 
 protected:
     static bool fakeKanaInput;
diff --git a/scim-wnn/src/preeditor.h b/scim-wnn/src/preeditor.h
index 3ec1912..243fb45 100644
--- a/scim-wnn/src/preeditor.h
+++ b/scim-wnn/src/preeditor.h
@@ -61,6 +61,7 @@
     virtual bool cancelEvent();
     virtual bool inputEvent(const KeyEvent &key);
     virtual String getName();
+    virtual String getPropertyName() {return(String("PreEditor"));};
 
 protected:
     static WideString text;
diff --git a/scim-wnn/src/romkan.cpp b/scim-wnn/src/romkan.cpp
index 8511297..bd80b08 100644
--- a/scim-wnn/src/romkan.cpp
+++ b/scim-wnn/src/romkan.cpp
@@ -358,5 +358,5 @@
  */
 String Romkan::getName()
 {
-    return(String(_("Roma-Kana")));
+    return(String(_("Roma")));
 }
diff --git a/scim-wnn/src/romkan.h b/scim-wnn/src/romkan.h
index cf13952..bd59f9e 100644
--- a/scim-wnn/src/romkan.h
+++ b/scim-wnn/src/romkan.h
@@ -52,6 +52,7 @@
     virtual bool cancelEvent();
     virtual bool inputEvent(const KeyEvent &key);
     virtual String getName();
+    virtual String getPropertyName() {return(String("Romkan"));};
 
 protected:
     WideString eval();
diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp
index d8320db..c39b4ad 100644
--- a/scim-wnn/src/scim_wnn_imengine.cpp
+++ b/scim-wnn/src/scim_wnn_imengine.cpp
@@ -268,17 +268,44 @@
 
 
 /*!
+    \fn WnnInstance::changePreEditor(const QString &name)
+ */
+void WnnInstance::changePreEditor(const String &name)
+{
+    for(unsigned int i = 0;i < preeditors.size();i ++) {
+        if (preeditors[i]->getPropertyName() == name) {
+            m_preeditor = preeditors[i];
+            return;
+        }
+    }
+    return;
+}
+
+
+/*!
     \fn WnnInstance::updateProperty()
  */
 void WnnInstance::updateProperty()
 {
     if (m_proplist.empty()) {
         Property p;
+        p = Property(SCIM_PROP_WNN_INPUTMODE,"",String(""),_("input mode"));
+        m_proplist.push_back(p);
+        for(unsigned int i = 0;i < preeditors.size();i ++) {
+            p = Property(String(SCIM_PROP_WNN_INPUTMODE) + String("/") + preeditors[i]->getPropertyName(),
+                preeditors[i]->getName(),String(""),_("mode status"));
+            m_proplist.push_back(p);
+        }
         p = Property(SCIM_PROP_WNN_MODESTATUS,"",String(""),_("mode status"));
         m_proplist.push_back(p);
-
     }
-    PropertyList::iterator it = find(m_proplist.begin(),m_proplist.end(),SCIM_PROP_WNN_MODESTATUS);
+    PropertyList::iterator it;
+    it = find(m_proplist.begin(),m_proplist.end(),SCIM_PROP_WNN_INPUTMODE);
+    if (it != m_proplist.end()) {
+        it->set_label(m_preeditor->getName());
+    }
+    update_property(*it);
+    it = find(m_proplist.begin(),m_proplist.end(),SCIM_PROP_WNN_MODESTATUS);
     if (it != m_proplist.end()) {
         if (m_conversion) it->set_label(_("Kanji"));
         else it->set_label(m_preeditor->getModeName());
@@ -626,6 +653,11 @@
 
 void WnnInstance::trigger_property (const String &property)
 {
+    String s = SCIM_PROP_WNN_INPUTMODE;
+    if ((property.length() > s.length()) && (property.substr(0,s.length()) == s)) {
+        changePreEditor(property.substr(s.length() + 1));
+        updateProperty();
+    }
 }
 
 
@@ -700,3 +732,4 @@
 
 
 
+
diff --git a/scim-wnn/src/scim_wnn_imengine.h b/scim-wnn/src/scim_wnn_imengine.h
index f43ee19..47447ca 100644
--- a/scim-wnn/src/scim_wnn_imengine.h
+++ b/scim-wnn/src/scim_wnn_imengine.h
@@ -105,6 +105,7 @@
     void updatePreEditor();
     void updateProperty();
     void updateConversion();
+    void changePreEditor(const String &name);
 
 private:
     WnnKeyEventList