diff --git a/scim-wnn/ChangeLog b/scim-wnn/ChangeLog
index a8aad8e..4846dc3 100644
--- a/scim-wnn/ChangeLog
+++ b/scim-wnn/ChangeLog
@@ -1,3 +1,121 @@
+2004-12-28 18:35:53  Rev 117    tamra
+
+	* src/scim_wnn_def.h src/scim_wnn_imengine_setup.cpp:
+	  ��������ɲá�
+
+2004-12-28 17:49:54  Rev 116    tamra
+
+	* src/scim_wnn_imengine.h src/wnnconversion.h src/scim_wnn_def.h 
+	  src/scim_wnn_imengine.cpp src/wnnconversion.cpp:
+	  �����Х����פˤ�뵡ǽʬΥ��
+
+2004-12-24 19:28:00  Rev 115    tamra
+
+	* po/ja.po src/scim_wnn_def.h po/scim-wnn.pot src/scim_wnn_imengine.
+	  cpp src/scim_wnn_imengine_setup.cpp:
+	  ����ޤ�꽤����
+
+2004-12-22 06:31:44  Rev 114    tamra
+
+	* src/romkan.cpp:
+	  ;�פʥ�����commit����������ʬ������
+
+2004-12-22 04:00:23  Rev 113    tamra
+
+	* src/romkan.cpp src/wnnconversion.cpp:
+	  ���äƤ����٤����������ꡣ
+
+2004-12-22 03:08:21  Rev 112    tamra
+
+	* po/ja.po:
+	  [��r]��[��]���ѹ���
+
+2004-12-22 03:06:45  Rev 111    tamra
+
+	* po/ja.po po/scim-wnn.pot:
+	  ������������
+
+2004-12-22 03:04:32  Rev 110    tamra
+
+	* src/scim_wnn_imengine.cpp:
+	  ͽ¬���Υ����åȤΰ��ֽ�����commit������ͭ������
+
+2004-12-22 02:58:15  Rev 109    tamra
+
+	* src/scim_wnn_imengine.cpp:
+	  ͽ¬��ޥ���������Ǥ���褦������
+
+2004-12-22 02:45:54  Rev 108    tamra
+
+	* src/romkan.h src/preeditor.cpp src/scim_wnn_imengine.h 
+	  src/scim_wnn_def.h src/preeditor.h src/romkan.cpp 
+	  src/scim_wnn_imengine.cpp:
+	  ͽ¬��������ɲá�
+
+2004-12-22 01:09:54  Rev 107    tamra
+
+	* src/wnnproto.h src/scim_wnn_imengine.h src/wnnconversion.h 
+	  src/scim_wnn_imengine.cpp src/wnnconversion.cpp:
+	  ��³�ޤ�����Ĵ���ȸ���ɽ���ޤ���������
+
+2004-12-22 00:21:39  Rev 106    tamra
+
+	* src/wnnproto.h src/scim_wnn_imengine.h src/wnnconversion.h 
+	  src/scim_wnn_imengine.cpp src/wnnconversion.cpp:
+	  ͽ¬���ϥ�����Ƴ���������Բġ�
+
+2004-12-18 02:31:46  Rev 105    tamra
+
+	* src/romkan.cpp src/scim_wnn_imengine.cpp:
+	  PreEditor�ǽ������٤���̵��ʸ���ΰ���������
+
+2004-12-18 00:37:22  Rev 104    tamra
+
+	* po/ja.po:
+	  ��å�������fuzzy���
+
+2004-12-18 00:34:04  Rev 103    tamra
+
+	* src/wnnproto.h po/ja.po src/scim_wnn_imengine.h src/wnnconversion.
+	  h src/scim_wnn_def.h po/scim-wnn.pot src/scim_wnn_imengine.cpp 
+	  src/wnnconversion.cpp:
+	  Ϣ���Ѵ��Ȱ۷����Ѵ��˰���б����ޤ�����
+
+2004-12-17 23:42:54  Rev 102    tamra
+
+	* src/romkan_table.h:
+	  ���޻������Ѵ��ơ��֥�η�����䴰��
+
+2004-12-17 20:28:45  Rev 96     tamra
+
+	* src/wnnproto.h src/wnnconversion.cpp:
+	  Wnn7����Fix��
+
+2004-12-17 00:46:24  Rev 95     tamra
+
+	* src/romkan.cpp:
+	  �ƥ󥭡��ˤ����������б���
+
+2004-12-16 04:30:12  Rev 94     tamra
+
+	* src/wnnproto.h src/wnnconversion.cpp:
+	  FreeWnn��libwnn�б������ɤ�Wnn6/7�����˴����ִ���
+
+2004-12-16 04:24:19  Rev 93     tamra
+
+	* configure.ac ChangeLog:
+	  FreeWnn��libwnn.so�򽳤�������ѹ���
+
+2004-12-16 03:10:11  Rev 92     tamra
+
+	* po/ja.po po/scim-wnn.pot:
+	  ������������
+
+2004-12-16 03:06:54  Rev 91     tamra
+
+	* src/romkan.h src/romkan.cpp:
+	  latin�ȸ���ɽ�����������ascii���ѹ���
+
 2004-12-14 18:59:07  Rev 86     tamra
 
 	* configure.ac po/ja.po po/scim-wnn.pot:
diff --git a/scim-wnn/po/ja.po b/scim-wnn/po/ja.po
index 37f92ab..320eec4 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-25 04:18+0900\n"
+"POT-Creation-Date: 2004-12-29 03:52+0900\n"
 "PO-Revision-Date: 2004-12-01 14:29+0900\n"
 "Last-Translator: TAM (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:306
+#: src/scim_wnn_imengine.cpp:314
 msgid "input mode"
 msgstr "入力モード"
 
-#: src/scim_wnn_imengine.cpp:310 src/scim_wnn_imengine.cpp:313
+#: src/scim_wnn_imengine.cpp:318 src/scim_wnn_imengine.cpp:321
 msgid "mode status"
 msgstr "状態"
 
-#: src/scim_wnn_imengine.cpp:324
+#: src/scim_wnn_imengine.cpp:332
 msgid "Kanji"
 msgstr "[漢]"
 
-#: src/scim_wnn_imengine.cpp:325
+#: src/scim_wnn_imengine.cpp:333
 msgid "Yosoku"
 msgstr "[予]"
 
-#: src/scim_wnn_imengine.cpp:789 src/scim_wnn_imengine.cpp:797
+#: src/scim_wnn_imengine.cpp:810 src/scim_wnn_imengine.cpp:818
 msgid "could not connect to jserver."
 msgstr "サーバに接続できませんでした"
 
-#: src/scim_wnn_imengine.cpp:842
+#: src/scim_wnn_imengine.cpp:864
 msgid "Ikeiji lookup result"
 msgstr "異形字変換"
 
-#: src/scim_wnn_imengine.cpp:846
+#: src/scim_wnn_imengine.cpp:868
 msgid "association lookup result"
 msgstr "連想変換"
 
-#: src/scim_wnn_imengine.cpp:850
+#: src/scim_wnn_imengine.cpp:872
 msgid "yosoku lookup result"
 msgstr "予測候補"
 
-#: src/scim_wnn_imengine.cpp:854
+#: src/scim_wnn_imengine.cpp:876
 msgid "lookup result"
 msgstr "候補一覧"
 
@@ -75,293 +75,317 @@
 msgid "A Wnn IMEngine Module."
 msgstr "Wnn IMエンジンモジュール"
 
-#: src/scim_wnn_imengine_setup.cpp:156
+#: src/scim_wnn_imengine_setup.cpp:160
 msgid "Commit keys:"
 msgstr "確定キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:157
+#: src/scim_wnn_imengine_setup.cpp:161
 msgid "Select commit keys"
 msgstr "確定キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:158
+#: src/scim_wnn_imengine_setup.cpp:162
 msgid "The key events to commit the preedit string. "
 msgstr "文字列を確定するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:165
+#: src/scim_wnn_imengine_setup.cpp:169
 msgid "Convert keys:"
 msgstr "変換キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:166
+#: src/scim_wnn_imengine_setup.cpp:170
 msgid "Select convert keys"
 msgstr "変換キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:167
+#: src/scim_wnn_imengine_setup.cpp:171
 msgid "The key events to convert the preedit string to kanji. "
 msgstr "文字列を漢字へ変換するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:174
+#: src/scim_wnn_imengine_setup.cpp:178
 msgid "Cancel keys:"
 msgstr "キャンセルキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:175
+#: src/scim_wnn_imengine_setup.cpp:179
 msgid "Select cancel keys"
 msgstr "キャンセルキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:176
+#: src/scim_wnn_imengine_setup.cpp:180
 msgid "The key events to cancel preediting or converting. "
 msgstr "文字入力や文字変換をキャンセルするキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:183
+#: src/scim_wnn_imengine_setup.cpp:187
 msgid "Backspace keys:"
 msgstr "バックスペースキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:184
+#: src/scim_wnn_imengine_setup.cpp:188
 msgid "Select backspace keys"
 msgstr "バックスペースキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:185
+#: src/scim_wnn_imengine_setup.cpp:189
 msgid "The key events to delete a character before caret. "
 msgstr "キャレットの前の文字を一文字削除するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:192
+#: src/scim_wnn_imengine_setup.cpp:196
 msgid "Delete keys:"
 msgstr "削除キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:193
+#: src/scim_wnn_imengine_setup.cpp:197
 msgid "Select delete keys"
 msgstr "削除キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:194
+#: src/scim_wnn_imengine_setup.cpp:198
 msgid "The key events to delete a character after caret. "
 msgstr "キャレットの後の文字を一文字削除するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:214
+#: src/scim_wnn_imengine_setup.cpp:218
 msgid "Move forward keys:"
 msgstr "前方へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:215
+#: src/scim_wnn_imengine_setup.cpp:219
 msgid "Select move caret forward keys"
 msgstr "キャレットを前方へ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:216
+#: src/scim_wnn_imengine_setup.cpp:220
 msgid "The key events to move the caret to forward. "
 msgstr "キャレットを前方へ移動するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:223
+#: src/scim_wnn_imengine_setup.cpp:227
 msgid "Move backward keys:"
 msgstr "後方へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:224
+#: src/scim_wnn_imengine_setup.cpp:228
 msgid "Select move caret backward keys"
 msgstr "キャレットを後方へ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:225
+#: src/scim_wnn_imengine_setup.cpp:229
 msgid "The key events to move the caret to backward. "
 msgstr "キャレットを後方へ移動するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:245
+#: src/scim_wnn_imengine_setup.cpp:249
 msgid "Next segment keys:"
 msgstr "次の文節へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:246
+#: src/scim_wnn_imengine_setup.cpp:250
 msgid "Select next segment keys"
 msgstr "次の文節へ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:247
+#: src/scim_wnn_imengine_setup.cpp:251
 msgid "The key events to select next segment. "
 msgstr "次の文節を選択するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:254
+#: src/scim_wnn_imengine_setup.cpp:258
 msgid "Previous segment keys:"
 msgstr "前の文節へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:255
+#: src/scim_wnn_imengine_setup.cpp:259
 msgid "Select previous segment keys"
 msgstr "前の文節へ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:256
+#: src/scim_wnn_imengine_setup.cpp:260
 msgid "The key events to select previous segment. "
 msgstr "前の文節を選択するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:263
+#: src/scim_wnn_imengine_setup.cpp:267
 msgid "Shrink segment keys:"
 msgstr "文節を縮めるキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:264
+#: src/scim_wnn_imengine_setup.cpp:268
 msgid "Select shrink segment keys"
 msgstr "文節を縮めるキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:265
+#: src/scim_wnn_imengine_setup.cpp:269
 msgid "The key events to shrink the selected segment. "
 msgstr "選択文節を縮めるキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:272
+#: src/scim_wnn_imengine_setup.cpp:276
 msgid "Expand segment keys:"
 msgstr "文節を拡げるキー"
 
-#: src/scim_wnn_imengine_setup.cpp:273
+#: src/scim_wnn_imengine_setup.cpp:277
 msgid "Select expand segment keys"
 msgstr "文節を拡げるキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:274
+#: src/scim_wnn_imengine_setup.cpp:278
 msgid "The key events to expand the selected segment. "
 msgstr "選択文節を拡げるキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:294
+#: src/scim_wnn_imengine_setup.cpp:298
 msgid "Next keys:"
 msgstr "次へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:295
+#: src/scim_wnn_imengine_setup.cpp:299
 msgid "Select next candidate keys"
 msgstr "次の候補を選択するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:296
+#: src/scim_wnn_imengine_setup.cpp:300
 msgid "The key events to select next candidate. "
 msgstr "次の候補を選択するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:303
+#: src/scim_wnn_imengine_setup.cpp:307
 msgid "Previous keys:"
 msgstr "前へ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:304
+#: src/scim_wnn_imengine_setup.cpp:308
 msgid "Select previous candidate keys"
 msgstr "前の候補を選択するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:305
+#: src/scim_wnn_imengine_setup.cpp:309
 msgid "The key events to select previous candidate. "
 msgstr "前の候補を選択するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:312
+#: src/scim_wnn_imengine_setup.cpp:316
 msgid "candidates list keys:"
 msgstr "候補一覧キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:313
+#: src/scim_wnn_imengine_setup.cpp:317
 msgid "Select candidates list keys"
 msgstr "候補一覧を表示するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:314
+#: src/scim_wnn_imengine_setup.cpp:318
 msgid "The key events to popup candidates list. "
 msgstr "候補一覧を表示するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:321
+#: src/scim_wnn_imengine_setup.cpp:325
 msgid "Page up keys:"
 msgstr "前のページへ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:322
+#: src/scim_wnn_imengine_setup.cpp:326
 msgid "Select page up candidates keys"
 msgstr "前のページへ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:323
+#: src/scim_wnn_imengine_setup.cpp:327
 msgid "The key events to select page up candidates. "
 msgstr "前のページへ移動するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:330
+#: src/scim_wnn_imengine_setup.cpp:334
 msgid "Page down keys:"
 msgstr "次のページへ移動するキー:"
 
-#: src/scim_wnn_imengine_setup.cpp:331
+#: src/scim_wnn_imengine_setup.cpp:335
 msgid "Select page down candidates keys"
 msgstr "次のページへ移動するキーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:332
+#: src/scim_wnn_imengine_setup.cpp:336
 msgid "The key events to select page down candidates. "
 msgstr "次のページへ移動するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:352
+#: src/scim_wnn_imengine_setup.cpp:356
 msgid "Yosoku keys:"
 msgstr "予測入力キー"
 
-#: src/scim_wnn_imengine_setup.cpp:353
+#: src/scim_wnn_imengine_setup.cpp:357
 msgid "Select yosoku keys"
 msgstr "予測入力キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:354
+#: src/scim_wnn_imengine_setup.cpp:358
 msgid "The key events to select from completion list. "
 msgstr "予測入力候補から選択するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:361
+#: src/scim_wnn_imengine_setup.cpp:365
 msgid "Convert to ikeiji keys:"
 msgstr "異形字変換キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:362
+#: src/scim_wnn_imengine_setup.cpp:366
 msgid "Select ikeiji keys"
 msgstr "異形字変換キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:363
+#: src/scim_wnn_imengine_setup.cpp:367
 msgid "The key events to convert the selected candidate to ikei-kanji. "
 msgstr "選択された候補を異形字漢字へ変換するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:370
+#: src/scim_wnn_imengine_setup.cpp:374
 msgid "Convert to rensou keys:"
 msgstr "連想変換キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:371
+#: src/scim_wnn_imengine_setup.cpp:375
 msgid "Select rensou keys"
 msgstr "連想変換キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:372
+#: src/scim_wnn_imengine_setup.cpp:376
 msgid ""
 "The key events to convert the selected candidate to the associated "
 "acceptation string.  "
 msgstr "選択された候補を連想変換するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:379
+#: src/scim_wnn_imengine_setup.cpp:383
 msgid "Convert to HIRAGANA keys:"
 msgstr "ひらがな変換キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:380
+#: src/scim_wnn_imengine_setup.cpp:384
 msgid "Select convert to HIRAGANA keys"
 msgstr "ひらがな変換キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:381
+#: src/scim_wnn_imengine_setup.cpp:385
 msgid ""
 "The key events to convert the selected candidate or the preedit string to "
 "HIRAGANA. "
 msgstr "選択された候補、あるいは変換前文字列をひらがなへ変換するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:388
+#: src/scim_wnn_imengine_setup.cpp:392
 msgid "Convert to KATAKANA keys:"
 msgstr "カタカナ変換キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:389
+#: src/scim_wnn_imengine_setup.cpp:393
 msgid "Select convert to KATAGANA keys"
 msgstr "カタカナ変換キーの設定"
 
-#: src/scim_wnn_imengine_setup.cpp:390
+#: src/scim_wnn_imengine_setup.cpp:394
 msgid ""
 "The key events to convert the selected candidate or the preedit string to "
 "KATAKANA. "
 msgstr "選択された候補、あるいは変換前文字列をカタカナへ変換するキーイベント"
 
-#: src/scim_wnn_imengine_setup.cpp:407
+#: src/scim_wnn_imengine_setup.cpp:411
 msgid "Common keys"
 msgstr "一般キー"
 
-#: src/scim_wnn_imengine_setup.cpp:408
+#: src/scim_wnn_imengine_setup.cpp:412
 msgid "Preedit keys"
 msgstr "編集キー:"
 
-#: src/scim_wnn_imengine_setup.cpp:409
+#: src/scim_wnn_imengine_setup.cpp:413
 msgid "Candidates keys"
 msgstr "候補キー"
 
-#: src/scim_wnn_imengine_setup.cpp:410
+#: src/scim_wnn_imengine_setup.cpp:414
 msgid "Other function keys"
 msgstr "その他機能キー"
 
-#: src/scim_wnn_imengine_setup.cpp:450
+#: src/scim_wnn_imengine_setup.cpp:452
 msgid "_Server: "
 msgstr "サーバ(_S):"
 
-#: src/scim_wnn_imengine_setup.cpp:466
+#: src/scim_wnn_imengine_setup.cpp:469
+msgid "input the server name to connect."
+msgstr "接続するサーバ名を指定します。"
+
+#: src/scim_wnn_imengine_setup.cpp:473
 msgid "_wnnenvrc: "
 msgstr "wnnenvrc(_W):"
 
-#: src/scim_wnn_imengine_setup.cpp:481 src/scim_wnn_imengine_setup.cpp:534
+#: src/scim_wnn_imengine_setup.cpp:488 src/scim_wnn_imengine_setup.cpp:585
 msgid "..."
 msgstr "..."
 
-#: src/scim_wnn_imengine_setup.cpp:574
+#: src/scim_wnn_imengine_setup.cpp:495
+msgid "input the path of wnnenvrc."
+msgstr "wnnenvrcファイルを指定します"
+
+#: src/scim_wnn_imengine_setup.cpp:498
+msgid "_Servertype: "
+msgstr "サーバタイプ(_S):"
+
+#: src/scim_wnn_imengine_setup.cpp:513
+msgid "select the server type from Wnn4 / Wnn6 / Wnn7."
+msgstr "サーバの種類を Wnn4 / Wnn6 / Wnn7 から選択します。"
+
+#: src/scim_wnn_imengine_setup.cpp:516
+msgid "_YOSOKU-input: "
+msgstr "予測入力"
+
+#: src/scim_wnn_imengine_setup.cpp:531
+msgid "if you use YOSOKU-input , check this."
+msgstr "予測入力を利用する場合はここをチェックします"
+
+#: src/scim_wnn_imengine_setup.cpp:625
 msgid "Options"
 msgstr "オプション"
 
diff --git a/scim-wnn/po/scim-wnn.pot b/scim-wnn/po/scim-wnn.pot
index 230bccf..8611eb4 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-25 04:18+0900\n"
+"POT-Creation-Date: 2004-12-29 03:52+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:306
+#: src/scim_wnn_imengine.cpp:314
 msgid "input mode"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:310 src/scim_wnn_imengine.cpp:313
+#: src/scim_wnn_imengine.cpp:318 src/scim_wnn_imengine.cpp:321
 msgid "mode status"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:324
+#: src/scim_wnn_imengine.cpp:332
 msgid "Kanji"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:325
+#: src/scim_wnn_imengine.cpp:333
 msgid "Yosoku"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:789 src/scim_wnn_imengine.cpp:797
+#: src/scim_wnn_imengine.cpp:810 src/scim_wnn_imengine.cpp:818
 msgid "could not connect to jserver."
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:842
+#: src/scim_wnn_imengine.cpp:864
 msgid "Ikeiji lookup result"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:846
+#: src/scim_wnn_imengine.cpp:868
 msgid "association lookup result"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:850
+#: src/scim_wnn_imengine.cpp:872
 msgid "yosoku lookup result"
 msgstr ""
 
-#: src/scim_wnn_imengine.cpp:854
+#: src/scim_wnn_imengine.cpp:876
 msgid "lookup result"
 msgstr ""
 
@@ -72,293 +72,317 @@
 msgid "A Wnn IMEngine Module."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:156
+#: src/scim_wnn_imengine_setup.cpp:160
 msgid "Commit keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:157
+#: src/scim_wnn_imengine_setup.cpp:161
 msgid "Select commit keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:158
+#: src/scim_wnn_imengine_setup.cpp:162
 msgid "The key events to commit the preedit string. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:165
+#: src/scim_wnn_imengine_setup.cpp:169
 msgid "Convert keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:166
+#: src/scim_wnn_imengine_setup.cpp:170
 msgid "Select convert keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:167
+#: src/scim_wnn_imengine_setup.cpp:171
 msgid "The key events to convert the preedit string to kanji. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:174
+#: src/scim_wnn_imengine_setup.cpp:178
 msgid "Cancel keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:175
+#: src/scim_wnn_imengine_setup.cpp:179
 msgid "Select cancel keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:176
+#: src/scim_wnn_imengine_setup.cpp:180
 msgid "The key events to cancel preediting or converting. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:183
+#: src/scim_wnn_imengine_setup.cpp:187
 msgid "Backspace keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:184
+#: src/scim_wnn_imengine_setup.cpp:188
 msgid "Select backspace keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:185
+#: src/scim_wnn_imengine_setup.cpp:189
 msgid "The key events to delete a character before caret. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:192
+#: src/scim_wnn_imengine_setup.cpp:196
 msgid "Delete keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:193
+#: src/scim_wnn_imengine_setup.cpp:197
 msgid "Select delete keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:194
+#: src/scim_wnn_imengine_setup.cpp:198
 msgid "The key events to delete a character after caret. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:214
+#: src/scim_wnn_imengine_setup.cpp:218
 msgid "Move forward keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:215
+#: src/scim_wnn_imengine_setup.cpp:219
 msgid "Select move caret forward keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:216
+#: src/scim_wnn_imengine_setup.cpp:220
 msgid "The key events to move the caret to forward. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:223
+#: src/scim_wnn_imengine_setup.cpp:227
 msgid "Move backward keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:224
+#: src/scim_wnn_imengine_setup.cpp:228
 msgid "Select move caret backward keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:225
+#: src/scim_wnn_imengine_setup.cpp:229
 msgid "The key events to move the caret to backward. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:245
+#: src/scim_wnn_imengine_setup.cpp:249
 msgid "Next segment keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:246
+#: src/scim_wnn_imengine_setup.cpp:250
 msgid "Select next segment keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:247
+#: src/scim_wnn_imengine_setup.cpp:251
 msgid "The key events to select next segment. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:254
+#: src/scim_wnn_imengine_setup.cpp:258
 msgid "Previous segment keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:255
+#: src/scim_wnn_imengine_setup.cpp:259
 msgid "Select previous segment keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:256
+#: src/scim_wnn_imengine_setup.cpp:260
 msgid "The key events to select previous segment. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:263
+#: src/scim_wnn_imengine_setup.cpp:267
 msgid "Shrink segment keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:264
+#: src/scim_wnn_imengine_setup.cpp:268
 msgid "Select shrink segment keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:265
+#: src/scim_wnn_imengine_setup.cpp:269
 msgid "The key events to shrink the selected segment. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:272
+#: src/scim_wnn_imengine_setup.cpp:276
 msgid "Expand segment keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:273
+#: src/scim_wnn_imengine_setup.cpp:277
 msgid "Select expand segment keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:274
+#: src/scim_wnn_imengine_setup.cpp:278
 msgid "The key events to expand the selected segment. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:294
+#: src/scim_wnn_imengine_setup.cpp:298
 msgid "Next keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:295
+#: src/scim_wnn_imengine_setup.cpp:299
 msgid "Select next candidate keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:296
+#: src/scim_wnn_imengine_setup.cpp:300
 msgid "The key events to select next candidate. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:303
+#: src/scim_wnn_imengine_setup.cpp:307
 msgid "Previous keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:304
+#: src/scim_wnn_imengine_setup.cpp:308
 msgid "Select previous candidate keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:305
+#: src/scim_wnn_imengine_setup.cpp:309
 msgid "The key events to select previous candidate. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:312
+#: src/scim_wnn_imengine_setup.cpp:316
 msgid "candidates list keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:313
+#: src/scim_wnn_imengine_setup.cpp:317
 msgid "Select candidates list keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:314
+#: src/scim_wnn_imengine_setup.cpp:318
 msgid "The key events to popup candidates list. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:321
+#: src/scim_wnn_imengine_setup.cpp:325
 msgid "Page up keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:322
+#: src/scim_wnn_imengine_setup.cpp:326
 msgid "Select page up candidates keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:323
+#: src/scim_wnn_imengine_setup.cpp:327
 msgid "The key events to select page up candidates. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:330
+#: src/scim_wnn_imengine_setup.cpp:334
 msgid "Page down keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:331
+#: src/scim_wnn_imengine_setup.cpp:335
 msgid "Select page down candidates keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:332
+#: src/scim_wnn_imengine_setup.cpp:336
 msgid "The key events to select page down candidates. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:352
+#: src/scim_wnn_imengine_setup.cpp:356
 msgid "Yosoku keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:353
+#: src/scim_wnn_imengine_setup.cpp:357
 msgid "Select yosoku keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:354
+#: src/scim_wnn_imengine_setup.cpp:358
 msgid "The key events to select from completion list. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:361
+#: src/scim_wnn_imengine_setup.cpp:365
 msgid "Convert to ikeiji keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:362
+#: src/scim_wnn_imengine_setup.cpp:366
 msgid "Select ikeiji keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:363
+#: src/scim_wnn_imengine_setup.cpp:367
 msgid "The key events to convert the selected candidate to ikei-kanji. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:370
+#: src/scim_wnn_imengine_setup.cpp:374
 msgid "Convert to rensou keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:371
+#: src/scim_wnn_imengine_setup.cpp:375
 msgid "Select rensou keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:372
+#: src/scim_wnn_imengine_setup.cpp:376
 msgid ""
 "The key events to convert the selected candidate to the associated "
 "acceptation string.  "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:379
+#: src/scim_wnn_imengine_setup.cpp:383
 msgid "Convert to HIRAGANA keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:380
+#: src/scim_wnn_imengine_setup.cpp:384
 msgid "Select convert to HIRAGANA keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:381
+#: src/scim_wnn_imengine_setup.cpp:385
 msgid ""
 "The key events to convert the selected candidate or the preedit string to "
 "HIRAGANA. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:388
+#: src/scim_wnn_imengine_setup.cpp:392
 msgid "Convert to KATAKANA keys:"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:389
+#: src/scim_wnn_imengine_setup.cpp:393
 msgid "Select convert to KATAGANA keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:390
+#: src/scim_wnn_imengine_setup.cpp:394
 msgid ""
 "The key events to convert the selected candidate or the preedit string to "
 "KATAKANA. "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:407
+#: src/scim_wnn_imengine_setup.cpp:411
 msgid "Common keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:408
+#: src/scim_wnn_imengine_setup.cpp:412
 msgid "Preedit keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:409
+#: src/scim_wnn_imengine_setup.cpp:413
 msgid "Candidates keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:410
+#: src/scim_wnn_imengine_setup.cpp:414
 msgid "Other function keys"
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:450
+#: src/scim_wnn_imengine_setup.cpp:452
 msgid "_Server: "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:466
+#: src/scim_wnn_imengine_setup.cpp:469
+msgid "input the server name to connect."
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:473
 msgid "_wnnenvrc: "
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:481 src/scim_wnn_imengine_setup.cpp:534
+#: src/scim_wnn_imengine_setup.cpp:488 src/scim_wnn_imengine_setup.cpp:585
 msgid "..."
 msgstr ""
 
-#: src/scim_wnn_imengine_setup.cpp:574
+#: src/scim_wnn_imengine_setup.cpp:495
+msgid "input the path of wnnenvrc."
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:498
+msgid "_Servertype: "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:513
+msgid "select the server type from Wnn4 / Wnn6 / Wnn7."
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:516
+msgid "_YOSOKU-input: "
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:531
+msgid "if you use YOSOKU-input , check this."
+msgstr ""
+
+#: src/scim_wnn_imengine_setup.cpp:625
 msgid "Options"
 msgstr ""
 
diff --git a/scim-wnn/src/scim_wnn_imengine_setup.cpp b/scim-wnn/src/scim_wnn_imengine_setup.cpp
index a19d862..56d0886 100644
--- a/scim-wnn/src/scim_wnn_imengine_setup.cpp
+++ b/scim-wnn/src/scim_wnn_imengine_setup.cpp
@@ -463,6 +463,11 @@
                       (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), __widget_server);
+    if (!__widget_tooltips)
+        __widget_tooltips = gtk_tooltips_new();
+    gtk_tooltips_set_tip (__widget_tooltips, __widget_server,
+                              _("input the server name to connect."), NULL);
+
 
     /* wnnenvrc */
     label = gtk_label_new_with_mnemonic (_("_wnnenvrc: "));
@@ -486,6 +491,8 @@
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
     //gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
+    gtk_tooltips_set_tip (__widget_tooltips, __widget_wnn_rc,
+                              _("input the path of wnnenvrc."), NULL);
 
     /* servertype */
     label = gtk_label_new_with_mnemonic (_("_Servertype: "));
@@ -502,6 +509,8 @@
                       (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                       (GtkAttachOptions) (GTK_FILL), 4, 4);
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), __widget_servertype);
+    gtk_tooltips_set_tip (__widget_tooltips, __widget_servertype,
+                              _("select the server type from Wnn4 / Wnn6 / Wnn7."), NULL);
 
     /* completion */
     label = gtk_label_new_with_mnemonic (_("_YOSOKU-input: "));
@@ -518,6 +527,8 @@
                       (GtkAttachOptions) (GTK_SHRINK),
                       (GtkAttachOptions) (GTK_SHRINK), 4, 4);
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), __widget_yosoku);
+    gtk_tooltips_set_tip (__widget_tooltips, __widget_yosoku,
+                              _("if you use YOSOKU-input , check this."), NULL);
 
     /* connect all signals */
     g_signal_connect ((gpointer) __widget_server, "changed",