diff -Nru fcitx-chewing-0.2.2/cmake/FindChewing.cmake fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/cmake/FindChewing.cmake --- fcitx-chewing-0.2.2/cmake/FindChewing.cmake 2014-04-21 22:01:08.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/cmake/FindChewing.cmake 2014-07-06 05:21:24.000000000 +0000 @@ -27,12 +27,11 @@ NAMES chewing HINTS ${PC_LIBCHEWING_LIBDIR}) +_pkgconfig_invoke("chewing" CHEWING DATADIR "" "--variable=datadir") + set(CHEWING_INCLUDE_DIR "${CHEWING_MAIN_INCLUDE_DIR}") -set(CHEWING_FOUND ${PC_LIBCHEWING_FOUND}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Chewing FOUND_VAR CHEWING_FOUND - REQUIRED_VARS CHEWING_LIBRARIES CHEWING_MAIN_INCLUDE_DIR - VERSION_VAR PC_LIBCHEWING_VERSION) +find_package_handle_standard_args(Chewing DEFAULT_MSG CHEWING_LIBRARIES CHEWING_MAIN_INCLUDE_DIR CHEWING_DATADIR) mark_as_advanced(CHEWING_INCLUDE_DIR CHEWING_LIBRARIES) diff -Nru fcitx-chewing-0.2.2/CMakeLists.txt fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/CMakeLists.txt --- fcitx-chewing-0.2.2/CMakeLists.txt 2014-04-21 22:01:08.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/CMakeLists.txt 2014-07-06 05:21:24.000000000 +0000 @@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) -FIND_PACKAGE(Chewing 0.4.0 REQUIRED) +FIND_PACKAGE(Chewing REQUIRED) FIND_PACKAGE(Fcitx 4.2.7 REQUIRED) _fcitx_add_uninstall_target() diff -Nru fcitx-chewing-0.2.2/debian/bzr-builder.manifest fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/debian/bzr-builder.manifest --- fcitx-chewing-0.2.2/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/debian/bzr-builder.manifest 2014-07-06 05:21:26.000000000 +0000 @@ -0,0 +1,3 @@ +# bzr-builder format 0.3 deb-version {debupstream}+59+201407060521 +lp:~fcitx-team/fcitx/autoimport-chewing-master revid:git-v1:479b1225ffb7c34e54746063bb0b9a48566c173b +nest-part packaging lp:~fcitx-team/fcitx/debian-chewing debian debian revid:git-v1:0c34e71bffb0d68c282e4da1800591e41aad006e diff -Nru fcitx-chewing-0.2.2/debian/changelog fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/debian/changelog --- fcitx-chewing-0.2.2/debian/changelog 2014-07-05 18:30:49.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/debian/changelog 2014-07-06 05:21:26.000000000 +0000 @@ -1,3 +1,9 @@ +fcitx-chewing (0.2.2+59+201407060521~ubuntu14.10.1) utopic; urgency=low + + * Auto build. + + -- Launchpad Package Builder Sun, 06 Jul 2014 05:21:26 +0000 + fcitx-chewing (0.2.2-1) unstable; urgency=low * New upstream release. diff -Nru fcitx-chewing-0.2.2/debian/source/format fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/debian/source/format --- fcitx-chewing-0.2.2/debian/source/format 2014-07-05 18:28:41.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/debian/source/format 2014-07-06 05:21:26.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru fcitx-chewing-0.2.2/.gitignore fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/.gitignore --- fcitx-chewing-0.2.2/.gitignore 2014-04-21 22:01:08.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -*~ -build*/ -.* -!.git* -.git/ -*.tar.* -*.kdev4 -*.kate-swp -*.orig -tags -astyle.sh -cscope.* -*.part diff -Nru fcitx-chewing-0.2.2/po/de.po fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/po/de.po --- fcitx-chewing-0.2.2/po/de.po 2014-04-21 22:01:08.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/po/de.po 2014-07-06 05:21:24.000000000 +0000 @@ -1,58 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: -# mar well , 2013 +# mar well , 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2013-04-25 00:01-0400\n" +"POT-Creation-Date: 2013-06-03 14:02-0400\n" "PO-Revision-Date: 2013-05-22 06:07+0000\n" -"Last-Translator: mar well \n" -"Language-Team: German (http://www.transifex.com/projects/p/fcitx/language/de/)\n" +"Last-Translator: mar well \n" +"Language-Team: German (http://www.transifex.com/projects/p/fcitx/language/" +"de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 -#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 -#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 -#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 -msgid "Chewing" -msgstr "Chewing" - -#: src/fcitx-chewing.conf.in:4 -msgid "Chewing Wrapper For Fcitx" -msgstr "Chewing Wrapper für Fcitx" - -#: src/fcitx-chewing.desc:3 -msgid "Selection Key" -msgstr "Auswahltaste" - #: src/fcitx-chewing.desc:6 msgid "1234567890" msgstr "1234567890" -#: src/fcitx-chewing.desc:7 -msgid "asdfghjkl;" -msgstr "asdfghjkl;" - -#: src/fcitx-chewing.desc:8 -msgid "asdfzxcv89" -msgstr "asdfzxcv89" - -#: src/fcitx-chewing.desc:9 -msgid "asdfjkl789" -msgstr "asdfjkl789" - -#: src/fcitx-chewing.desc:10 -msgid "aoeuhtn789" -msgstr "aoeuhtn789" - #: src/fcitx-chewing.desc:11 msgid "1234qweras" msgstr "1234qweras" @@ -61,37 +31,40 @@ msgid "Add Phrase Forward" msgstr "" +#: src/fcitx-chewing.desc:25 +msgid "Automatically shift cursor" +msgstr "Cursor automatisch anheben" + #: src/fcitx-chewing.desc:20 msgid "Backward phrase choice" msgstr "" -#: src/fcitx-chewing.desc:25 -msgid "Automatically shift cursor" -msgstr "Cursor automatisch anheben" +#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 +#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 +#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 +#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 +msgid "Chewing" +msgstr "Chewing" -#: src/fcitx-chewing.desc:30 -msgid "Space as selection key" -msgstr "SPACE als Auswahltaste" +#: src/fcitx-chewing.conf.in:4 +msgid "Chewing Wrapper For Fcitx" +msgstr "Chewing Wrapper für Fcitx" -#: src/fcitx-chewing.desc:35 -msgid "Keyboard Layout" -msgstr "Tastaturlayout" +#: src/fcitx-chewing.desc:46 +msgid "DACHEN_CP26 Keyboard" +msgstr "DACHEN_CP26 Tastatur" #: src/fcitx-chewing.desc:38 msgid "Default Keyboard" msgstr "Standard Tastatur" -#: src/fcitx-chewing.desc:39 -msgid "Hsu's Keyboard" -msgstr "Hsu's Tastatur" - -#: src/fcitx-chewing.desc:40 -msgid "IBM Keyboard" -msgstr "IBM Tastatur" +#: src/fcitx-chewing.desc:44 +msgid "Dvorak Keyboard" +msgstr "Dvorak Tastatur" -#: src/fcitx-chewing.desc:41 -msgid "Gin-Yieh Keyboard" -msgstr "Gin-Yieh Tastatur" +#: src/fcitx-chewing.desc:45 +msgid "Dvorak Keyboard with Hsu's support" +msgstr "Dvorak Keyboard mit Hsu's Unterstützung" #: src/fcitx-chewing.desc:42 msgid "ETen Keyboard" @@ -101,18 +74,46 @@ msgid "ETen26 Keyboard" msgstr "ETen26 Tastatur" -#: src/fcitx-chewing.desc:44 -msgid "Dvorak Keyboard" -msgstr "Dvorak Tastatur" - -#: src/fcitx-chewing.desc:45 -msgid "Dvorak Keyboard with Hsu's support" -msgstr "Dvorak Keyboard mit Hsu's Unterstützung" - -#: src/fcitx-chewing.desc:46 -msgid "DACHEN_CP26 Keyboard" -msgstr "DACHEN_CP26 Tastatur" +#: src/fcitx-chewing.desc:41 +msgid "Gin-Yieh Keyboard" +msgstr "Gin-Yieh Tastatur" #: src/fcitx-chewing.desc:47 msgid "Han-Yu PinYin Keyboard" msgstr "Han-Yu PinYin Tastatur" + +#: src/fcitx-chewing.desc:39 +msgid "Hsu's Keyboard" +msgstr "Hsu's Tastatur" + +#: src/fcitx-chewing.desc:40 +msgid "IBM Keyboard" +msgstr "IBM Tastatur" + +#: src/fcitx-chewing.desc:35 +msgid "Keyboard Layout" +msgstr "Tastaturlayout" + +#: src/fcitx-chewing.desc:3 +msgid "Selection Key" +msgstr "Auswahltaste" + +#: src/fcitx-chewing.desc:30 +msgid "Space as selection key" +msgstr "SPACE als Auswahltaste" + +#: src/fcitx-chewing.desc:10 +msgid "aoeuhtn789" +msgstr "aoeuhtn789" + +#: src/fcitx-chewing.desc:7 +msgid "asdfghjkl;" +msgstr "asdfghjkl;" + +#: src/fcitx-chewing.desc:9 +msgid "asdfjkl789" +msgstr "asdfjkl789" + +#: src/fcitx-chewing.desc:8 +msgid "asdfzxcv89" +msgstr "asdfzxcv89" diff -Nru fcitx-chewing-0.2.2/po/ja.po fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/po/ja.po --- fcitx-chewing-0.2.2/po/ja.po 2014-04-21 22:01:08.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/po/ja.po 2014-07-06 05:21:24.000000000 +0000 @@ -1,59 +1,29 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: -# shirou - しろう , 2013 -# shirou - しろう , 2013 +# しろう, 2013 +# しろう, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2013-04-25 00:01-0400\n" +"POT-Creation-Date: 2013-08-07 12:02-0400\n" "PO-Revision-Date: 2013-08-07 15:08+0000\n" -"Last-Translator: shirou - しろう \n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/ja/)\n" +"Last-Translator: しろう\n" +"Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/" +"ja/)\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 -#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 -#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 -#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 -msgid "Chewing" -msgstr "" - -#: src/fcitx-chewing.conf.in:4 -msgid "Chewing Wrapper For Fcitx" -msgstr "" - -#: src/fcitx-chewing.desc:3 -msgid "Selection Key" -msgstr "選択キー" - #: src/fcitx-chewing.desc:6 msgid "1234567890" msgstr "1234567890" -#: src/fcitx-chewing.desc:7 -msgid "asdfghjkl;" -msgstr "asdfghjkl;" - -#: src/fcitx-chewing.desc:8 -msgid "asdfzxcv89" -msgstr "asdfzxcv89" - -#: src/fcitx-chewing.desc:9 -msgid "asdfjkl789" -msgstr "asdfjkl789" - -#: src/fcitx-chewing.desc:10 -msgid "aoeuhtn789" -msgstr "aoeuhtn789" - #: src/fcitx-chewing.desc:11 msgid "1234qweras" msgstr "1234qweras" @@ -62,37 +32,40 @@ msgid "Add Phrase Forward" msgstr "" +#: src/fcitx-chewing.desc:25 +msgid "Automatically shift cursor" +msgstr "" + #: src/fcitx-chewing.desc:20 msgid "Backward phrase choice" msgstr "" -#: src/fcitx-chewing.desc:25 -msgid "Automatically shift cursor" +#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 +#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 +#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 +#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 +msgid "Chewing" msgstr "" -#: src/fcitx-chewing.desc:30 -msgid "Space as selection key" -msgstr "スペースを選択キーとして使う" +#: src/fcitx-chewing.conf.in:4 +msgid "Chewing Wrapper For Fcitx" +msgstr "" -#: src/fcitx-chewing.desc:35 -msgid "Keyboard Layout" -msgstr "キーボードレイアウト" +#: src/fcitx-chewing.desc:46 +msgid "DACHEN_CP26 Keyboard" +msgstr "DACHEN_CP26 キーボード" #: src/fcitx-chewing.desc:38 msgid "Default Keyboard" msgstr "既定のキーボード" -#: src/fcitx-chewing.desc:39 -msgid "Hsu's Keyboard" -msgstr "Hsu キーボード" - -#: src/fcitx-chewing.desc:40 -msgid "IBM Keyboard" -msgstr "IBM キーボード" +#: src/fcitx-chewing.desc:44 +msgid "Dvorak Keyboard" +msgstr "Dvorak キーボード" -#: src/fcitx-chewing.desc:41 -msgid "Gin-Yieh Keyboard" -msgstr "Gin-Yieh キーボード" +#: src/fcitx-chewing.desc:45 +msgid "Dvorak Keyboard with Hsu's support" +msgstr "Hsu サポートの Dvorak キーボード" #: src/fcitx-chewing.desc:42 msgid "ETen Keyboard" @@ -102,18 +75,46 @@ msgid "ETen26 Keyboard" msgstr "Eten26 キーボード" -#: src/fcitx-chewing.desc:44 -msgid "Dvorak Keyboard" -msgstr "Dvorak キーボード" - -#: src/fcitx-chewing.desc:45 -msgid "Dvorak Keyboard with Hsu's support" -msgstr "Hsu サポートの Dvorak キーボード" - -#: src/fcitx-chewing.desc:46 -msgid "DACHEN_CP26 Keyboard" -msgstr "DACHEN_CP26 キーボード" +#: src/fcitx-chewing.desc:41 +msgid "Gin-Yieh Keyboard" +msgstr "Gin-Yieh キーボード" #: src/fcitx-chewing.desc:47 msgid "Han-Yu PinYin Keyboard" msgstr "Han-Yu PinYin キーボード" + +#: src/fcitx-chewing.desc:39 +msgid "Hsu's Keyboard" +msgstr "Hsu キーボード" + +#: src/fcitx-chewing.desc:40 +msgid "IBM Keyboard" +msgstr "IBM キーボード" + +#: src/fcitx-chewing.desc:35 +msgid "Keyboard Layout" +msgstr "キーボードレイアウト" + +#: src/fcitx-chewing.desc:3 +msgid "Selection Key" +msgstr "選択キー" + +#: src/fcitx-chewing.desc:30 +msgid "Space as selection key" +msgstr "スペースを選択キーとして使う" + +#: src/fcitx-chewing.desc:10 +msgid "aoeuhtn789" +msgstr "aoeuhtn789" + +#: src/fcitx-chewing.desc:7 +msgid "asdfghjkl;" +msgstr "asdfghjkl;" + +#: src/fcitx-chewing.desc:9 +msgid "asdfjkl789" +msgstr "asdfjkl789" + +#: src/fcitx-chewing.desc:8 +msgid "asdfzxcv89" +msgstr "asdfzxcv89" diff -Nru fcitx-chewing-0.2.2/po/zh_CN.po fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/po/zh_CN.po --- fcitx-chewing-0.2.2/po/zh_CN.po 2014-04-21 22:01:08.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/po/zh_CN.po 2014-07-06 05:21:24.000000000 +0000 @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Xuetian Weng , 2010-2012 # Xuetian Weng , 2013 @@ -9,51 +9,21 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2013-04-25 00:01-0400\n" +"POT-Creation-Date: 2013-10-26 14:42-0400\n" "PO-Revision-Date: 2013-04-29 10:04+0000\n" "Last-Translator: Xuetian Weng \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/fcitx/language/zh_CN/)\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/fcitx/" +"language/zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 -#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 -#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 -#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 -msgid "Chewing" -msgstr "新酷音" - -#: src/fcitx-chewing.conf.in:4 -msgid "Chewing Wrapper For Fcitx" -msgstr "Fcitx 的 新酷音封装" - -#: src/fcitx-chewing.desc:3 -msgid "Selection Key" -msgstr "选词键" - #: src/fcitx-chewing.desc:6 msgid "1234567890" msgstr "1234567890" -#: src/fcitx-chewing.desc:7 -msgid "asdfghjkl;" -msgstr "asdfghjkl;" - -#: src/fcitx-chewing.desc:8 -msgid "asdfzxcv89" -msgstr "asdfzxcv89" - -#: src/fcitx-chewing.desc:9 -msgid "asdfjkl789" -msgstr "asdfjkl789" - -#: src/fcitx-chewing.desc:10 -msgid "aoeuhtn789" -msgstr "aoeuhtn789" - #: src/fcitx-chewing.desc:11 msgid "1234qweras" msgstr "1234qweras" @@ -62,37 +32,40 @@ msgid "Add Phrase Forward" msgstr "前方加词" +#: src/fcitx-chewing.desc:25 +msgid "Automatically shift cursor" +msgstr "选词完毕自动移到下一个词" + #: src/fcitx-chewing.desc:20 msgid "Backward phrase choice" msgstr "后方选择字词" -#: src/fcitx-chewing.desc:25 -msgid "Automatically shift cursor" -msgstr "选词完毕自动移到下一个词" +#: src/eim.c:144 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 +#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 +#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 +#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 +msgid "Chewing" +msgstr "新酷音" -#: src/fcitx-chewing.desc:30 -msgid "Space as selection key" -msgstr "空格键选词" +#: src/fcitx-chewing.conf.in:4 +msgid "Chewing Wrapper For Fcitx" +msgstr "Fcitx 的 新酷音封装" -#: src/fcitx-chewing.desc:35 -msgid "Keyboard Layout" -msgstr "键盘布局" +#: src/fcitx-chewing.desc:46 +msgid "DACHEN_CP26 Keyboard" +msgstr "大千26键键盘" #: src/fcitx-chewing.desc:38 msgid "Default Keyboard" msgstr "默认键盘" -#: src/fcitx-chewing.desc:39 -msgid "Hsu's Keyboard" -msgstr "许氏键盘" - -#: src/fcitx-chewing.desc:40 -msgid "IBM Keyboard" -msgstr "IBM键盘" +#: src/fcitx-chewing.desc:44 +msgid "Dvorak Keyboard" +msgstr "Dvorak键盘" -#: src/fcitx-chewing.desc:41 -msgid "Gin-Yieh Keyboard" -msgstr "精业键盘" +#: src/fcitx-chewing.desc:45 +msgid "Dvorak Keyboard with Hsu's support" +msgstr "Dvorak键盘 + 许氏注音" #: src/fcitx-chewing.desc:42 msgid "ETen Keyboard" @@ -102,18 +75,46 @@ msgid "ETen26 Keyboard" msgstr "倚天26键键盘" -#: src/fcitx-chewing.desc:44 -msgid "Dvorak Keyboard" -msgstr "Dvorak键盘" - -#: src/fcitx-chewing.desc:45 -msgid "Dvorak Keyboard with Hsu's support" -msgstr "Dvorak键盘 + 许氏注音" - -#: src/fcitx-chewing.desc:46 -msgid "DACHEN_CP26 Keyboard" -msgstr "大千26键键盘" +#: src/fcitx-chewing.desc:41 +msgid "Gin-Yieh Keyboard" +msgstr "精业键盘" #: src/fcitx-chewing.desc:47 msgid "Han-Yu PinYin Keyboard" msgstr "汉语拼音键盘" + +#: src/fcitx-chewing.desc:39 +msgid "Hsu's Keyboard" +msgstr "许氏键盘" + +#: src/fcitx-chewing.desc:40 +msgid "IBM Keyboard" +msgstr "IBM键盘" + +#: src/fcitx-chewing.desc:35 +msgid "Keyboard Layout" +msgstr "键盘布局" + +#: src/fcitx-chewing.desc:3 +msgid "Selection Key" +msgstr "选词键" + +#: src/fcitx-chewing.desc:30 +msgid "Space as selection key" +msgstr "空格键选词" + +#: src/fcitx-chewing.desc:10 +msgid "aoeuhtn789" +msgstr "aoeuhtn789" + +#: src/fcitx-chewing.desc:7 +msgid "asdfghjkl;" +msgstr "asdfghjkl;" + +#: src/fcitx-chewing.desc:9 +msgid "asdfjkl789" +msgstr "asdfjkl789" + +#: src/fcitx-chewing.desc:8 +msgid "asdfzxcv89" +msgstr "asdfzxcv89" diff -Nru fcitx-chewing-0.2.2/po/zh_TW.po fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/po/zh_TW.po --- fcitx-chewing-0.2.2/po/zh_TW.po 2014-04-21 22:01:08.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/po/zh_TW.po 2014-07-06 05:21:24.000000000 +0000 @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Alisha , 2012 # Cheng-Chia Tseng , 2012 @@ -12,50 +12,20 @@ "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" "POT-Creation-Date: 2013-04-25 00:01-0400\n" -"PO-Revision-Date: 2013-04-29 10:04+0000\n" +"PO-Revision-Date: 2013-04-11 19:01+0000\n" "Last-Translator: Xuetian Weng \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/fcitx/language/zh_TW/)\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/fcitx/" +"language/zh_TW/)\n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 -#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 -#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 -#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 -msgid "Chewing" -msgstr "新酷音" - -#: src/fcitx-chewing.conf.in:4 -msgid "Chewing Wrapper For Fcitx" -msgstr "Fcitx 的新酷音封装" - -#: src/fcitx-chewing.desc:3 -msgid "Selection Key" -msgstr "選詞鍵" - #: src/fcitx-chewing.desc:6 msgid "1234567890" msgstr "1234567890" -#: src/fcitx-chewing.desc:7 -msgid "asdfghjkl;" -msgstr "asdfghjkl;" - -#: src/fcitx-chewing.desc:8 -msgid "asdfzxcv89" -msgstr "asdfzxcv89" - -#: src/fcitx-chewing.desc:9 -msgid "asdfjkl789" -msgstr "asdfjkl789" - -#: src/fcitx-chewing.desc:10 -msgid "aoeuhtn789" -msgstr "aoeuhtn789" - #: src/fcitx-chewing.desc:11 msgid "1234qweras" msgstr "1234qweras" @@ -64,37 +34,40 @@ msgid "Add Phrase Forward" msgstr "前方加詞" +#: src/fcitx-chewing.desc:25 +msgid "Automatically shift cursor" +msgstr "選字完畢自動移到下一個字" + #: src/fcitx-chewing.desc:20 msgid "Backward phrase choice" msgstr "後方選擇字詞" -#: src/fcitx-chewing.desc:25 -msgid "Automatically shift cursor" -msgstr "選字完畢自動移到下一個字" +#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 +#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 +#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 +#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 +msgid "Chewing" +msgstr "新酷音" -#: src/fcitx-chewing.desc:30 -msgid "Space as selection key" -msgstr "使用空白鍵選擇候選字詞" +#: src/fcitx-chewing.conf.in:4 +msgid "Chewing Wrapper For Fcitx" +msgstr "Fcitx 的新酷音封装" -#: src/fcitx-chewing.desc:35 -msgid "Keyboard Layout" -msgstr "鍵盤配置" +#: src/fcitx-chewing.desc:46 +msgid "DACHEN_CP26 Keyboard" +msgstr "大千26鍵" #: src/fcitx-chewing.desc:38 msgid "Default Keyboard" msgstr "預設鍵盤" -#: src/fcitx-chewing.desc:39 -msgid "Hsu's Keyboard" -msgstr "許氏鍵盤" - -#: src/fcitx-chewing.desc:40 -msgid "IBM Keyboard" -msgstr "IBM 鍵盤" +#: src/fcitx-chewing.desc:44 +msgid "Dvorak Keyboard" +msgstr "Dvorak 鍵盤" -#: src/fcitx-chewing.desc:41 -msgid "Gin-Yieh Keyboard" -msgstr "精業鍵盤" +#: src/fcitx-chewing.desc:45 +msgid "Dvorak Keyboard with Hsu's support" +msgstr "Dvorak 鍵盤 + 許氏注音" #: src/fcitx-chewing.desc:42 msgid "ETen Keyboard" @@ -104,18 +77,46 @@ msgid "ETen26 Keyboard" msgstr "倚天26鍵鍵盤" -#: src/fcitx-chewing.desc:44 -msgid "Dvorak Keyboard" -msgstr "Dvorak 鍵盤" - -#: src/fcitx-chewing.desc:45 -msgid "Dvorak Keyboard with Hsu's support" -msgstr "Dvorak 鍵盤 + 許氏注音" - -#: src/fcitx-chewing.desc:46 -msgid "DACHEN_CP26 Keyboard" -msgstr "大千26鍵" +#: src/fcitx-chewing.desc:41 +msgid "Gin-Yieh Keyboard" +msgstr "精業鍵盤" #: src/fcitx-chewing.desc:47 msgid "Han-Yu PinYin Keyboard" msgstr "漢語拼音排列" + +#: src/fcitx-chewing.desc:39 +msgid "Hsu's Keyboard" +msgstr "許氏鍵盤" + +#: src/fcitx-chewing.desc:40 +msgid "IBM Keyboard" +msgstr "IBM 鍵盤" + +#: src/fcitx-chewing.desc:35 +msgid "Keyboard Layout" +msgstr "鍵盤配置" + +#: src/fcitx-chewing.desc:3 +msgid "Selection Key" +msgstr "選詞鍵" + +#: src/fcitx-chewing.desc:30 +msgid "Space as selection key" +msgstr "使用空白鍵選擇候選字詞" + +#: src/fcitx-chewing.desc:10 +msgid "aoeuhtn789" +msgstr "aoeuhtn789" + +#: src/fcitx-chewing.desc:7 +msgid "asdfghjkl;" +msgstr "asdfghjkl;" + +#: src/fcitx-chewing.desc:9 +msgid "asdfjkl789" +msgstr "asdfjkl789" + +#: src/fcitx-chewing.desc:8 +msgid "asdfzxcv89" +msgstr "asdfzxcv89" diff -Nru fcitx-chewing-0.2.2/src/eim.c fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/src/eim.c --- fcitx-chewing-0.2.2/src/eim.c 2014-04-21 22:01:08.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/src/eim.c 2014-07-06 05:21:24.000000000 +0000 @@ -102,6 +102,12 @@ fclose(fp); FcitxXDGGetFileUserWithPrefix("chewing", "", NULL, &user_path); FcitxLog(INFO, "Chewing storage path %s", user_path); + if (0 == chewing_Init(CHEWING_DATADIR, user_path)) { + FcitxLog(DEBUG, "chewing init ok"); + } else { + FcitxLog(DEBUG, "chewing init failed"); + return NULL; + } FcitxChewing* chewing = (FcitxChewing*) fcitx_utils_malloc0(sizeof(FcitxChewing)); FcitxGlobalConfig* config = FcitxInstanceGetGlobalConfig(instance); @@ -112,15 +118,6 @@ chewing->context = chewing_new(); ChewingContext * ctx = chewing->context; - - if (NULL == chewing->context) { - FcitxLog(DEBUG, "chewing init failed"); - free(chewing); - return NULL; - } else { - FcitxLog(DEBUG, "chewing init ok"); - } - chewing->owner = instance; chewing_set_maxChiSymbolLen(ctx, CHEWING_MAX_LEN); // chewing will crash without set page @@ -131,7 +128,6 @@ FcitxIMIFace iface; memset(&iface, 0, sizeof(FcitxIMIFace)); - iface.Init = FcitxChewingInit; iface.ResetIM = FcitxChewingReset; iface.DoInput = FcitxChewingDoInput; @@ -151,7 +147,6 @@ 1, "zh_TW" ); - return chewing; } @@ -166,7 +161,8 @@ INPUT_RETURN_VALUE FcitxChewingDoInput(void* arg, FcitxKeySym sym, unsigned int state) { FcitxChewing* chewing = (FcitxChewing*) arg; - ChewingContext* ctx = chewing->context; + ChewingContext * ctx = chewing->context; + int zuin_len; if (FcitxHotkeyIsHotKey(sym, state, FCITX_SPACE)) { chewing_handle_Space(ctx); @@ -176,20 +172,22 @@ int scan_code = (int) sym & 0xff; chewing_handle_Default(ctx, scan_code); } else if (FcitxHotkeyIsHotKey(sym, state, FCITX_BACKSPACE)) { - const char* zuin_str = chewing_bopomofo_String_static(ctx); - if (chewing_buffer_Len(ctx) == 0 && !zuin_str[0]) + char * zuin_str = chewing_zuin_String(ctx, &zuin_len); + chewing_free(zuin_str); + if (chewing_buffer_Len(ctx) + zuin_len == 0) return IRV_TO_PROCESS; chewing_handle_Backspace(ctx); - if (chewing_buffer_Len(ctx) == 0 && !zuin_str[0]) + if (chewing_buffer_Len(ctx) + zuin_len == 0) return IRV_CLEAN; } else if (FcitxHotkeyIsHotKey(sym, state, FCITX_ESCAPE)) { chewing_handle_Esc(ctx); } else if (FcitxHotkeyIsHotKey(sym, state, FCITX_DELETE)) { - const char* zuin_str = chewing_bopomofo_String_static(ctx); - if (chewing_buffer_Len(ctx) == 0 && !zuin_str[0]) + char * zuin_str = chewing_zuin_String(ctx, &zuin_len); + chewing_free(zuin_str); + if (chewing_buffer_Len(ctx) + zuin_len == 0) return IRV_TO_PROCESS; chewing_handle_Del(ctx); - if (chewing_buffer_Len(ctx) == 0 && !zuin_str[0]) + if (chewing_buffer_Len(ctx) + zuin_len == 0) return IRV_CLEAN; } else if (FcitxHotkeyIsHotKey(sym, state, FCITX_CHEWING_UP)) { chewing_handle_Up(ctx); @@ -221,7 +219,6 @@ // to do: more chewing_handle return IRV_TO_PROCESS; } - if (chewing_keystroke_CheckAbsorb(ctx)) { return IRV_DISPLAY_CANDWORDS; } else if (chewing_keystroke_CheckIgnore(ctx)) { @@ -232,9 +229,8 @@ FcitxInstanceCommitString(chewing->owner, ic, str); chewing_free(str); return IRV_DISPLAY_CANDWORDS; - } else { + } else return IRV_DISPLAY_CANDWORDS; - } } boolean FcitxChewingInit(void* arg) @@ -328,7 +324,7 @@ FcitxInstanceCleanInputWindow(chewing->owner); char * buf_str = chewing_buffer_String(ctx); - const char* zuin_str = chewing_bopomofo_String_static(ctx); + char * zuin_str = chewing_zuin_String(ctx, NULL); ConfigChewing(chewing); FcitxLog(DEBUG, "%s %s", buf_str, zuin_str); @@ -394,6 +390,7 @@ } while(0); chewing_free(buf_str); + chewing_free(zuin_str); return IRV_DISPLAY_CANDWORDS; } @@ -461,6 +458,7 @@ { FcitxChewing* chewing = (FcitxChewing*) arg; chewing_delete(chewing->context); + chewing_Terminate(); free(arg); } diff -Nru fcitx-chewing-0.2.2/src/eim.h fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/src/eim.h --- fcitx-chewing-0.2.2/src/eim.h 2014-04-21 22:01:08.000000000 +0000 +++ fcitx-chewing-0.2.2+59+201407060521~ubuntu14.10.1/src/eim.h 2014-07-06 05:21:24.000000000 +0000 @@ -38,7 +38,7 @@ __EXPORT_API void* FcitxChewingCreate(FcitxInstance* instance); __EXPORT_API void FcitxChewingDestroy(void* arg); __EXPORT_API INPUT_RETURN_VALUE FcitxChewingDoInput(void* arg, FcitxKeySym sym, unsigned int state); -__EXPORT_API INPUT_RETURN_VALUE FcitxChewingGetCandWords(void* arg); +__EXPORT_API INPUT_RETURN_VALUE FcitxChewingGetCandWords(void *arg); __EXPORT_API boolean FcitxChewingInit(void*); __EXPORT_API void FcitxChewingReset(void* arg); @@ -56,7 +56,7 @@ typedef struct _FcitxChewing { FcitxChewingConfig config; FcitxInstance* owner; - ChewingContext* context; + ChewingContext * context; } FcitxChewing; CONFIG_BINDING_DECLARE(FcitxChewingConfig);