diff --git a/scim-wnn/po/ja.po b/scim-wnn/po/ja.po
index 4b2cd65..1193749 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: 2005-01-03 10:03+0900\n"
+"POT-Creation-Date: 2005-01-11 14:22+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:314
+#: src/scim_wnn_imengine.cpp:317
 msgid "input mode"
 msgstr "入力モード"
 
-#: src/scim_wnn_imengine.cpp:318 src/scim_wnn_imengine.cpp:321
+#: src/scim_wnn_imengine.cpp:321 src/scim_wnn_imengine.cpp:324
 msgid "mode status"
 msgstr "状態"
 
-#: src/scim_wnn_imengine.cpp:332
+#: src/scim_wnn_imengine.cpp:335
 msgid "Kanji"
 msgstr "[漢]"
 
-#: src/scim_wnn_imengine.cpp:333
+#: src/scim_wnn_imengine.cpp:336
 msgid "Yosoku"
 msgstr "[予]"
 
-#: src/scim_wnn_imengine.cpp:833 src/scim_wnn_imengine.cpp:841
+#: src/scim_wnn_imengine.cpp:836 src/scim_wnn_imengine.cpp:844
 msgid "could not connect to jserver."
 msgstr "サーバに接続できませんでした"
 
-#: src/scim_wnn_imengine.cpp:887
+#: src/scim_wnn_imengine.cpp:890
 msgid "Ikeiji lookup result"
 msgstr "異形字変換"
 
-#: src/scim_wnn_imengine.cpp:891
+#: src/scim_wnn_imengine.cpp:894
 msgid "association lookup result"
 msgstr "連想変換"
 
-#: src/scim_wnn_imengine.cpp:895
+#: src/scim_wnn_imengine.cpp:898
 msgid "yosoku lookup result"
 msgstr "予測候補"
 
-#: src/scim_wnn_imengine.cpp:899
+#: src/scim_wnn_imengine.cpp:902
 msgid "lookup result"
 msgstr "候補一覧"
 
@@ -75,335 +75,363 @@
 msgid "A Wnn IMEngine Module."
 msgstr "Wnn IMエンジンモジュール"
 
-#: src/scim_wnn_imengine_setup.cpp:164
+#: src/scim_wnn_imengine_setup.cpp:173
+msgid "Wnn4 or FreeWnn"
+msgstr "Wnn4又はFreeWnn"
+
+#: src/scim_wnn_imengine_setup.cpp:178
+msgid "Wnn6"
+msgstr "Wnn6"
+
+#: src/scim_wnn_imengine_setup.cpp:183
+msgid "Wnn7"
+msgstr "Wnn7"
+
+#: src/scim_wnn_imengine_setup.cpp:188
+msgid "Roma-Kana input"
+msgstr "ローマ字入力"
+
+#: src/scim_wnn_imengine_setup.cpp:193
+msgid "Kana input"
+msgstr "かな入力"
+
+#: src/scim_wnn_imengine_setup.cpp:207
 msgid "Commit keys:"
 msgstr "確定キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:165
+#: src/scim_wnn_imengine_setup.cpp:208
 msgid "Select commit keys"
 msgstr "確定キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:166
+#: src/scim_wnn_imengine_setup.cpp:209
 msgid "The key events to commit the preedit string. "
 msgstr "文字列を確定するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:173
+#: src/scim_wnn_imengine_setup.cpp:216
 msgid "Convert keys:"
 msgstr "変換キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:174
+#: src/scim_wnn_imengine_setup.cpp:217
 msgid "Select convert keys"
 msgstr "変換キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:175
+#: src/scim_wnn_imengine_setup.cpp:218
 msgid "The key events to convert the preedit string to kanji. "
 msgstr "文字列を漢字へ変換するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:182
+#: src/scim_wnn_imengine_setup.cpp:225
 msgid "Cancel keys:"
 msgstr "キャンセルキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:183
+#: src/scim_wnn_imengine_setup.cpp:226
 msgid "Select cancel keys"
 msgstr "キャンセルキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:184
+#: src/scim_wnn_imengine_setup.cpp:227
 msgid "The key events to cancel preediting or converting. "
 msgstr "文字入力や文字変換をキャンセルするキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:191
+#: src/scim_wnn_imengine_setup.cpp:234
 msgid "Backspace keys:"
 msgstr "バックスペースキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:192
+#: src/scim_wnn_imengine_setup.cpp:235
 msgid "Select backspace keys"
 msgstr "バックスペースキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:193
+#: src/scim_wnn_imengine_setup.cpp:236
 msgid "The key events to delete a character before caret. "
 msgstr "キャレットの前の文字を一文字削除するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:200
+#: src/scim_wnn_imengine_setup.cpp:243
 msgid "Delete keys:"
 msgstr "削除キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:201
+#: src/scim_wnn_imengine_setup.cpp:244
 msgid "Select delete keys"
 msgstr "削除キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:202
+#: src/scim_wnn_imengine_setup.cpp:245
 msgid "The key events to delete a character after caret. "
 msgstr "キャレットの後の文字を一文字削除するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:222
+#: src/scim_wnn_imengine_setup.cpp:265
 msgid "Move forward keys:"
 msgstr "前方へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:223
+#: src/scim_wnn_imengine_setup.cpp:266
 msgid "Select move caret forward keys"
 msgstr "キャレットを前方へ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:224
+#: src/scim_wnn_imengine_setup.cpp:267
 msgid "The key events to move the caret to forward. "
 msgstr "キャレットを前方へ移動するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:231
+#: src/scim_wnn_imengine_setup.cpp:274
 msgid "Move backward keys:"
 msgstr "後方へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:232
+#: src/scim_wnn_imengine_setup.cpp:275
 msgid "Select move caret backward keys"
 msgstr "キャレットを後方へ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:233
+#: src/scim_wnn_imengine_setup.cpp:276
 msgid "The key events to move the caret to backward. "
 msgstr "キャレットを後方へ移動するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:253
+#: src/scim_wnn_imengine_setup.cpp:296
 msgid "Next segment keys:"
 msgstr "次の文節へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:254
+#: src/scim_wnn_imengine_setup.cpp:297
 msgid "Select next segment keys"
 msgstr "次の文節へ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:255
+#: src/scim_wnn_imengine_setup.cpp:298
 msgid "The key events to select next segment. "
 msgstr "次の文節を選択するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:262
+#: src/scim_wnn_imengine_setup.cpp:305
 msgid "Previous segment keys:"
 msgstr "前の文節へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:263
+#: src/scim_wnn_imengine_setup.cpp:306
 msgid "Select previous segment keys"
 msgstr "前の文節へ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:264
+#: src/scim_wnn_imengine_setup.cpp:307
 msgid "The key events to select previous segment. "
 msgstr "前の文節を選択するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:271
+#: src/scim_wnn_imengine_setup.cpp:314
 msgid "Shrink segment keys:"
 msgstr "文節を縮めるキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:272
+#: src/scim_wnn_imengine_setup.cpp:315
 msgid "Select shrink segment keys"
 msgstr "文節を縮めるキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:273
+#: src/scim_wnn_imengine_setup.cpp:316
 msgid "The key events to shrink the selected segment. "
 msgstr "選択文節を縮めるキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:280
+#: src/scim_wnn_imengine_setup.cpp:323
 msgid "Expand segment keys:"
 msgstr "文節を拡げるキー"
 
-#: src/scim_wnn_imengine_setup.cpp:281
+#: src/scim_wnn_imengine_setup.cpp:324
 msgid "Select expand segment keys"
 msgstr "文節を拡げるキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:282
+#: src/scim_wnn_imengine_setup.cpp:325
 msgid "The key events to expand the selected segment. "
 msgstr "選択文節を拡げるキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:302
+#: src/scim_wnn_imengine_setup.cpp:345
 msgid "Next keys:"
 msgstr "次へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:303
+#: src/scim_wnn_imengine_setup.cpp:346
 msgid "Select next candidate keys"
 msgstr "次の候補を選択するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:304
+#: src/scim_wnn_imengine_setup.cpp:347
 msgid "The key events to select next candidate. "
 msgstr "次の候補を選択するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:311
+#: src/scim_wnn_imengine_setup.cpp:354
 msgid "Previous keys:"
 msgstr "前へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:312
+#: src/scim_wnn_imengine_setup.cpp:355
 msgid "Select previous candidate keys"
 msgstr "前の候補を選択するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:313
+#: src/scim_wnn_imengine_setup.cpp:356
 msgid "The key events to select previous candidate. "
 msgstr "前の候補を選択するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:320
+#: src/scim_wnn_imengine_setup.cpp:363
 msgid "candidates list keys:"
 msgstr "候補一覧キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:321
+#: src/scim_wnn_imengine_setup.cpp:364
 msgid "Select candidates list keys"
 msgstr "候補一覧を表示するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:322
+#: src/scim_wnn_imengine_setup.cpp:365
 msgid "The key events to popup candidates list. "
 msgstr "候補一覧を表示するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:329
+#: src/scim_wnn_imengine_setup.cpp:372
 msgid "Page up keys:"
 msgstr "前のページへ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:330
+#: src/scim_wnn_imengine_setup.cpp:373
 msgid "Select page up candidates keys"
 msgstr "前のページへ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:331
+#: src/scim_wnn_imengine_setup.cpp:374
 msgid "The key events to select page up candidates. "
 msgstr "前のページへ移動するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:338
+#: src/scim_wnn_imengine_setup.cpp:381
 msgid "Page down keys:"
 msgstr "次のページへ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:339
+#: src/scim_wnn_imengine_setup.cpp:382
 msgid "Select page down candidates keys"
 msgstr "次のページへ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:340
+#: src/scim_wnn_imengine_setup.cpp:383
 msgid "The key events to select page down candidates. "
 msgstr "次のページへ移動するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:360
+#: src/scim_wnn_imengine_setup.cpp:403
 msgid "Yosoku keys:"
-msgstr "予測入力キー"
+msgstr "予測入力キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:361
+#: src/scim_wnn_imengine_setup.cpp:404
 msgid "Select yosoku keys"
 msgstr "予測入力キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:362
+#: src/scim_wnn_imengine_setup.cpp:405
 msgid "The key events to select from completion list. "
 msgstr "予測入力候補から選択するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:369
+#: src/scim_wnn_imengine_setup.cpp:412
 msgid "Convert to ikeiji keys:"
 msgstr "異形字変換キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:370
+#: src/scim_wnn_imengine_setup.cpp:413
 msgid "Select ikeiji keys"
 msgstr "異形字変換キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:371
+#: src/scim_wnn_imengine_setup.cpp:414
 msgid "The key events to convert the selected candidate to ikei-kanji. "
 msgstr "選択された候補を異形字漢字へ変換するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:378
+#: src/scim_wnn_imengine_setup.cpp:421
 msgid "Convert to rensou keys:"
 msgstr "連想変換キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:379
+#: src/scim_wnn_imengine_setup.cpp:422
 msgid "Select rensou keys"
 msgstr "連想変換キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:380
+#: src/scim_wnn_imengine_setup.cpp:423
 msgid ""
 "The key events to convert the selected candidate to the associated "
 "acceptation string.  "
 msgstr "選択された候補を連想変換するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:387
+#: src/scim_wnn_imengine_setup.cpp:430
 msgid "Convert to HIRAGANA keys:"
 msgstr "ひらがな変換キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:388
+#: src/scim_wnn_imengine_setup.cpp:431
 msgid "Select convert to HIRAGANA keys"
 msgstr "ひらがな変換キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:389
+#: src/scim_wnn_imengine_setup.cpp:432
 msgid ""
 "The key events to convert the selected candidate or the preedit string to "
 "HIRAGANA. "
 msgstr "選択された候補、あるいは変換前文字列をひらがなへ変換するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:396
+#: src/scim_wnn_imengine_setup.cpp:439
 msgid "Convert to KATAKANA keys:"
 msgstr "カタカナ変換キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:397
+#: src/scim_wnn_imengine_setup.cpp:440
 msgid "Select convert to KATAGANA keys"
 msgstr "カタカナ変換キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:398
+#: src/scim_wnn_imengine_setup.cpp:441
 msgid ""
 "The key events to convert the selected candidate or the preedit string to "
 "KATAKANA. "
 msgstr "選択された候補、あるいは変換前文字列をカタカナへ変換するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:415
+#: src/scim_wnn_imengine_setup.cpp:458
 msgid "Common keys"
 msgstr "一般キー"
 
-#: src/scim_wnn_imengine_setup.cpp:416
+#: src/scim_wnn_imengine_setup.cpp:459
 msgid "Preedit keys"
-msgstr "編集キー:"
+msgstr "編集キー"
 
-#: src/scim_wnn_imengine_setup.cpp:417
+#: src/scim_wnn_imengine_setup.cpp:460
 msgid "Candidates keys"
 msgstr "候補キー"
 
-#: src/scim_wnn_imengine_setup.cpp:418
+#: src/scim_wnn_imengine_setup.cpp:461
 msgid "Other function keys"
 msgstr "その他機能キー"
 
-#: src/scim_wnn_imengine_setup.cpp:458
+#: src/scim_wnn_imengine_setup.cpp:511
 msgid "_Server: "
 msgstr "サーバ(_S):"
 
-#: src/scim_wnn_imengine_setup.cpp:475
+#: src/scim_wnn_imengine_setup.cpp:528
 msgid "input the server name to connect."
 msgstr "接続するサーバ名を指定します。"
 
-#: src/scim_wnn_imengine_setup.cpp:479
+#: src/scim_wnn_imengine_setup.cpp:532
 msgid "_wnnenvrc: "
 msgstr "wnnenvrc(_W):"
 
-#: src/scim_wnn_imengine_setup.cpp:494 src/scim_wnn_imengine_setup.cpp:638
+#: src/scim_wnn_imengine_setup.cpp:547 src/scim_wnn_imengine_setup.cpp:720
 msgid "..."
 msgstr "..."
 
-#: src/scim_wnn_imengine_setup.cpp:501
+#: src/scim_wnn_imengine_setup.cpp:554
 msgid "input the path of wnnenvrc."
 msgstr "wnnenvrcファイルを指定します"
 
-#: src/scim_wnn_imengine_setup.cpp:504
+#: src/scim_wnn_imengine_setup.cpp:557
 msgid "Server_type: "
 msgstr "サーバタイプ(_T):"
 
-#: src/scim_wnn_imengine_setup.cpp:519
+#: src/scim_wnn_imengine_setup.cpp:576
 msgid "select the server type from Wnn4 / Wnn6 / Wnn7."
 msgstr "サーバの種類を Wnn4 / Wnn6 / Wnn7 から選択します。"
 
-#: src/scim_wnn_imengine_setup.cpp:523
-msgid "_Auto candidates popup: "
-msgstr "自動候補ポップアップ"
+#: src/scim_wnn_imengine_setup.cpp:579
+msgid "Default_PreEditor: "
+msgstr "標準の読み入力方式(_P):"
 
-#: src/scim_wnn_imengine_setup.cpp:540
+#: src/scim_wnn_imengine_setup.cpp:598
+msgid "select the default preeditor."
+msgstr "標準のよみ入力方式を選びます。"
+
+#: src/scim_wnn_imengine_setup.cpp:602
+msgid "_Auto candidates popup: "
+msgstr "自動候補ポップアップ(_A):"
+
+#: src/scim_wnn_imengine_setup.cpp:619
 msgid ""
 "set the count of conversion until displaying the list of lookup result "
 "automatically."
 msgstr "何回変換動作をすれば自動的に候補一覧を表示するかを指定します。"
 
-#: src/scim_wnn_imengine_setup.cpp:543
+#: src/scim_wnn_imengine_setup.cpp:622
 msgid "_NumKey selection: "
 msgstr "数字キーによる選択(_N):"
 
-#: src/scim_wnn_imengine_setup.cpp:558
+#: src/scim_wnn_imengine_setup.cpp:637
 msgid "If you use the candidate selection by numkey, check this."
 msgstr "候補から数字キーを使って選択できるようにするにはここをチェックします。"
 
-#: src/scim_wnn_imengine_setup.cpp:562
+#: src/scim_wnn_imengine_setup.cpp:641
 msgid "_YOSOKU-input: "
 msgstr "予測入力(_Y):"
 
-#: src/scim_wnn_imengine_setup.cpp:577
+#: src/scim_wnn_imengine_setup.cpp:656
 msgid "if you use YOSOKU-input , check this."
 msgstr "予測入力を利用する場合はここをチェックします"
 
-#: src/scim_wnn_imengine_setup.cpp:678
+#: src/scim_wnn_imengine_setup.cpp:760
 msgid "Options"
 msgstr "オプション"
 
diff --git a/scim-wnn/po/scim-wnn.pot b/scim-wnn/po/scim-wnn.pot
index c247e2f..24ad386 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: 2005-01-03 10:03+0900\n"
+"POT-Creation-Date: 2005-01-11 14:22+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:314
+#: src/scim_wnn_imengine.cpp:317
 msgid "input mode"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:318 src/scim_wnn_imengine.cpp:321
+#: src/scim_wnn_imengine.cpp:321 src/scim_wnn_imengine.cpp:324
 msgid "mode status"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:332
+#: src/scim_wnn_imengine.cpp:335
 msgid "Kanji"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:333
+#: src/scim_wnn_imengine.cpp:336
 msgid "Yosoku"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:833 src/scim_wnn_imengine.cpp:841
+#: src/scim_wnn_imengine.cpp:836 src/scim_wnn_imengine.cpp:844
 msgid "could not connect to jserver."
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:887
+#: src/scim_wnn_imengine.cpp:890
 msgid "Ikeiji lookup result"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:891
+#: src/scim_wnn_imengine.cpp:894
 msgid "association lookup result"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:895
+#: src/scim_wnn_imengine.cpp:898
 msgid "yosoku lookup result"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:899
+#: src/scim_wnn_imengine.cpp:902
 msgid "lookup result"
 msgstr ""
 
@@ -72,335 +72,363 @@
 msgid "A Wnn IMEngine Module."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:164
-msgid "Commit keys:"
-msgstr ""
-
-#: src/scim_wnn_imengine_setup.cpp:165
-msgid "Select commit keys"
-msgstr ""
-
-#: src/scim_wnn_imengine_setup.cpp:166
-msgid "The key events to commit the preedit string. "
-msgstr ""
-
 #: src/scim_wnn_imengine_setup.cpp:173
-msgid "Convert keys:"
+msgid "Wnn4 or FreeWnn"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:174
-msgid "Select convert keys"
-msgstr ""
-
-#: src/scim_wnn_imengine_setup.cpp:175
-msgid "The key events to convert the preedit string to kanji. "
-msgstr ""
-
-#: src/scim_wnn_imengine_setup.cpp:182
-msgid "Cancel keys:"
+#: src/scim_wnn_imengine_setup.cpp:178
+msgid "Wnn6"
 msgstr ""
 
 #: src/scim_wnn_imengine_setup.cpp:183
-msgid "Select cancel keys"
+msgid "Wnn7"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:184
-msgid "The key events to cancel preediting or converting. "
-msgstr ""
-
-#: src/scim_wnn_imengine_setup.cpp:191
-msgid "Backspace keys:"
-msgstr ""
-
-#: src/scim_wnn_imengine_setup.cpp:192
-msgid "Select backspace keys"
+#: src/scim_wnn_imengine_setup.cpp:188
+msgid "Roma-Kana input"
 msgstr ""
 
 #: src/scim_wnn_imengine_setup.cpp:193
+msgid "Kana input"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:207
+msgid "Commit keys:"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:208
+msgid "Select commit keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:209
+msgid "The key events to commit the preedit string. "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:216
+msgid "Convert keys:"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:217
+msgid "Select convert keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:218
+msgid "The key events to convert the preedit string to kanji. "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:225
+msgid "Cancel keys:"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:226
+msgid "Select cancel keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:227
+msgid "The key events to cancel preediting or converting. "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:234
+msgid "Backspace keys:"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:235
+msgid "Select backspace keys"
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:236
 msgid "The key events to delete a character before caret. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:200
+#: src/scim_wnn_imengine_setup.cpp:243
 msgid "Delete keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:201
+#: src/scim_wnn_imengine_setup.cpp:244
 msgid "Select delete keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:202
+#: src/scim_wnn_imengine_setup.cpp:245
 msgid "The key events to delete a character after caret. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:222
+#: src/scim_wnn_imengine_setup.cpp:265
 msgid "Move forward keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:223
+#: src/scim_wnn_imengine_setup.cpp:266
 msgid "Select move caret forward keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:224
+#: src/scim_wnn_imengine_setup.cpp:267
 msgid "The key events to move the caret to forward. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:231
+#: src/scim_wnn_imengine_setup.cpp:274
 msgid "Move backward keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:232
+#: src/scim_wnn_imengine_setup.cpp:275
 msgid "Select move caret backward keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:233
+#: src/scim_wnn_imengine_setup.cpp:276
 msgid "The key events to move the caret to backward. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:253
+#: src/scim_wnn_imengine_setup.cpp:296
 msgid "Next segment keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:254
+#: src/scim_wnn_imengine_setup.cpp:297
 msgid "Select next segment keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:255
+#: src/scim_wnn_imengine_setup.cpp:298
 msgid "The key events to select next segment. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:262
+#: src/scim_wnn_imengine_setup.cpp:305
 msgid "Previous segment keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:263
+#: src/scim_wnn_imengine_setup.cpp:306
 msgid "Select previous segment keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:264
+#: src/scim_wnn_imengine_setup.cpp:307
 msgid "The key events to select previous segment. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:271
+#: src/scim_wnn_imengine_setup.cpp:314
 msgid "Shrink segment keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:272
+#: src/scim_wnn_imengine_setup.cpp:315
 msgid "Select shrink segment keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:273
+#: src/scim_wnn_imengine_setup.cpp:316
 msgid "The key events to shrink the selected segment. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:280
+#: src/scim_wnn_imengine_setup.cpp:323
 msgid "Expand segment keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:281
+#: src/scim_wnn_imengine_setup.cpp:324
 msgid "Select expand segment keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:282
+#: src/scim_wnn_imengine_setup.cpp:325
 msgid "The key events to expand the selected segment. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:302
+#: src/scim_wnn_imengine_setup.cpp:345
 msgid "Next keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:303
+#: src/scim_wnn_imengine_setup.cpp:346
 msgid "Select next candidate keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:304
+#: src/scim_wnn_imengine_setup.cpp:347
 msgid "The key events to select next candidate. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:311
+#: src/scim_wnn_imengine_setup.cpp:354
 msgid "Previous keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:312
+#: src/scim_wnn_imengine_setup.cpp:355
 msgid "Select previous candidate keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:313
+#: src/scim_wnn_imengine_setup.cpp:356
 msgid "The key events to select previous candidate. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:320
+#: src/scim_wnn_imengine_setup.cpp:363
 msgid "candidates list keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:321
+#: src/scim_wnn_imengine_setup.cpp:364
 msgid "Select candidates list keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:322
+#: src/scim_wnn_imengine_setup.cpp:365
 msgid "The key events to popup candidates list. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:329
+#: src/scim_wnn_imengine_setup.cpp:372
 msgid "Page up keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:330
+#: src/scim_wnn_imengine_setup.cpp:373
 msgid "Select page up candidates keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:331
+#: src/scim_wnn_imengine_setup.cpp:374
 msgid "The key events to select page up candidates. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:338
+#: src/scim_wnn_imengine_setup.cpp:381
 msgid "Page down keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:339
+#: src/scim_wnn_imengine_setup.cpp:382
 msgid "Select page down candidates keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:340
+#: src/scim_wnn_imengine_setup.cpp:383
 msgid "The key events to select page down candidates. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:360
+#: src/scim_wnn_imengine_setup.cpp:403
 msgid "Yosoku keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:361
+#: src/scim_wnn_imengine_setup.cpp:404
 msgid "Select yosoku keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:362
+#: src/scim_wnn_imengine_setup.cpp:405
 msgid "The key events to select from completion list. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:369
+#: src/scim_wnn_imengine_setup.cpp:412
 msgid "Convert to ikeiji keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:370
+#: src/scim_wnn_imengine_setup.cpp:413
 msgid "Select ikeiji keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:371
+#: src/scim_wnn_imengine_setup.cpp:414
 msgid "The key events to convert the selected candidate to ikei-kanji. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:378
+#: src/scim_wnn_imengine_setup.cpp:421
 msgid "Convert to rensou keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:379
+#: src/scim_wnn_imengine_setup.cpp:422
 msgid "Select rensou keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:380
+#: src/scim_wnn_imengine_setup.cpp:423
 msgid ""
 "The key events to convert the selected candidate to the associated "
 "acceptation string.  "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:387
+#: src/scim_wnn_imengine_setup.cpp:430
 msgid "Convert to HIRAGANA keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:388
+#: src/scim_wnn_imengine_setup.cpp:431
 msgid "Select convert to HIRAGANA keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:389
+#: src/scim_wnn_imengine_setup.cpp:432
 msgid ""
 "The key events to convert the selected candidate or the preedit string to "
 "HIRAGANA. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:396
+#: src/scim_wnn_imengine_setup.cpp:439
 msgid "Convert to KATAKANA keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:397
+#: src/scim_wnn_imengine_setup.cpp:440
 msgid "Select convert to KATAGANA keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:398
+#: src/scim_wnn_imengine_setup.cpp:441
 msgid ""
 "The key events to convert the selected candidate or the preedit string to "
 "KATAKANA. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:415
+#: src/scim_wnn_imengine_setup.cpp:458
 msgid "Common keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:416
+#: src/scim_wnn_imengine_setup.cpp:459
 msgid "Preedit keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:417
+#: src/scim_wnn_imengine_setup.cpp:460
 msgid "Candidates keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:418
+#: src/scim_wnn_imengine_setup.cpp:461
 msgid "Other function keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:458
+#: src/scim_wnn_imengine_setup.cpp:511
 msgid "_Server: "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:475
+#: src/scim_wnn_imengine_setup.cpp:528
 msgid "input the server name to connect."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:479
+#: src/scim_wnn_imengine_setup.cpp:532
 msgid "_wnnenvrc: "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:494 src/scim_wnn_imengine_setup.cpp:638
+#: src/scim_wnn_imengine_setup.cpp:547 src/scim_wnn_imengine_setup.cpp:720
 msgid "..."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:501
+#: src/scim_wnn_imengine_setup.cpp:554
 msgid "input the path of wnnenvrc."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:504
+#: src/scim_wnn_imengine_setup.cpp:557
 msgid "Server_type: "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:519
+#: src/scim_wnn_imengine_setup.cpp:576
 msgid "select the server type from Wnn4 / Wnn6 / Wnn7."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:523
+#: src/scim_wnn_imengine_setup.cpp:579
+msgid "Default_PreEditor: "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:598
+msgid "select the default preeditor."
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:602
 msgid "_Auto candidates popup: "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:540
+#: src/scim_wnn_imengine_setup.cpp:619
 msgid ""
 "set the count of conversion until displaying the list of lookup result "
 "automatically."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:543
+#: src/scim_wnn_imengine_setup.cpp:622
 msgid "_NumKey selection: "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:558
+#: src/scim_wnn_imengine_setup.cpp:637
 msgid "If you use the candidate selection by numkey, check this."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:562
+#: src/scim_wnn_imengine_setup.cpp:641
 msgid "_YOSOKU-input: "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:577
+#: src/scim_wnn_imengine_setup.cpp:656
 msgid "if you use YOSOKU-input , check this."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:678
+#: src/scim_wnn_imengine_setup.cpp:760
 msgid "Options"
 msgstr ""
 
diff --git a/scim-wnn/src/scim_wnn_def.h b/scim-wnn/src/scim_wnn_def.h
index 7baaca2..cca925f 100644
--- a/scim-wnn/src/scim_wnn_def.h
+++ b/scim-wnn/src/scim_wnn_def.h
@@ -73,6 +73,8 @@
 #define SCIM_DEFAULT_WNN_RC                         "/usr/lib/wnn7/ja_JP/wnnenvrc"
 #define SCIM_CONFIG_WNN_NUMKEY_SELECT               "/IMEngine/Wnn/NumkeySelection"
 #define SCIM_DEFAULT_WNN_NUMKEY_SELECT              true
+#define SCIM_CONFIG_WNN_DEFAULT_PREEDITOR           "/IMEngine/Wnn/DefaultPreEditor"
+#define SCIM_DEFAULT_WNN_DEFAULT_PREEDITOR          "Romkan"
 #define SCIM_CONFIG_WNN_SERVERTYPE                  "/IMEngine/Wnn/ServerType"
 #ifdef HAVE_LIBWNN7
   #define SCIM_DEFAULT_WNN_SERVERTYPE                 "Wnn7"
diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp
index 6b4aea0..c4f2722 100644
--- a/scim-wnn/src/scim_wnn_imengine.cpp
+++ b/scim-wnn/src/scim_wnn_imengine.cpp
@@ -216,6 +216,7 @@
     } else {
         sType = Wnn4;
     }
+    defaultPreEditor = _scim_config->read(String(SCIM_CONFIG_WNN_DEFAULT_PREEDITOR),String(SCIM_DEFAULT_WNN_DEFAULT_PREEDITOR));
 
     // �ǥե���ȥ������ꡣ
     scim_string_to_key_list(k_conversion_start,
@@ -283,6 +284,7 @@
         _scim_config->read(String(SCIM_CONFIG_WNN_KEY_SELECT_YOSOKU),
             String(SCIM_DEFAULT_WNN_KEY_SELECT_YOSOKU)));
 
+    changePreEditor(defaultPreEditor);
 
     // �����ǰ�����³���Ƥ�������
     wnn.wnnConnect(String("scim-wnn"),host,rc,sType,0);
@@ -291,7 +293,7 @@
 
 
 /*!
-    \fn WnnInstance::changePreEditor(const QString &name)
+    \fn WnnInstance::changePreEditor(const String &name)
  */
 void WnnInstance::changePreEditor(const String &name)
 {
diff --git a/scim-wnn/src/scim_wnn_imengine.h b/scim-wnn/src/scim_wnn_imengine.h
index 434c776..1168a28 100644
--- a/scim-wnn/src/scim_wnn_imengine.h
+++ b/scim-wnn/src/scim_wnn_imengine.h
@@ -102,6 +102,7 @@
     String host;
     String rc;
     JServerType sType;
+    String defaultPreEditor;
     IConvert m_iconv;
     vector<PreEditor *> preeditors;
 protected:
diff --git a/scim-wnn/src/scim_wnn_imengine_setup.cpp b/scim-wnn/src/scim_wnn_imengine_setup.cpp
index ec40a4a..fce51a5 100644
--- a/scim-wnn/src/scim_wnn_imengine_setup.cpp
+++ b/scim-wnn/src/scim_wnn_imengine_setup.cpp
@@ -148,6 +148,7 @@
 static String __config_server = SCIM_DEFAULT_WNN_SERVER;
 static String __config_wnn_rc = SCIM_DEFAULT_WNN_RC;
 static String __config_servertype = SCIM_DEFAULT_WNN_SERVERTYPE;
+static String __config_preeditor = SCIM_DEFAULT_WNN_DEFAULT_PREEDITOR;
 static bool __config_yosoku = SCIM_DEFAULT_WNN_YOSOKU;
 static bool __config_numkeyselect = SCIM_DEFAULT_WNN_NUMKEY_SELECT;
 static int __config_alp = SCIM_DEFAULT_WNN_ALP;
@@ -157,6 +158,7 @@
 //static GtkWidget    * __widget_use_kana = 0;
 static GtkWidget    * __widget_server = 0;
 static GtkWidget    * __widget_servertype = 0;
+static GtkWidget    * __widget_preeditor = 0;
 static GtkWidget    * __widget_wnn_rc = 0;
 static GtkWidget    * __widget_yosoku = 0;
 static GtkWidget    * __widget_alp = 0;
@@ -182,6 +184,16 @@
     },
     {
         NULL,
+        String("Romkan"),
+        N_("Roma-Kana input"),
+    },
+    {
+        NULL,
+        String("KanaInput"),
+        N_("Kana input"),
+    },
+    {
+        NULL,
         String(),
         NULL,
     },
@@ -477,7 +489,7 @@
     gtk_widget_show (vbox);
 
     for(i = 0;__list_data[i].label;i ++) {
-        __list_data[i].widget = gtk_list_item_new_with_label(__list_data[i].label);
+        __list_data[i].widget = gtk_list_item_new_with_label(_(__list_data[i].label));
         gtk_widget_show (__list_data[i].widget);
     }
 
@@ -563,9 +575,8 @@
     gtk_tooltips_set_tip (__widget_tooltips, __widget_servertype,
                               _("select the server type from Wnn4 / Wnn6 / Wnn7."), NULL);
 
-
-    /* ALP */
-    label = gtk_label_new_with_mnemonic (_("_Auto candidates popup: "));
+    /* default preeditor */
+    label = gtk_label_new_with_mnemonic (_("Default_PreEditor: "));
     gtk_widget_show (label);
     gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
     gtk_misc_set_padding (GTK_MISC (label), 4, 0);
@@ -573,11 +584,34 @@
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
 
+    list = NULL;
+    list = g_list_append(list,__list_data[3].widget);
+    list = g_list_append(list,__list_data[4].widget);
+    __widget_preeditor = gtk_list_new ();
+    gtk_list_append_items(GTK_LIST(__widget_preeditor),list);
+    gtk_widget_show (__widget_preeditor);
+    gtk_table_attach (GTK_TABLE (table), __widget_preeditor, 1, 2, 3, 4,
+                      (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                      (GtkAttachOptions) (GTK_FILL), 4, 4);
+    gtk_label_set_mnemonic_widget (GTK_LABEL (label), __list_data[3].widget);
+    gtk_tooltips_set_tip (__widget_tooltips, __widget_preeditor,
+                              _("select the default preeditor."), NULL);
+
+
+    /* ALP */
+    label = gtk_label_new_with_mnemonic (_("_Auto candidates popup: "));
+    gtk_widget_show (label);
+    gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+    gtk_misc_set_padding (GTK_MISC (label), 4, 0);
+    gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5,
+                      (GtkAttachOptions) (GTK_FILL),
+                      (GtkAttachOptions) (GTK_FILL), 4, 4);
+
     GtkAdjustment* aj;
     aj = (GtkAdjustment *) gtk_adjustment_new(0,-1,10,1,1,1);
     __widget_alp = gtk_spin_button_new(aj,1,0);
     gtk_widget_show (__widget_alp);
-    gtk_table_attach (GTK_TABLE (table), __widget_alp, 1, 2, 3, 4,
+    gtk_table_attach (GTK_TABLE (table), __widget_alp, 1, 2, 4, 5,
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), __widget_alp);
@@ -589,13 +623,13 @@
     gtk_widget_show (label);
     gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
     gtk_misc_set_padding (GTK_MISC (label), 4, 0);
-    gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5,
+    gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6,
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
 
     __widget_numkeyselect = gtk_check_button_new();
     gtk_widget_show (__widget_numkeyselect);
-    gtk_table_attach (GTK_TABLE (table), __widget_numkeyselect, 1, 2, 4, 5,
+    gtk_table_attach (GTK_TABLE (table), __widget_numkeyselect, 1, 2, 5, 6,
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), __widget_numkeyselect);
@@ -608,13 +642,13 @@
     gtk_widget_show (label);
     gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
     gtk_misc_set_padding (GTK_MISC (label), 4, 0);
-    gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6,
+    gtk_table_attach (GTK_TABLE (table), label, 0, 1, 6, 7,
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
 
     __widget_yosoku = gtk_check_button_new();
     gtk_widget_show (__widget_yosoku);
-    gtk_table_attach (GTK_TABLE (table), __widget_yosoku, 1, 2, 5, 6,
+    gtk_table_attach (GTK_TABLE (table), __widget_yosoku, 1, 2, 6, 7,
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), __widget_yosoku);
@@ -635,6 +669,9 @@
     g_signal_connect ((gpointer) __widget_servertype, "select-child",
                       G_CALLBACK (on_default_list_changed),
                       &__config_servertype);
+    g_signal_connect ((gpointer) __widget_preeditor, "select-child",
+                      G_CALLBACK (on_default_list_changed),
+                      &__config_preeditor);
     g_signal_connect ((gpointer) __widget_alp, "changed",
                       G_CALLBACK (on_default_number_changed),
                       &__config_alp);
@@ -769,6 +806,15 @@
         }
     }
 
+    if (__widget_preeditor) {
+        for(unsigned int i = 0;__list_data[i].widget;i ++) {
+            if (__list_data[i].name == __config_preeditor) {
+                gtk_list_select_child(GTK_LIST(__widget_preeditor),__list_data[i].widget);
+                break;
+            }
+        }
+    }
+
     if (__widget_alp) {
         gtk_spin_button_set_value (
             GTK_SPIN_BUTTON (__widget_alp),
@@ -814,6 +860,9 @@
         __config_servertype =
             config->read (String (SCIM_CONFIG_WNN_SERVERTYPE),
                           __config_servertype);
+        __config_preeditor =
+            config->read (String (SCIM_CONFIG_WNN_DEFAULT_PREEDITOR),
+                          __config_preeditor);
         __config_alp =
             config->read (String (SCIM_CONFIG_WNN_ALP),
                           __config_alp);
@@ -850,6 +899,8 @@
                        __config_wnn_rc);
         config->write (String (SCIM_CONFIG_WNN_SERVERTYPE),
                        __config_servertype);
+        config->write (String (SCIM_CONFIG_WNN_DEFAULT_PREEDITOR),
+                       __config_preeditor);
         config->write (String (SCIM_CONFIG_WNN_ALP),
                        __config_alp);
         config->write (String (SCIM_CONFIG_WNN_NUMKEY_SELECT),