diff --git a/scim-wnn/po/ja.po b/scim-wnn/po/ja.po
index 7a807b4..37f92ab 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-22 12:04+0900\n"
+"POT-Creation-Date: 2004-12-25 04:18+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,39 +35,39 @@
 msgid "SCIM-WNN HELP"
 msgstr "適当にそれっぽく操作して下さい。"
 
-#: src/scim_wnn_imengine.cpp:307
+#: src/scim_wnn_imengine.cpp:306
 msgid "input mode"
 msgstr "入力モード"
 
-#: src/scim_wnn_imengine.cpp:311 src/scim_wnn_imengine.cpp:314
+#: src/scim_wnn_imengine.cpp:310 src/scim_wnn_imengine.cpp:313
 msgid "mode status"
 msgstr "状態"
 
-#: src/scim_wnn_imengine.cpp:325
+#: src/scim_wnn_imengine.cpp:324
 msgid "Kanji"
 msgstr "[漢]"
 
-#: src/scim_wnn_imengine.cpp:326
+#: src/scim_wnn_imengine.cpp:325
 msgid "Yosoku"
 msgstr "[予]"
 
-#: src/scim_wnn_imengine.cpp:790 src/scim_wnn_imengine.cpp:798
+#: src/scim_wnn_imengine.cpp:789 src/scim_wnn_imengine.cpp:797
 msgid "could not connect to jserver."
 msgstr "サーバに接続できませんでした"
 
-#: src/scim_wnn_imengine.cpp:843
+#: src/scim_wnn_imengine.cpp:842
 msgid "Ikeiji lookup result"
 msgstr "異形字変換"
 
-#: src/scim_wnn_imengine.cpp:847
+#: src/scim_wnn_imengine.cpp:846
 msgid "association lookup result"
 msgstr "連想変換"
 
-#: src/scim_wnn_imengine.cpp:851
+#: src/scim_wnn_imengine.cpp:850
 msgid "yosoku lookup result"
 msgstr "予測候補"
 
-#: src/scim_wnn_imengine.cpp:855
+#: src/scim_wnn_imengine.cpp:854
 msgid "lookup result"
 msgstr "候補一覧"
 
@@ -232,54 +232,136 @@
 msgstr "前の候補を選択するキーイベント"
 
 #: src/scim_wnn_imengine_setup.cpp:312
+msgid "candidates list keys:"
+msgstr "候補一覧キー:"
+
+#: src/scim_wnn_imengine_setup.cpp:313
+msgid "Select candidates list keys"
+msgstr "候補一覧を表示するキーの設定"
+
+#: src/scim_wnn_imengine_setup.cpp:314
+msgid "The key events to popup candidates list. "
+msgstr "候補一覧を表示するキーイベント"
+
+#: src/scim_wnn_imengine_setup.cpp:321
 msgid "Page up keys:"
 msgstr "前のページへ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:313
+#: src/scim_wnn_imengine_setup.cpp:322
 msgid "Select page up candidates keys"
 msgstr "前のページへ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:314
+#: src/scim_wnn_imengine_setup.cpp:323
 msgid "The key events to select page up candidates. "
 msgstr "前のページへ移動するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:321
+#: src/scim_wnn_imengine_setup.cpp:330
 msgid "Page down keys:"
 msgstr "次のページへ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:322
+#: src/scim_wnn_imengine_setup.cpp:331
 msgid "Select page down candidates keys"
 msgstr "次のページへ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:323
+#: src/scim_wnn_imengine_setup.cpp:332
 msgid "The key events to select page down candidates. "
 msgstr "次のページへ移動するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:340
+#: src/scim_wnn_imengine_setup.cpp:352
+msgid "Yosoku keys:"
+msgstr "予測入力キー"
+
+#: src/scim_wnn_imengine_setup.cpp:353
+msgid "Select yosoku keys"
+msgstr "予測入力キーの設定"
+
+#: src/scim_wnn_imengine_setup.cpp:354
+msgid "The key events to select from completion list. "
+msgstr "予測入力候補から選択するキーイベント"
+
+#: src/scim_wnn_imengine_setup.cpp:361
+msgid "Convert to ikeiji keys:"
+msgstr "異形字変換キー:"
+
+#: src/scim_wnn_imengine_setup.cpp:362
+msgid "Select ikeiji keys"
+msgstr "異形字変換キーの設定"
+
+#: src/scim_wnn_imengine_setup.cpp:363
+msgid "The key events to convert the selected candidate to ikei-kanji. "
+msgstr "選択された候補を異形字漢字へ変換するキーイベント"
+
+#: src/scim_wnn_imengine_setup.cpp:370
+msgid "Convert to rensou keys:"
+msgstr "連想変換キー:"
+
+#: src/scim_wnn_imengine_setup.cpp:371
+msgid "Select rensou keys"
+msgstr "連想変換キーの設定"
+
+#: src/scim_wnn_imengine_setup.cpp:372
+msgid ""
+"The key events to convert the selected candidate to the associated "
+"acceptation string.  "
+msgstr "選択された候補を連想変換するキーイベント"
+
+#: src/scim_wnn_imengine_setup.cpp:379
+msgid "Convert to HIRAGANA keys:"
+msgstr "ひらがな変換キー:"
+
+#: src/scim_wnn_imengine_setup.cpp:380
+msgid "Select convert to HIRAGANA keys"
+msgstr "ひらがな変換キーの設定"
+
+#: src/scim_wnn_imengine_setup.cpp:381
+msgid ""
+"The key events to convert the selected candidate or the preedit string to "
+"HIRAGANA. "
+msgstr "選択された候補、あるいは変換前文字列をひらがなへ変換するキーイベント"
+
+#: src/scim_wnn_imengine_setup.cpp:388
+msgid "Convert to KATAKANA keys:"
+msgstr "カタカナ変換キー:"
+
+#: src/scim_wnn_imengine_setup.cpp:389
+msgid "Select convert to KATAGANA keys"
+msgstr "カタカナ変換キーの設定"
+
+#: src/scim_wnn_imengine_setup.cpp:390
+msgid ""
+"The key events to convert the selected candidate or the preedit string to "
+"KATAKANA. "
+msgstr "選択された候補、あるいは変換前文字列をカタカナへ変換するキーイベント"
+
+#: src/scim_wnn_imengine_setup.cpp:407
 msgid "Common keys"
 msgstr "一般キー"
 
-#: src/scim_wnn_imengine_setup.cpp:341
+#: src/scim_wnn_imengine_setup.cpp:408
 msgid "Preedit keys"
 msgstr "編集キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:342
+#: src/scim_wnn_imengine_setup.cpp:409
 msgid "Candidates keys"
 msgstr "候補キー"
 
-#: src/scim_wnn_imengine_setup.cpp:382
+#: src/scim_wnn_imengine_setup.cpp:410
+msgid "Other function keys"
+msgstr "その他機能キー"
+
+#: src/scim_wnn_imengine_setup.cpp:450
 msgid "_Server: "
 msgstr "サーバ(_S):"
 
-#: src/scim_wnn_imengine_setup.cpp:398
+#: src/scim_wnn_imengine_setup.cpp:466
 msgid "_wnnenvrc: "
 msgstr "wnnenvrc(_W):"
 
-#: src/scim_wnn_imengine_setup.cpp:413 src/scim_wnn_imengine_setup.cpp:466
+#: src/scim_wnn_imengine_setup.cpp:481 src/scim_wnn_imengine_setup.cpp:534
 msgid "..."
 msgstr "..."
 
-#: src/scim_wnn_imengine_setup.cpp:506
+#: src/scim_wnn_imengine_setup.cpp:574
 msgid "Options"
 msgstr "オプション"
 
@@ -295,7 +377,7 @@
 msgid "Wide Ascii"
 msgstr "[ａ]"
 
-#: src/romkan.cpp:343
+#: src/romkan.cpp:354
 msgid "Roma"
 msgstr "ローマ字"
 
diff --git a/scim-wnn/po/scim-wnn.pot b/scim-wnn/po/scim-wnn.pot
index 506dc92..230bccf 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-22 12:04+0900\n"
+"POT-Creation-Date: 2004-12-25 04:18+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,39 +32,39 @@
 msgid "SCIM-WNN HELP"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:307
+#: src/scim_wnn_imengine.cpp:306
 msgid "input mode"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:311 src/scim_wnn_imengine.cpp:314
+#: src/scim_wnn_imengine.cpp:310 src/scim_wnn_imengine.cpp:313
 msgid "mode status"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:325
+#: src/scim_wnn_imengine.cpp:324
 msgid "Kanji"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:326
+#: src/scim_wnn_imengine.cpp:325
 msgid "Yosoku"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:790 src/scim_wnn_imengine.cpp:798
+#: src/scim_wnn_imengine.cpp:789 src/scim_wnn_imengine.cpp:797
 msgid "could not connect to jserver."
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:843
+#: src/scim_wnn_imengine.cpp:842
 msgid "Ikeiji lookup result"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:847
+#: src/scim_wnn_imengine.cpp:846
 msgid "association lookup result"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:851
+#: src/scim_wnn_imengine.cpp:850
 msgid "yosoku lookup result"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:855
+#: src/scim_wnn_imengine.cpp:854
 msgid "lookup result"
 msgstr ""
 
@@ -229,54 +229,136 @@
 msgstr ""
 
 #: src/scim_wnn_imengine_setup.cpp:312
-msgid "Page up keys:"
+msgid "candidates list keys:"
 msgstr ""
 
 #: src/scim_wnn_imengine_setup.cpp:313
-msgid "Select page up candidates keys"
+msgid "Select candidates list keys"
 msgstr ""
 
 #: src/scim_wnn_imengine_setup.cpp:314
-msgid "The key events to select page up candidates. "
+msgid "The key events to popup candidates list. "
 msgstr ""
 
 #: src/scim_wnn_imengine_setup.cpp:321
-msgid "Page down keys:"
+msgid "Page up keys:"
 msgstr ""
 
 #: src/scim_wnn_imengine_setup.cpp:322
-msgid "Select page down candidates keys"
+msgid "Select page up candidates keys"
 msgstr ""
 
 #: src/scim_wnn_imengine_setup.cpp:323
+msgid "The key events to select page up candidates. "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:330
+msgid "Page down keys:"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:331
+msgid "Select page down candidates keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:332
 msgid "The key events to select page down candidates. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:340
+#: src/scim_wnn_imengine_setup.cpp:352
+msgid "Yosoku keys:"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:353
+msgid "Select yosoku keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:354
+msgid "The key events to select from completion list. "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:361
+msgid "Convert to ikeiji keys:"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:362
+msgid "Select ikeiji keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:363
+msgid "The key events to convert the selected candidate to ikei-kanji. "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:370
+msgid "Convert to rensou keys:"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:371
+msgid "Select rensou keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:372
+msgid ""
+"The key events to convert the selected candidate to the associated "
+"acceptation string.  "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:379
+msgid "Convert to HIRAGANA keys:"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:380
+msgid "Select convert to HIRAGANA keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:381
+msgid ""
+"The key events to convert the selected candidate or the preedit string to "
+"HIRAGANA. "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:388
+msgid "Convert to KATAKANA keys:"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:389
+msgid "Select convert to KATAGANA keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:390
+msgid ""
+"The key events to convert the selected candidate or the preedit string to "
+"KATAKANA. "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:407
 msgid "Common keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:341
+#: src/scim_wnn_imengine_setup.cpp:408
 msgid "Preedit keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:342
+#: src/scim_wnn_imengine_setup.cpp:409
 msgid "Candidates keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:382
+#: src/scim_wnn_imengine_setup.cpp:410
+msgid "Other function keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:450
 msgid "_Server: "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:398
+#: src/scim_wnn_imengine_setup.cpp:466
 msgid "_wnnenvrc: "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:413 src/scim_wnn_imengine_setup.cpp:466
+#: src/scim_wnn_imengine_setup.cpp:481 src/scim_wnn_imengine_setup.cpp:534
 msgid "..."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:506
+#: src/scim_wnn_imengine_setup.cpp:574
 msgid "Options"
 msgstr ""
 
@@ -292,7 +374,7 @@
 msgid "Wide Ascii"
 msgstr ""
 
-#: src/romkan.cpp:343
+#: src/romkan.cpp:354
 msgid "Roma"
 msgstr ""
 
diff --git a/scim-wnn/src/scim_wnn_def.h b/scim-wnn/src/scim_wnn_def.h
index ce090b1..f143c69 100644
--- a/scim-wnn/src/scim_wnn_def.h
+++ b/scim-wnn/src/scim_wnn_def.h
@@ -75,6 +75,13 @@
 #define SCIM_CONFIG_WNN_MINISTATUS                  "/IMEngine/Wnn/MiniStatus"
 #define SCIM_DEFAULT_WNN_MINISTATUS                 false
 
+#define SCIM_CONFIG_WNN_YOSOKU                      "/IMEngine/Wnn/Yosoku"
+#ifdef HAVE_LIBWNN7
+  #define SCIM_DEFAULT_WNN_YOSOKU                     true
+#else
+  #define SCIM_DEFAULT_WNN_YOSOKU                     false
+#endif
+
 #define SCIM_PROP_WNN_MODESTATUS                    "/IMEngine/Wnn/Property/ModeStatus"
 #define SCIM_PROP_WNN_INPUTMODE                     "/IMEngine/Wnn/InputMode"
 
diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp
index 4291367..a90f34d 100644
--- a/scim-wnn/src/scim_wnn_imengine.cpp
+++ b/scim-wnn/src/scim_wnn_imengine.cpp
@@ -206,8 +206,7 @@
     rc = _scim_config->read(String(SCIM_CONFIG_WNN_RC),String(SCIM_DEFAULT_WNN_RC));
     alp = _scim_config->read(String(SCIM_CONFIG_WNN_ALP),SCIM_DEFAULT_WNN_ALP);
     mini_status = _scim_config->read(String(SCIM_CONFIG_WNN_MINISTATUS),SCIM_DEFAULT_WNN_MINISTATUS);
-    // @todo ���꤫���ɽФ���
-    yosoku = true;
+    yosoku = _scim_config->read(String(SCIM_CONFIG_WNN_YOSOKU),SCIM_DEFAULT_WNN_YOSOKU);
 
     // �ǥե���ȥ������ꡣ
     scim_string_to_key_list(k_conversion_start,
diff --git a/scim-wnn/src/scim_wnn_imengine_setup.cpp b/scim-wnn/src/scim_wnn_imengine_setup.cpp
index fd416c0..cf8b068 100644
--- a/scim-wnn/src/scim_wnn_imengine_setup.cpp
+++ b/scim-wnn/src/scim_wnn_imengine_setup.cpp
@@ -307,6 +307,15 @@
         NULL,
     },
     {
+        SCIM_CONFIG_WNN_KEY_LOOKUPPOPUP,
+        SCIM_DEFAULT_WNN_KEY_LOOKUPPOPUP,
+        N_("candidates list keys:"),
+        N_("Select candidates list keys"),
+        N_("The key events to popup candidates list. "),
+        NULL,
+        NULL,
+    },
+    {
         SCIM_CONFIG_WNN_KEY_LOOKUPPAGEUP,
         SCIM_DEFAULT_WNN_KEY_LOOKUPPAGEUP,
         N_("Page up keys:"),
@@ -335,11 +344,70 @@
     },
 };
 
+static KeyboardConfigData __config_keyboards_other [] =
+{
+    {
+        SCIM_CONFIG_WNN_KEY_SELECT_YOSOKU,
+        SCIM_DEFAULT_WNN_KEY_SELECT_YOSOKU,
+        N_("Yosoku keys:"),
+        N_("Select yosoku keys"),
+        N_("The key events to select from completion list. "),
+        NULL,
+        NULL,
+    },
+    {
+        SCIM_CONFIG_WNN_KEY_CONVERSION_IKEIJI,
+        SCIM_DEFAULT_WNN_KEY_CONVERSION_IKEIJI,
+        N_("Convert to ikeiji keys:"),
+        N_("Select ikeiji keys"),
+        N_("The key events to convert the selected candidate to ikei-kanji. "),
+        NULL,
+        NULL,
+    },
+    {
+        SCIM_CONFIG_WNN_KEY_CONVERSION_RENSOU,
+        SCIM_DEFAULT_WNN_KEY_CONVERSION_RENSOU,
+        N_("Convert to rensou keys:"),
+        N_("Select rensou keys"),
+        N_("The key events to convert the selected candidate to the associated acceptation string.  "),
+        NULL,
+        NULL,
+    },
+    {
+        SCIM_CONFIG_WNN_KEY_CONVERT_HIRAGANA,
+        SCIM_DEFAULT_WNN_KEY_CONVERT_HIRAGANA,
+        N_("Convert to HIRAGANA keys:"),
+        N_("Select convert to HIRAGANA keys"),
+        N_("The key events to convert the selected candidate or the preedit string to HIRAGANA. "),
+        NULL,
+        NULL,
+    },
+    {
+        SCIM_CONFIG_WNN_KEY_CONVERT_KATAKANA,
+        SCIM_DEFAULT_WNN_KEY_CONVERT_KATAKANA,
+        N_("Convert to KATAKANA keys:"),
+        N_("Select convert to KATAGANA keys"),
+        N_("The key events to convert the selected candidate or the preedit string to KATAKANA. "),
+        NULL,
+        NULL,
+    },
+    {
+        NULL,
+        "",
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+    },
+};
+
 static struct KeyboardConfigPage __key_conf_pages[] =
 {
     {N_("Common keys"),     __config_keyboards_common},
     {N_("Preedit keys"),    __config_keyboards_caret},
     {N_("Candidates keys"), __config_keyboards_candidates},
+    {N_("Other function keys"), __config_keyboards_other},
 };
 static unsigned int __key_conf_pages_num = sizeof (__key_conf_pages) / sizeof (KeyboardConfigPage);