diff --git a/honoka/po/POTFILES.in b/honoka/po/POTFILES.in index e43d241..1b390bf 100644 --- a/honoka/po/POTFILES.in +++ b/honoka/po/POTFILES.in @@ -5,3 +5,11 @@ src/romkan.cpp src/kanainput.h src/kanainput.cpp +src/wnnconversion.h +src/wnnconversion.cpp +src/anthyconversion.h +src/anthyconversion.cpp +src/preeditor.h +src/preeditor.cpp +src/convertor.h +src/convertor.cpp diff --git a/honoka/po/honoka.pot b/honoka/po/honoka.pot index e4b919f..6960f18 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-04-08 16:51+0900\n" +"POT-Creation-Date: 2005-04-13 11:14+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,72 +16,61 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/honoka_imengine.cpp:85 src/honoka_imengine.cpp:92 +#: src/honoka_imengine.cpp:92 src/honoka_imengine.cpp:99 #: src/honoka_imengine_setup.cpp:96 msgid "Honoka" msgstr "" -#: src/honoka_imengine.cpp:105 +#: src/honoka_imengine.cpp:112 msgid "ja_JP" msgstr "" -#: src/honoka_imengine.cpp:117 +#: src/honoka_imengine.cpp:124 msgid "(C) 2004 TAM(Teppei Tamra) " msgstr "" -#: src/honoka_imengine.cpp:127 +#: src/honoka_imengine.cpp:134 msgid "SCIM-WNN HELP" msgstr "" -#: src/honoka_imengine.cpp:339 +#: src/honoka_imengine.cpp:370 msgid "input mode" msgstr "" -#: src/honoka_imengine.cpp:343 src/honoka_imengine.cpp:346 +#: src/honoka_imengine.cpp:374 src/honoka_imengine.cpp:381 +#: src/honoka_imengine.cpp:384 msgid "mode status" msgstr "" -#: src/honoka_imengine.cpp:348 +#: src/honoka_imengine.cpp:377 +msgid "convertor" +msgstr "" + +#: src/honoka_imengine.cpp:386 msgid "conversion mode" msgstr "" -#: src/honoka_imengine.cpp:359 +#: src/honoka_imengine.cpp:402 msgid "Kanji" msgstr "" -#: src/honoka_imengine.cpp:360 +#: src/honoka_imengine.cpp:403 msgid "Yosoku" msgstr "" -#: src/honoka_imengine.cpp:366 +#: src/honoka_imengine.cpp:409 msgid "AUTO" msgstr "" -#: src/honoka_imengine.cpp:367 +#: src/honoka_imengine.cpp:410 msgid "REN" msgstr "" -#: src/honoka_imengine.cpp:908 src/honoka_imengine.cpp:916 -#: src/honoka_imengine.cpp:943 src/honoka_imengine.cpp:955 +#: src/honoka_imengine.cpp:974 src/honoka_imengine.cpp:982 +#: src/honoka_imengine.cpp:1009 src/honoka_imengine.cpp:1021 msgid "could not connect to jserver." msgstr "" -#: src/honoka_imengine.cpp:995 -msgid "Ikeiji lookup result" -msgstr "" - -#: src/honoka_imengine.cpp:999 -msgid "association lookup result" -msgstr "" - -#: src/honoka_imengine.cpp:1003 -msgid "yosoku lookup result" -msgstr "" - -#: src/honoka_imengine.cpp:1007 -msgid "lookup result" -msgstr "" - #: src/honoka_imengine_setup.cpp:101 msgid "A Honoka IMEngine Module." msgstr "" @@ -510,3 +499,19 @@ #: src/kanainput.cpp:140 msgid "Kana" msgstr "" + +#: src/wnnconversion.cpp:349 +msgid "yosoku lookup result" +msgstr "" + +#: src/wnnconversion.cpp:401 +msgid "Ikeiji lookup result" +msgstr "" + +#: src/wnnconversion.cpp:407 +msgid "association lookup result" +msgstr "" + +#: src/wnnconversion.cpp:414 src/anthyconversion.cpp:163 +msgid "lookup result" +msgstr "" diff --git a/honoka/po/ja.po b/honoka/po/ja.po index 8b9b85c..e3097a1 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-04-08 16:51+0900\n" +"POT-Creation-Date: 2005-04-13 11:14+0900\n" "PO-Revision-Date: 2004-12-01 14:29+0900\n" "Last-Translator: ＴＡＭ (Teppei Tamra) \n" "Language-Team: Japanese\n" @@ -18,72 +18,61 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: src/honoka_imengine.cpp:85 src/honoka_imengine.cpp:92 +#: src/honoka_imengine.cpp:92 src/honoka_imengine.cpp:99 #: src/honoka_imengine_setup.cpp:96 msgid "Honoka" msgstr "ほのか" -#: src/honoka_imengine.cpp:105 +#: src/honoka_imengine.cpp:112 msgid "ja_JP" msgstr "ja_JP" -#: src/honoka_imengine.cpp:117 +#: src/honoka_imengine.cpp:124 msgid "(C) 2004 TAM(Teppei Tamra) " msgstr "(C) 2004 TAM(Teppei Tamra) " -#: src/honoka_imengine.cpp:127 +#: src/honoka_imengine.cpp:134 msgid "SCIM-WNN HELP" msgstr "適当にそれっぽく操作して下さい。" -#: src/honoka_imengine.cpp:339 +#: src/honoka_imengine.cpp:370 msgid "input mode" msgstr "入力モード" -#: src/honoka_imengine.cpp:343 src/honoka_imengine.cpp:346 +#: src/honoka_imengine.cpp:374 src/honoka_imengine.cpp:381 +#: src/honoka_imengine.cpp:384 msgid "mode status" msgstr "状態" -#: src/honoka_imengine.cpp:348 +#: src/honoka_imengine.cpp:377 +msgid "convertor" +msgstr "変換エンジン" + +#: src/honoka_imengine.cpp:386 msgid "conversion mode" msgstr "変換モード" -#: src/honoka_imengine.cpp:359 +#: src/honoka_imengine.cpp:402 msgid "Kanji" msgstr "[漢]" -#: src/honoka_imengine.cpp:360 +#: src/honoka_imengine.cpp:403 msgid "Yosoku" msgstr "[予]" -#: src/honoka_imengine.cpp:366 +#: src/honoka_imengine.cpp:409 msgid "AUTO" msgstr "[逐]" -#: src/honoka_imengine.cpp:367 +#: src/honoka_imengine.cpp:410 msgid "REN" msgstr "[連]" -#: src/honoka_imengine.cpp:908 src/honoka_imengine.cpp:916 -#: src/honoka_imengine.cpp:943 src/honoka_imengine.cpp:955 +#: src/honoka_imengine.cpp:974 src/honoka_imengine.cpp:982 +#: src/honoka_imengine.cpp:1009 src/honoka_imengine.cpp:1021 msgid "could not connect to jserver." msgstr "サーバに接続できませんでした" -#: src/honoka_imengine.cpp:995 -msgid "Ikeiji lookup result" -msgstr "異形字変換" - -#: src/honoka_imengine.cpp:999 -msgid "association lookup result" -msgstr "連想変換" - -#: src/honoka_imengine.cpp:1003 -msgid "yosoku lookup result" -msgstr "予測候補" - -#: src/honoka_imengine.cpp:1007 -msgid "lookup result" -msgstr "候補一覧" - #: src/honoka_imengine_setup.cpp:101 msgid "A Honoka IMEngine Module." msgstr "ほのかIMエンジンモジュール" @@ -513,5 +502,21 @@ msgid "Kana" msgstr "かな入力" +#: src/wnnconversion.cpp:349 +msgid "yosoku lookup result" +msgstr "予測候補" + +#: src/wnnconversion.cpp:401 +msgid "Ikeiji lookup result" +msgstr "異形字変換" + +#: src/wnnconversion.cpp:407 +msgid "association lookup result" +msgstr "連想変換" + +#: src/wnnconversion.cpp:414 src/anthyconversion.cpp:163 +msgid "lookup result" +msgstr "候補一覧" + #~ msgid "Wnn" #~ msgstr "Wnn" diff --git a/honoka/src/anthyconversion.cpp b/honoka/src/anthyconversion.cpp index b039399..ed5ec78 100644 --- a/honoka/src/anthyconversion.cpp +++ b/honoka/src/anthyconversion.cpp @@ -19,6 +19,23 @@ ***************************************************************************/ #include "anthyconversion.h" +#ifdef HAVE_CONFIG_H + #include +#endif + +#ifdef HAVE_GETTEXT + #include + #define _(String) dgettext(GETTEXT_PACKAGE,String) + #define N_(String) (String) +#else + #define _(String) (String) + #define N_(String) (String) + #define bindtextdomain(Package,Directory) + #define textdomain(domain) + #define bind_textdomain_codeset(domain,codeset) +#endif + + AnthyConversion::AnthyConversion(ConfigPointer cfg) : Convertor(cfg) { @@ -143,6 +160,7 @@ for(int i = 0;i < stat.nr_segment;i ++) { ResultList l; l.kType = 0; + l.Title = utf8_mbstowcs(String(_("lookup result"))); struct anthy_segment_stat sstat; anthy_get_segment_stat(context,0,&sstat); l.count = sstat.nr_candidate; diff --git a/honoka/src/anthyconversion.h b/honoka/src/anthyconversion.h index 0cd0595..2ac8891 100644 --- a/honoka/src/anthyconversion.h +++ b/honoka/src/anthyconversion.h @@ -20,11 +20,6 @@ #ifndef ANTHYCONVERSION_H #define ANTHYCONVERSION_H -#ifdef HAVE_CONFIG_H -#include -#endif - - #define Uses_SCIM_CONFIG_BASE #include diff --git a/honoka/src/convertor.h b/honoka/src/convertor.h index 64d535c..98b197d 100644 --- a/honoka/src/convertor.h +++ b/honoka/src/convertor.h @@ -41,6 +41,7 @@ class ResultList{ public: WideString Yomi; + WideString Title; int pos; int count; int kType; diff --git a/honoka/src/honoka_imengine.cpp b/honoka/src/honoka_imengine.cpp index 14d26e3..1e9b995 100644 --- a/honoka/src/honoka_imengine.cpp +++ b/honoka/src/honoka_imengine.cpp @@ -1056,24 +1056,7 @@ createLookupTable(m_convList); if (m_convList.count == 0) return; m_lookup = true; - switch(m_convList.kType) { - case IKEIJI: { - update_aux_string(utf8_mbstowcs(String(_("Ikeiji lookup result")))); - break; - } - case RENSOU: { - update_aux_string(utf8_mbstowcs(String(_("association lookup result")))); - break; - } - case YOSOKU: { - update_aux_string(utf8_mbstowcs(String(_("yosoku lookup result")))); - break; - } - default: { - update_aux_string(utf8_mbstowcs(String(_("lookup result")))); - break; - } - } + update_aux_string(m_convList.Title); show_aux_string(); show_lookup_table(); } diff --git a/honoka/src/wnnconversion.cpp b/honoka/src/wnnconversion.cpp index 01892e6..1b411ae 100644 --- a/honoka/src/wnnconversion.cpp +++ b/honoka/src/wnnconversion.cpp @@ -346,6 +346,7 @@ convList.count = 0; convList.pos = 0; convList.kType = YOSOKU; + convList.Title = utf8_mbstowcs(String(_("yosoku lookup result"))); #ifdef HAVE_LIBWNN7 String s; m_iconv.convert(s,convList.Yomi); @@ -397,17 +398,20 @@ case IKEIJI: { convList.pos = jl_zenikeiji_dai(wnn,pos,pos + 1,conn,WNN_UNIQ); convList.kType = IKEIJI; + convList.Title = utf8_mbstowcs(String(_("Ikeiji lookup result"))); break; } case RENSOU: { convList.pos = jl_zenassoc_dai(wnn,pos,pos + 1,conn,WNN_UNIQ); convList.kType = RENSOU; + convList.Title = utf8_mbstowcs(String(_("association lookup result"))); break; } #endif default: { convList.pos = jl_zenkouho_dai(wnn,pos,pos + 1,conn,WNN_UNIQ); convList.kType = DEFAULT; + convList.Title = utf8_mbstowcs(String(_("lookup result"))); break; } }