diff --git a/honoka/plugins/anthyprediction.cpp b/honoka/plugins/anthyprediction.cpp index 21e93c9..bd8289a 100644 --- a/honoka/plugins/anthyprediction.cpp +++ b/honoka/plugins/anthyprediction.cpp @@ -20,6 +20,11 @@ #include "anthyprediction.h" +#ifdef HAVE_CONFIG_H + #include +#endif + + #ifdef HAVE_GETTEXT #include #define _(String) dgettext(GETTEXT_PACKAGE,String) diff --git a/honoka/po/POTFILES.in b/honoka/po/POTFILES.in index 672c85d..66564ea 100644 --- a/honoka/po/POTFILES.in +++ b/honoka/po/POTFILES.in @@ -19,6 +19,10 @@ plugins/wnnprediction.cpp plugins/anthyconversion.h plugins/anthyconversion.cpp +plugins/anthyplugin.h +plugins/anthyplugin.cpp +plugins/anthyprediction.h +plugins/anthyprediction.cpp plugins/simpleprediction.h plugins/simpleprediction.cpp plugins/primeprediction.h diff --git a/honoka/po/honoka.pot b/honoka/po/honoka.pot index 5bc1c38..2f4f486 100644 --- a/honoka/po/honoka.pot +++ b/honoka/po/honoka.pot @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-17 14:14+0900\n" +"POT-Creation-Date: 2005-11-03 14:00+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,49 +33,49 @@ msgid "SCIM-WNN HELP" msgstr "" -#: src/honoka_imengine.cpp:573 +#: src/honoka_imengine.cpp:590 msgid "input mode" msgstr "" -#: src/honoka_imengine.cpp:577 src/honoka_imengine.cpp:585 -#: src/honoka_imengine.cpp:593 src/honoka_imengine.cpp:596 +#: src/honoka_imengine.cpp:594 src/honoka_imengine.cpp:602 +#: src/honoka_imengine.cpp:610 src/honoka_imengine.cpp:613 msgid "mode status" msgstr "" -#: src/honoka_imengine.cpp:581 +#: src/honoka_imengine.cpp:598 msgid "predictor" msgstr "" -#: src/honoka_imengine.cpp:589 +#: src/honoka_imengine.cpp:606 msgid "convertor" msgstr "" -#: src/honoka_imengine.cpp:598 +#: src/honoka_imengine.cpp:615 msgid "conversion mode" msgstr "" -#: src/honoka_imengine.cpp:621 +#: src/honoka_imengine.cpp:638 msgid "Kanji" msgstr "" -#: src/honoka_imengine.cpp:622 +#: src/honoka_imengine.cpp:639 msgid "Yosoku" msgstr "" -#: src/honoka_imengine.cpp:628 +#: src/honoka_imengine.cpp:645 msgid "AUTO" msgstr "" -#: src/honoka_imengine.cpp:629 +#: src/honoka_imengine.cpp:646 msgid "REN" msgstr "" -#: src/honoka_imengine.cpp:1385 src/honoka_imengine.cpp:1424 -#: src/honoka_imengine.cpp:1436 +#: src/honoka_imengine.cpp:1411 src/honoka_imengine.cpp:1450 +#: src/honoka_imengine.cpp:1462 msgid "could not connect to server." msgstr "" -#: src/honoka_imengine.cpp:1394 +#: src/honoka_imengine.cpp:1420 msgid "The error was received from Converter. " msgstr "" @@ -505,7 +505,7 @@ msgid "lookup result (M)" msgstr "" -#: src/acpredictor.cpp:110 +#: src/acpredictor.cpp:146 msgid "AutoConversion" msgstr "" @@ -553,9 +553,10 @@ msgid "association lookup result" msgstr "" -#: plugins/wnnconversion.cpp:415 plugins/anthyconversion.cpp:147 -#: plugins/simpleprediction.cpp:70 plugins/primeprediction.cpp:125 -#: plugins/skkdicconversion.cpp:101 plugins/cannaconversion.cpp:175 +#: plugins/wnnconversion.cpp:415 plugins/anthyconversion.cpp:148 +#: plugins/anthyprediction.cpp:55 plugins/simpleprediction.cpp:70 +#: plugins/primeprediction.cpp:125 plugins/skkdicconversion.cpp:101 +#: plugins/cannaconversion.cpp:175 msgid "lookup result" msgstr "" @@ -567,10 +568,14 @@ msgid "WnnPrediction" msgstr "" -#: plugins/anthyconversion.cpp:174 +#: plugins/anthyconversion.cpp:175 msgid "AnthyConversion" msgstr "" +#: plugins/anthyprediction.cpp:110 +msgid "AnthyPrediction" +msgstr "" + #: plugins/simpleprediction.cpp:111 msgid "SimplePrediction" msgstr "" diff --git a/honoka/po/ja.po b/honoka/po/ja.po index 0e95bbc..4a27307 100644 --- a/honoka/po/ja.po +++ b/honoka/po/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-17 14:14+0900\n" +"POT-Creation-Date: 2005-11-03 14:00+0900\n" "PO-Revision-Date: 2004-12-01 14:29+0900\n" "Last-Translator: TAM (Teppei Tamra) \n" "Language-Team: Japanese\n" @@ -35,49 +35,49 @@ msgid "SCIM-WNN HELP" msgstr "適当にそれっぽく操作して下さい。" -#: src/honoka_imengine.cpp:573 +#: src/honoka_imengine.cpp:590 msgid "input mode" msgstr "入力モード" -#: src/honoka_imengine.cpp:577 src/honoka_imengine.cpp:585 -#: src/honoka_imengine.cpp:593 src/honoka_imengine.cpp:596 +#: src/honoka_imengine.cpp:594 src/honoka_imengine.cpp:602 +#: src/honoka_imengine.cpp:610 src/honoka_imengine.cpp:613 msgid "mode status" msgstr "状態" -#: src/honoka_imengine.cpp:581 +#: src/honoka_imengine.cpp:598 msgid "predictor" msgstr "予測エンジン" -#: src/honoka_imengine.cpp:589 +#: src/honoka_imengine.cpp:606 msgid "convertor" msgstr "変換エンジン" -#: src/honoka_imengine.cpp:598 +#: src/honoka_imengine.cpp:615 msgid "conversion mode" msgstr "変換モード" -#: src/honoka_imengine.cpp:621 +#: src/honoka_imengine.cpp:638 msgid "Kanji" msgstr "[漢]" -#: src/honoka_imengine.cpp:622 +#: src/honoka_imengine.cpp:639 msgid "Yosoku" msgstr "[予]" -#: src/honoka_imengine.cpp:628 +#: src/honoka_imengine.cpp:645 msgid "AUTO" msgstr "[逐]" -#: src/honoka_imengine.cpp:629 +#: src/honoka_imengine.cpp:646 msgid "REN" msgstr "[連]" -#: src/honoka_imengine.cpp:1385 src/honoka_imengine.cpp:1424 -#: src/honoka_imengine.cpp:1436 +#: src/honoka_imengine.cpp:1411 src/honoka_imengine.cpp:1450 +#: src/honoka_imengine.cpp:1462 msgid "could not connect to server." msgstr "サーバに接続できませんでした" -#: src/honoka_imengine.cpp:1394 +#: src/honoka_imengine.cpp:1420 msgid "The error was received from Converter. " msgstr "変換エンジンがエラーを返しよりました。" @@ -509,7 +509,7 @@ msgid "lookup result (M)" msgstr "必殺技候補" -#: src/acpredictor.cpp:110 +#: src/acpredictor.cpp:146 msgid "AutoConversion" msgstr "逐次変換" @@ -557,9 +557,10 @@ msgid "association lookup result" msgstr "連想変換" -#: plugins/wnnconversion.cpp:415 plugins/anthyconversion.cpp:147 -#: plugins/simpleprediction.cpp:70 plugins/primeprediction.cpp:125 -#: plugins/skkdicconversion.cpp:101 plugins/cannaconversion.cpp:175 +#: plugins/wnnconversion.cpp:415 plugins/anthyconversion.cpp:148 +#: plugins/anthyprediction.cpp:55 plugins/simpleprediction.cpp:70 +#: plugins/primeprediction.cpp:125 plugins/skkdicconversion.cpp:101 +#: plugins/cannaconversion.cpp:175 msgid "lookup result" msgstr "候補一覧" @@ -571,10 +572,14 @@ msgid "WnnPrediction" msgstr "Wnn予測" -#: plugins/anthyconversion.cpp:174 +#: plugins/anthyconversion.cpp:175 msgid "AnthyConversion" msgstr "Anthy変換" +#: plugins/anthyprediction.cpp:110 +msgid "AnthyPrediction" +msgstr "Anthy予測" + #: plugins/simpleprediction.cpp:111 msgid "SimplePrediction" msgstr "単純予測" diff --git a/honoka/src/honoka_imengine.cpp b/honoka/src/honoka_imengine.cpp index 1c53c27..d2cf17b 100644 --- a/honoka/src/honoka_imengine.cpp +++ b/honoka/src/honoka_imengine.cpp @@ -716,6 +716,15 @@ bool HonokaInstance::process_key_event (const KeyEvent& key) { + // debug + /* + String s; + scim_key_to_string(s,key); + update_aux_string(utf8_mbstowcs(String(key.is_key_release() ? String("R:") : String("P:")) + s)); + show_aux_string(); + return true; + */ + // �������٥�Ƚ����� if (key.is_key_release()) return false; KeyEvent ke = key;