diff --git a/honoka/po/honoka.pot b/honoka/po/honoka.pot index 000aa36..7556378 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: 2006-06-29 16:31+0900\n" +"POT-Creation-Date: 2006-08-21 16:41+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,59 +33,80 @@ msgid "HONOKA-HELP" msgstr "" -#: src/honoka_imengine.cpp:659 +#: src/honoka_imengine.cpp:690 +msgid "expand" +msgstr "" + +#: src/honoka_imengine.cpp:691 +msgid "shrink" +msgstr "" + +#: src/honoka_imengine.cpp:694 msgid "input mode" msgstr "" -#: src/honoka_imengine.cpp:663 src/honoka_imengine.cpp:671 -#: src/honoka_imengine.cpp:679 src/honoka_imengine.cpp:683 -#: src/honoka_imengine.cpp:691 src/honoka_imengine.cpp:694 +#: src/honoka_imengine.cpp:698 src/honoka_imengine.cpp:706 +#: src/honoka_imengine.cpp:714 src/honoka_imengine.cpp:718 +#: src/honoka_imengine.cpp:726 src/honoka_imengine.cpp:733 +#: src/honoka_imengine.cpp:737 msgid "mode status" msgstr "" -#: src/honoka_imengine.cpp:667 +#: src/honoka_imengine.cpp:702 msgid "predictor" msgstr "" -#: src/honoka_imengine.cpp:676 +#: src/honoka_imengine.cpp:711 msgid "splitter" msgstr "" -#: src/honoka_imengine.cpp:679 src/honoka_imengine.cpp:715 +#: src/honoka_imengine.cpp:714 src/honoka_imengine.cpp:759 msgid "Auto" msgstr "" -#: src/honoka_imengine.cpp:687 +#: src/honoka_imengine.cpp:722 msgid "convertor" msgstr "" -#: src/honoka_imengine.cpp:696 +#: src/honoka_imengine.cpp:729 +msgid "filter" +msgstr "" + +#: src/honoka_imengine.cpp:739 msgid "conversion mode" msgstr "" -#: src/honoka_imengine.cpp:726 +#: src/honoka_imengine.cpp:777 msgid "Kanji" msgstr "" -#: src/honoka_imengine.cpp:727 +#: src/honoka_imengine.cpp:778 msgid "Yosoku" msgstr "" -#: src/honoka_imengine.cpp:733 +#: src/honoka_imengine.cpp:784 msgid "AUTO" msgstr "" -#: src/honoka_imengine.cpp:734 +#: src/honoka_imengine.cpp:785 msgid "REN" msgstr "" -#: src/honoka_imengine.cpp:1715 src/honoka_imengine.cpp:1736 -#: src/honoka_imengine.cpp:1794 src/honoka_imengine.cpp:1806 +#: src/honoka_imengine.cpp:790 +msgid ">>" +msgstr "" + +#: src/honoka_imengine.cpp:791 +msgid "<<" +msgstr "" + +#: src/honoka_imengine.cpp:1799 src/honoka_imengine.cpp:1820 +#: src/honoka_imengine.cpp:1878 src/honoka_imengine.cpp:1890 msgid "could not connect to server." msgstr "" -#: src/honoka_imengine.cpp:1722 src/honoka_imengine.cpp:1745 -#: src/honoka_imengine.cpp:1759 +#: src/honoka_imengine.cpp:1806 src/honoka_imengine.cpp:1829 +#: src/honoka_imengine.cpp:1843 msgid "The error was received from Converter. " msgstr "" diff --git a/honoka/po/ja.po b/honoka/po/ja.po index f9bc5eb..cbed488 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: 2006-06-29 16:31+0900\n" +"POT-Creation-Date: 2006-08-21 16:41+0900\n" "PO-Revision-Date: 2004-12-01 14:29+0900\n" "Last-Translator: TAM (Teppei Tamra) \n" "Language-Team: Japanese\n" @@ -37,59 +37,80 @@ "詳細は以下をどぞ。\n" "http://nop.net-p.org/modules/pukiwiki/index.php?honoka" -#: src/honoka_imengine.cpp:659 +#: src/honoka_imengine.cpp:690 +msgid "expand" +msgstr "ニョキーン" + +#: src/honoka_imengine.cpp:691 +msgid "shrink" +msgstr "ショボーン" + +#: src/honoka_imengine.cpp:694 msgid "input mode" msgstr "入力モード" -#: src/honoka_imengine.cpp:663 src/honoka_imengine.cpp:671 -#: src/honoka_imengine.cpp:679 src/honoka_imengine.cpp:683 -#: src/honoka_imengine.cpp:691 src/honoka_imengine.cpp:694 +#: src/honoka_imengine.cpp:698 src/honoka_imengine.cpp:706 +#: src/honoka_imengine.cpp:714 src/honoka_imengine.cpp:718 +#: src/honoka_imengine.cpp:726 src/honoka_imengine.cpp:733 +#: src/honoka_imengine.cpp:737 msgid "mode status" msgstr "状態" -#: src/honoka_imengine.cpp:667 +#: src/honoka_imengine.cpp:702 msgid "predictor" msgstr "予測エンジン" -#: src/honoka_imengine.cpp:676 +#: src/honoka_imengine.cpp:711 msgid "splitter" msgstr "文節区切" -#: src/honoka_imengine.cpp:679 src/honoka_imengine.cpp:715 +#: src/honoka_imengine.cpp:714 src/honoka_imengine.cpp:759 msgid "Auto" msgstr "自動" -#: src/honoka_imengine.cpp:687 +#: src/honoka_imengine.cpp:722 msgid "convertor" msgstr "変換エンジン" -#: src/honoka_imengine.cpp:696 +#: src/honoka_imengine.cpp:729 +msgid "filter" +msgstr "フィルタ" + +#: src/honoka_imengine.cpp:739 msgid "conversion mode" msgstr "変換モード" -#: src/honoka_imengine.cpp:726 +#: src/honoka_imengine.cpp:777 msgid "Kanji" msgstr "[漢]" -#: src/honoka_imengine.cpp:727 +#: src/honoka_imengine.cpp:778 msgid "Yosoku" msgstr "[予]" -#: src/honoka_imengine.cpp:733 +#: src/honoka_imengine.cpp:784 msgid "AUTO" msgstr "[逐]" -#: src/honoka_imengine.cpp:734 +#: src/honoka_imengine.cpp:785 msgid "REN" msgstr "[連]" -#: src/honoka_imengine.cpp:1715 src/honoka_imengine.cpp:1736 -#: src/honoka_imengine.cpp:1794 src/honoka_imengine.cpp:1806 +#: src/honoka_imengine.cpp:790 +msgid ">>" +msgstr ">>" + +#: src/honoka_imengine.cpp:791 +msgid "<<" +msgstr "<<" + +#: src/honoka_imengine.cpp:1799 src/honoka_imengine.cpp:1820 +#: src/honoka_imengine.cpp:1878 src/honoka_imengine.cpp:1890 msgid "could not connect to server." msgstr "サーバに接続できませんでした" -#: src/honoka_imengine.cpp:1722 src/honoka_imengine.cpp:1745 -#: src/honoka_imengine.cpp:1759 +#: src/honoka_imengine.cpp:1806 src/honoka_imengine.cpp:1829 +#: src/honoka_imengine.cpp:1843 msgid "The error was received from Converter. " msgstr "変換エンジンがエラーを返しよりました。" diff --git a/honoka/src/honoka_def.h b/honoka/src/honoka_def.h index 6a0d0dc..09cc72c 100644 --- a/honoka/src/honoka_def.h +++ b/honoka/src/honoka_def.h @@ -137,6 +137,7 @@ #define HONOKA_PROP_CONVERTOR "/IMEngine/Honoka/Property/Convertor" #define HONOKA_PROP_PREDICTOR "/IMEngine/Honoka/Property/Predictor" #define HONOKA_PROP_SPLITTER "/IMEngine/Honoka/Property/Splitter" +#define HONOKA_PROP_FILTER "/IMEngine/Honoka/Property/Filter" #define HONOKA_PROP_SHRINK "/IMEngine/Honoka/Property/ShrinkToolbar" #define HONOKA_PREVIOUS_PREEDITOR "/IMEngine/Honoka/PreviousSetting/PreEditor" diff --git a/honoka/src/honoka_imengine.cpp b/honoka/src/honoka_imengine.cpp index 246e614..2dfad2b 100644 --- a/honoka/src/honoka_imengine.cpp +++ b/honoka/src/honoka_imengine.cpp @@ -726,6 +726,13 @@ convertors[i]->getPropertyName(),String(""),_("mode status")); m_proplist.push_back(p); } + p = Property(HONOKA_PROP_FILTER,"",String(""),_("filter")); + m_proplist.push_back(p); + for(unsigned int i = 0;i < filters.size();i ++) { + p = Property(String(HONOKA_PROP_FILTER) + String("/") + filters[i]->getName(), + filters[i]->getPropertyName(),String(""),_("mode status")); + m_proplist.push_back(p); + } } p = Property(HONOKA_PROP_MODESTATUS,"",String(""),_("mode status")); m_proplist.push_back(p); @@ -759,6 +766,11 @@ it->set_label(m_convertor->getPropertyName() + String(" ")); update_property(*it); } + it = find(m_proplist.begin(),m_proplist.end(),HONOKA_PROP_FILTER); + if (it != m_proplist.end()) { + it->set_label(m_filter->getPropertyName() + String(" ")); + update_property(*it); + } } it = find(m_proplist.begin(),m_proplist.end(),HONOKA_PROP_MODESTATUS); if (it != m_proplist.end()) { @@ -1735,6 +1747,12 @@ updateProperty(); } + s = HONOKA_PROP_FILTER; + if ((property.length() > s.length()) && (property.substr(0,s.length()) == s)) { + changeFilter(property.substr(s.length() + 1)); + updateProperty(); + } + s = HONOKA_PROP_CONVERSIONMODE; if (property == s) { auto_conversion ? auto_conversion = false : auto_conversion = true;