Hello community, here is the log from the commit of package fcitx-sunpinyin for openSUSE:Factory checked in at 2013-01-29 13:12:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-sunpinyin (Old) and /work/SRC/openSUSE:Factory/.fcitx-sunpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-sunpinyin", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-sunpinyin/fcitx-sunpinyin.changes 2012-09-20 15:29:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-sunpinyin.new/fcitx-sunpinyin.changes 2013-01-29 13:12:43.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 26 18:51:02 UTC 2013 - [email protected] + +- update version 0.4.0 + * adjust some default configuration for better user experience. +- fcitx-sunpinyin-0.4.0-compat-gcc46.patch + * fix gcc 4.6 builds with 12.1 and below + * remove next release + +------------------------------------------------------------------- Old: ---- fcitx-sunpinyin-0.3.9.tar.bz2 New: ---- fcitx-sunpinyin-0.4.0-compat-gcc46.patch fcitx-sunpinyin-0.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-sunpinyin.spec ++++++ --- /var/tmp/diff_new_pack.AGyO1N/_old 2013-01-29 13:12:44.000000000 +0100 +++ /var/tmp/diff_new_pack.AGyO1N/_new 2013-01-29 13:12:44.000000000 +0100 @@ -18,7 +18,7 @@ Name: fcitx-sunpinyin -Version: 0.3.9 +Version: 0.4.0 Release: 0 Summary: Sunpinyin module for fcitx Group: System/I18n/Chinese @@ -40,6 +40,8 @@ BuildRequires: libtool #Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.bz2 +# fix-for-opensuse [email protected] - fix builds with gcc 4.6 +Patch1: fcitx-sunpinyin-0.4.0-compat-gcc46.patch Provides: locale(fcitx:zh_CN;zh_SG) %description @@ -60,6 +62,9 @@ %prep %setup -q -n %{name}-%{version} +%if 0%{?suse_version} <= 1210 +%patch1 -p1 +%endif %build %{__mkdir} -pv build ++++++ fcitx-sunpinyin-0.4.0-compat-gcc46.patch ++++++ diff --git a/src/eim.cpp b/src/eim.cpp index e09521f..c1c898f 100644 --- a/src/eim.cpp +++ b/src/eim.cpp @@ -49,8 +49,8 @@ extern "C" { #endif FCITX_DEFINE_PLUGIN(fcitx_sunpinyin, ime, FcitxIMClass) = { - .Create = FcitxSunpinyinCreate, - .Destroy = FcitxSunpinyinDestroy + FcitxSunpinyinCreate, + FcitxSunpinyinDestroy }; #ifdef __cplusplus } ++++++ fcitx-sunpinyin-0.3.9.tar.bz2 -> fcitx-sunpinyin-0.4.0.tar.bz2 ++++++ ++++ 1828 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/.gitignore new/fcitx-sunpinyin-0.4.0/.gitignore --- old/fcitx-sunpinyin-0.3.9/.gitignore 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/.gitignore 2013-01-24 03:34:57.000000000 +0100 @@ -1,14 +1,13 @@ *~ -build/* -data/pinyin.tar.gz -data/pinyin.tar.gz.md5 -data/table/table.tar.gz -data/table/table.tar.gz.md5 -fcitx-sunpinyin.kdev4 -tools/pybase.mb -tools/pyphrase.mb -data/desc.po -.kdev_include_paths -.kdev4 -.directory +build*/ +.* +!.git* +.git/ +*.tar.* +*.kdev4 *.kate-swp +*.orig +tags +astyle.sh +cscope.* +*.part diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/CMakeLists.txt new/fcitx-sunpinyin-0.4.0/CMakeLists.txt --- old/fcitx-sunpinyin-0.3.9/CMakeLists.txt 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/CMakeLists.txt 2013-01-24 03:34:57.000000000 +0100 @@ -1,28 +1,22 @@ -cmake_minimum_required (VERSION 2.6) - +cmake_minimum_required(VERSION 2.6) project(fcitx-sunpinyin) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) option(ENABLE_TEST "enable function test" Off) -FIND_PACKAGE(Libintl REQUIRED) -FIND_PACKAGE(Gettext REQUIRED) -FIND_PACKAGE(Fcitx 4.2.4 REQUIRED) +find_package(Libintl REQUIRED) +find_package(Fcitx 4.2.7 REQUIRED) find_package(Sunpinyin REQUIRED) -string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" FCITX4_MAJOR_VERSION "${FCITX4_VERSION}") -string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" FCITX4_MINOR_VERSION "${FCITX4_VERSION}") -string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" FCITX4_PATCH_VERSION "${FCITX4_VERSION}") - -# uninstall target -configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) +_fcitx_add_uninstall_target() -add_custom_target(uninstall - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) +string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" + FCITX4_MAJOR_VERSION "${FCITX4_VERSION}") +string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" + FCITX4_MINOR_VERSION "${FCITX4_VERSION}") +string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" + FCITX4_PATCH_VERSION "${FCITX4_VERSION}") set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}") @@ -30,20 +24,19 @@ set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}") if(NOT DEFINED LIB_INSTALL_DIR) - set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) + set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) endif() set(libdir ${LIB_INSTALL_DIR}) - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" - "${CMAKE_CURRENT_BINARY_DIR}/config.h") + "${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/config.h") +add_subdirectory(po) add_subdirectory(src) add_subdirectory(data) -add_subdirectory(po) -if (ENABLE_TEST) - enable_testing() - add_subdirectory(test) -endif (ENABLE_TEST) +if(ENABLE_TEST) + enable_testing() + add_subdirectory(test) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/COPYING new/fcitx-sunpinyin-0.4.0/COPYING --- old/fcitx-sunpinyin-0.3.9/COPYING 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/COPYING 2013-01-24 03:34:57.000000000 +0100 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/INSTALL new/fcitx-sunpinyin-0.4.0/INSTALL --- old/fcitx-sunpinyin-0.3.9/INSTALL 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/INSTALL 2013-01-24 03:34:57.000000000 +0100 @@ -3,7 +3,7 @@ To compile and install, go in the source directory and type: mkdir build; cd build -cmake .. +cmake .. (If you want to install in a different path, use instead: cmake .. -DCMAKE_INSTALL_PREFIX=/install/path) make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/cmake/FindLibintl.cmake new/fcitx-sunpinyin-0.4.0/cmake/FindLibintl.cmake --- old/fcitx-sunpinyin-0.3.9/cmake/FindLibintl.cmake 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/cmake/FindLibintl.cmake 2013-01-24 03:34:57.000000000 +0100 @@ -9,25 +9,25 @@ # present in libc. Must have more robust system for release, where Gettext # functionality can also reside in standalone Gettext library, or the one # embedded within kdelibs (cf. gettext.m4 from Gettext source). - + # Copyright (c) 2006, Chusslove Illich, <[email protected]> # Copyright (c) 2007, Alexander Neundorf, <[email protected]> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - + if(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND) set(Libintl_FIND_QUIETLY TRUE) endif(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND) - + find_path(LIBINTL_INCLUDE_DIR libintl.h) - + set(LIBINTL_LIB_FOUND FALSE) - + if(LIBINTL_INCLUDE_DIR) include(CheckFunctionExists) check_function_exists(dgettext LIBINTL_LIBC_HAS_DGETTEXT) - + if (LIBINTL_LIBC_HAS_DGETTEXT) set(LIBINTL_LIBRARIES) set(LIBINTL_LIB_FOUND TRUE) @@ -37,10 +37,10 @@ set(LIBINTL_LIB_FOUND TRUE) endif(LIBINTL_LIBRARIES) endif (LIBINTL_LIBC_HAS_DGETTEXT) - + endif(LIBINTL_INCLUDE_DIR) - + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libintl DEFAULT_MSG LIBINTL_INCLUDE_DIR LIBINTL_LIB_FOUND) - -mark_as_advanced(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARIES LIBINTL_LIBC_HAS_DGETTEXT LIBINTL_LIB_FOUND) \ No newline at end of file + +mark_as_advanced(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARIES LIBINTL_LIBC_HAS_DGETTEXT LIBINTL_LIB_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/cmake/FindSunpinyin.cmake new/fcitx-sunpinyin-0.4.0/cmake/FindSunpinyin.cmake --- old/fcitx-sunpinyin-0.3.9/cmake/FindSunpinyin.cmake 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/cmake/FindSunpinyin.cmake 2013-01-24 03:34:57.000000000 +0100 @@ -11,27 +11,27 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. if(SUNPINYIN_INCLUDE_DIR AND SUNPINYIN_LIBRARIES) - # Already in cache, be silent - set(SUNPINYIN_FIND_QUIETLY TRUE) + # Already in cache, be silent + set(SUNPINYIN_FIND_QUIETLY TRUE) endif(SUNPINYIN_INCLUDE_DIR AND SUNPINYIN_LIBRARIES) find_package(PkgConfig REQUIRED) pkg_check_modules(PC_LIBSUNPINYIN "sunpinyin-2.0>=2.0.4") find_path(SUNPINYIN_MAIN_INCLUDE_DIR - NAMES sunpinyin.h - HINTS ${PC_LIBSUNPINYIN_INCLUDEDIR}) + NAMES sunpinyin.h + HINTS ${PC_LIBSUNPINYIN_INCLUDEDIR}) find_library(SUNPINYIN_LIBRARIES - NAMES sunpinyin - HINTS ${PC_LIBSUNPINYIN_LIBDIR}) + NAMES sunpinyin + HINTS ${PC_LIBSUNPINYIN_LIBDIR}) set(SUNPINYIN_INCLUDE_DIR "${SUNPINYIN_MAIN_INCLUDE_DIR}") include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Sunpinyin DEFAULT_MSG - SUNPINYIN_LIBRARIES - SUNPINYIN_MAIN_INCLUDE_DIR - ) +find_package_handle_standard_args(Sunpinyin DEFAULT_MSG + SUNPINYIN_LIBRARIES + SUNPINYIN_MAIN_INCLUDE_DIR) -mark_as_advanced(SUNPINYIN_MAIN_INCLUDE_DIR SUNPINYIN_INCLUDE_DIR SUNPINYIN_LIBRARIES) +mark_as_advanced(SUNPINYIN_MAIN_INCLUDE_DIR SUNPINYIN_INCLUDE_DIR + SUNPINYIN_LIBRARIES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/cmake/cmake_uninstall.cmake.in new/fcitx-sunpinyin-0.4.0/cmake/cmake_uninstall.cmake.in --- old/fcitx-sunpinyin-0.3.9/cmake/cmake_uninstall.cmake.in 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/cmake/cmake_uninstall.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") - message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") -endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") - -file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) -string(REGEX REPLACE "\n" ";" files "${files}") -foreach (file ${files}) - message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") - if (EXISTS "$ENV{DESTDIR}${file}" OR IS_SYMLINK "$ENV{DESTDIR}${file}") - execute_process( - COMMAND @CMAKE_COMMAND@ -E remove "$ENV{DESTDIR}${file}" - OUTPUT_VARIABLE rm_out - RESULT_VARIABLE rm_retval - ) - if(NOT ${rm_retval} EQUAL 0) - message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") - endif (NOT ${rm_retval} EQUAL 0) - else (EXISTS "$ENV{DESTDIR}${file}" OR IS_SYMLINK "$ENV{DESTDIR}${file}") - message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") - endif (EXISTS "$ENV{DESTDIR}${file}" OR IS_SYMLINK "$ENV{DESTDIR}${file}") -endforeach(file) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/data/CMakeLists.txt new/fcitx-sunpinyin-0.4.0/data/CMakeLists.txt --- old/fcitx-sunpinyin-0.3.9/data/CMakeLists.txt 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/data/CMakeLists.txt 2013-01-24 03:34:57.000000000 +0100 @@ -1,13 +1,14 @@ -fcitx_add_addon_conf_file(fcitx-sunpinyin.conf) -fcitx_add_configdesc_file(fcitx-sunpinyin.desc) - -fcitx_add_inputmethod_conf_file(sunpinyin.conf) - foreach(size 16 22 24 32 48 128) - install(FILES sunpinyin-logo-${size}.png RENAME fcitx-sunpinyin.png DESTINATION share/icons/hicolor/${size}x${size}/apps) -endforeach(size 16 22 24 32 48 128) -install(FILES sunpinyin-logo-22.png DESTINATION share/fcitx/skin/dark RENAME sunpinyin.png) -install(FILES sunpinyin-logo-16.png DESTINATION share/fcitx/skin/default RENAME sunpinyin.png) -install(FILES sunpinyin-logo-16.png DESTINATION share/fcitx/skin/classic RENAME sunpinyin.png) + install(FILES sunpinyin-logo-${size}.png + RENAME fcitx-sunpinyin.png + DESTINATION share/icons/hicolor/${size}x${size}/apps) +endforeach() -install(FILES sunpinyin-logo-48.png DESTINATION share/fcitx/imicon RENAME sunpinyin.png) +install(FILES sunpinyin-logo-16.png + DESTINATION share/fcitx/skin/default RENAME sunpinyin.png) +install(FILES sunpinyin-logo-16.png + DESTINATION share/fcitx/skin/classic RENAME sunpinyin.png) +install(FILES sunpinyin-logo-22.png + DESTINATION share/fcitx/skin/dark RENAME sunpinyin.png) +install(FILES sunpinyin-logo-48.png + DESTINATION share/fcitx/imicon RENAME sunpinyin.png) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/data/fcitx-sunpinyin.conf.in new/fcitx-sunpinyin-0.4.0/data/fcitx-sunpinyin.conf.in --- old/fcitx-sunpinyin-0.3.9/data/fcitx-sunpinyin.conf.in 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/data/fcitx-sunpinyin.conf.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -[Addon] -Name=fcitx-sunpinyin -_GeneralName=Sunpinyin -_Comment=Sunpinyin Wrapper For Fcitx -Category=InputMethod -Enabled=True -Library=fcitx-sunpinyin.so -Type=SharedLibrary -Dependency= -IMRegisterMethod=ConfigFile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/data/fcitx-sunpinyin.desc new/fcitx-sunpinyin-0.4.0/data/fcitx-sunpinyin.desc --- old/fcitx-sunpinyin-0.3.9/data/fcitx-sunpinyin.desc 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/data/fcitx-sunpinyin.desc 1970-01-01 01:00:00.000000000 +0100 @@ -1,157 +0,0 @@ -[Sunpinyin/UseShuangpin] -Type=Boolean -DefaultValue=False -Description=Use Shuangpin Instead of Quanpin - -[Sunpinyin/ShuangpinScheme] -Type=Enum -DefaultValue=MS2003 -EnumCount=6 -Enum0=MS2003 -Enum1=ABC -Enum2=ZIRANMA -Enum3=PINYINJIAJIA -Enum4=ZIGUANG -Enum5=XIAOHE -Description=Shuangpin Scheme in Sunpinyin - -[Sunpinyin/FuzzySegmentation] -Type=Boolean -DefaultValue=True -Description=Fuzzy Segmentation - -[Sunpinyin/FuzzyInnerSegmentation] -Type=Boolean -DefaultValue=True -Description=Fuzzy Inner Segmentation - -[Sunpinyin/MaxBest] -Type=Enum -DefaultValue=1 -EnumCount=3 -Enum0=1 -Enum1=2 -Enum2=3 -Description=Number of sentence that sunpinyin guess - -[Sunpinyin/MaxTail] -Type=Enum -DefaultValue=0 -EnumCount=3 -Enum0=0 -Enum1=1 -Enum2=2 -Description=Number of Best Tail Candidate - -[Sunpinyin/MemoryStrength] -Type=Integer -DefaultValue=3 -Description=Memory Strength - -[Sunpinyin/ProcessPunc] -Type=Boolean -DefaultValue=False -Description=Let sunpinyin process punctuation - -[QuanPin/FuzzyZhiZi] -Type=Boolean -DefaultValue=False -Description=Fuzzy Zhi Zi - -[QuanPin/FuzzyChiCi] -Type=Boolean -DefaultValue=False -Description=Fuzzy Chi Ci - -[QuanPin/FuzzyShiSi] -Type=Boolean -DefaultValue=False -Description=Fuzzy Shi Si - -[QuanPin/FuzzyAnAng] -Type=Boolean -DefaultValue=False -Description=Fuzzy An Ang - -[QuanPin/FuzzyOnOng] -Type=Boolean -DefaultValue=False -Description=Fuzzy On Ong - -[QuanPin/FuzzyEnEng] -Type=Boolean -DefaultValue=False -Description=Fuzzy En Eng - -[QuanPin/FuzzyInIng] -Type=Boolean -DefaultValue=False -Description=Fuzzy In Ing - -[QuanPin/FuzzyEngOng] -Type=Boolean -DefaultValue=False -Description=Fuzzy Eng Ong - -[QuanPin/FuzzyIanIang] -Type=Boolean -DefaultValue=False -Description=Fuzzy Ian Iang - -[QuanPin/FuzzyUanUang] -Type=Boolean -DefaultValue=False -Description=Fuzzy Uan Uang - -[QuanPin/FuzzyNeLe] -Type=Boolean -DefaultValue=False -Description=Fuzzy Ne Le - -[QuanPin/FuzzyFoHe] -Type=Boolean -DefaultValue=False -Description=Fuzzy Fo He - -[QuanPin/FuzzyLeRi] -Type=Boolean -DefaultValue=False -Description=Fuzzy Le Ri - -[QuanPin/FuzzyKeGe] -Type=Boolean -DefaultValue=False -Description=Fuzzy Ke Ge - -[QuanPin/AutoCorrectingIgnIng] -Type=Boolean -DefaultValue=False -Description=AutoCorrect Ign Ing - -[QuanPin/AutoCorrectingOgnOng] -Type=Boolean -DefaultValue=False -Description=AutoCorrect Ogn Ong - -[QuanPin/AutoCorrectingUenUn] -Type=Boolean -DefaultValue=False -Description=AutoCorrect Uen Un - -[QuanPin/AutoCorrectingImgIng] -Type=Boolean -DefaultValue=False -Description=AutoCorrect Img Ing - -[QuanPin/AutoCorrectingIouIu] -Type=Boolean -DefaultValue=False -Description=AutoCorrect Iou Iu - -[QuanPin/AutoCorrectingUeiUi] -Type=Boolean -DefaultValue=False -Description=AutoCorrect Uei Ui - -[DescriptionFile] -LocaleDomain=fcitx-sunpinyin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/data/sunpinyin.conf.in new/fcitx-sunpinyin-0.4.0/data/sunpinyin.conf.in --- old/fcitx-sunpinyin-0.3.9/data/sunpinyin.conf.in 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/data/sunpinyin.conf.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -[InputMethod] -UniqueName=sunpinyin -_Name=Sunpinyin -IconName=sunpinyin -Priority=1 -LangCode=zh_CN -Parent=fcitx-sunpinyin \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/po/CMakeLists.txt new/fcitx-sunpinyin-0.4.0/po/CMakeLists.txt --- old/fcitx-sunpinyin-0.3.9/po/CMakeLists.txt 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/po/CMakeLists.txt 2013-01-24 03:34:57.000000000 +0100 @@ -1,26 +1,5 @@ -file(GLOB PO_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po) -file(RELATIVE_PATH REL_SOURCE_ROOT ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}) -if ("${REL_SOURCE_ROOT}" STREQUAL "") - set(REL_SOURCE_ROOT ".") -endif("${REL_SOURCE_ROOT}" STREQUAL "") - -set(POT_FILE fcitx-sunpinyin.pot) - -configure_file(POTFILES.in.in ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in) - -extract_fcitx_addon_conf_postring() - -add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/desc.po - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/getdescpo ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS getdescpo) - -add_custom_target( - pot - COMMAND INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT} srcdir=${CMAKE_CURRENT_BINARY_DIR} ${INTLTOOL_UPDATE} --gettext-package fcitx-sunpinyin --pot - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/conf.po ${CMAKE_CURRENT_BINARY_DIR}/desc.po - ) - -# Update .po files and compile them to binary .gmo files -gettext_create_translations(${POT_FILE} ALL ${PO_FILES}) - +set(PO_LANGS zh_CN zh_TW) +foreach(lang ${PO_LANGS}) + fcitx_translate_add_po_file("${lang}" "${lang}.po") +endforeach() +fcitx_translate_set_pot_target(pot fcitx-sunpinyin fcitx-sunpinyin.pot) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/po/POTFILES.in.in new/fcitx-sunpinyin-0.4.0/po/POTFILES.in.in --- old/fcitx-sunpinyin-0.3.9/po/POTFILES.in.in 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/po/POTFILES.in.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# List of source files which contain translatable strings. -./po/desc.po -./po/conf.po -@REL_SOURCE_ROOT@/src/eim.cpp -@REL_SOURCE_ROOT@/src/eim.h -@REL_SOURCE_ROOT@/src/handler.cpp -@REL_SOURCE_ROOT@/src/handler.h -@REL_SOURCE_ROOT@/src/config.cpp -@REL_SOURCE_ROOT@/data/fcitx-sunpinyin.conf.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/po/getdescpo new/fcitx-sunpinyin-0.4.0/po/getdescpo --- old/fcitx-sunpinyin-0.3.9/po/getdescpo 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/po/getdescpo 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -#!/bin/sh -filename=desc.po -indir=$1 -outdir=$2 - -cd "$outdir" - -rm -f "$outdir/$filename"; touch "$outdir/$filename" - -cat > "$outdir/$filename" <<EOF -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-11-17 11:48+0800\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -EOF - -cd $indir - -descfiles=`find "$indir" -name ".hg" -prune -or -name "test" -prune -or -iname "*.desc" | grep desc` - -# Extract Description -for f in $descfiles -do - awk '/^[\t ]*Description=/ { print "\n#: '$f':" NR"\n" "msgid \"" substr($0, 13)"\"\n" "msgstr \"\""}' "$f" >> "$outdir/$filename" -done - -# Extract Group Name -grep -nH '^\[' $descfiles | grep -v 'DescriptionFile' | awk ' "^[" { split($0, a, ":"); split(a[3], b, "/"); print substr(b[1], 2); }' | sort | uniq | awk '{ print "# unknown\nmsgid \""$0"\"\nmsgstr \"\"\n"; }' >> "$outdir/$filename" - -# Extract Enum Name -grep -h 'Enum[0-9]' $descfiles | sed -e 's/Enum[0-9]=//g' | sort | uniq | awk '{ print "#: unknown\nmsgid \""$0"\"\nmsgstr \"\"\n"; }' >> "$outdir/$filename" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/po/zh_CN.po new/fcitx-sunpinyin-0.4.0/po/zh_CN.po --- old/fcitx-sunpinyin-0.3.9/po/zh_CN.po 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/po/zh_CN.po 2013-01-24 03:34:57.000000000 +0100 @@ -1,185 +1,197 @@ -# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Weng Xuetian <[email protected]>, 2010, 2011, 2012. +# Weng Xuetian <[email protected]>, 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: fcitx\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-16 11:44+0800\n" -"PO-Revision-Date: 2012-07-14 08:40+0000\n" -"Last-Translator: csslayer <[email protected]>\n" -"Language-Team: Chinese (China) <[email protected]>\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2013-01-23 20:34-0500\n" +"PO-Revision-Date: 2013-01-23 20:35-0500\n" +"Last-Translator: Weng Xuetian <[email protected]>\n" +"Language-Team: Chinese Simplified <[email protected]>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Lokalize 1.5\n" -#: unknown +#: src/fcitx-sunpinyin.desc:41 msgid "0" -msgstr "" +msgstr "0" -#: unknown +#: src/fcitx-sunpinyin.desc:32 src/fcitx-sunpinyin.desc:42 msgid "1" -msgstr "" +msgstr "1" -#: unknown +#: src/fcitx-sunpinyin.desc:33 src/fcitx-sunpinyin.desc:43 msgid "2" -msgstr "" +msgstr "2" -#: unknown +#: src/fcitx-sunpinyin.desc:34 msgid "3" -msgstr "" +msgstr "3" -#: unknown +#: src/fcitx-sunpinyin.desc:11 msgid "ABC" msgstr "智能 ABC" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:129 -msgid "AutoCorrect Ign Ing" -msgstr "自动更正 ign/ing" - -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:144 +#: src/fcitx-sunpinyin.desc:139 msgid "AutoCorrect Img Ing" msgstr "自动更正 img/ing" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:149 +#: src/fcitx-sunpinyin.desc:144 msgid "AutoCorrect Iou Iu" msgstr "自动更正 iou/iu" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:134 -msgid "AutoCorrect Ogn Ong" -msgstr "自动更正 ogn/ong" - -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:154 +#: src/fcitx-sunpinyin.desc:149 msgid "AutoCorrect Uei Ui" msgstr "自动更正 uei/ui" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:139 +#: src/fcitx-sunpinyin.desc:134 msgid "AutoCorrect Uen Un" msgstr "自动更正 uen/un" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:74 +#: src/fcitx-sunpinyin.desc:129 +msgid "AutoCorrect gn ng" +msgstr "自动更正 gn/ng" + +#: src/fcitx-sunpinyin.desc:74 msgid "Fuzzy An Ang" msgstr "模糊 an/ang" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:64 +#: src/fcitx-sunpinyin.desc:64 msgid "Fuzzy Chi Ci" msgstr "模糊 chi/ci" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:84 +#: src/fcitx-sunpinyin.desc:84 msgid "Fuzzy En Eng" msgstr "模糊 en/eng" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:94 +#: src/fcitx-sunpinyin.desc:94 msgid "Fuzzy Eng Ong" msgstr "模糊 eng/ong" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:114 +#: src/fcitx-sunpinyin.desc:114 msgid "Fuzzy Fo He" msgstr "模糊 f/h" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:99 +#: src/fcitx-sunpinyin.desc:99 msgid "Fuzzy Ian Iang" msgstr "模糊 ian/iang" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:89 +#: src/fcitx-sunpinyin.desc:89 msgid "Fuzzy In Ing" msgstr "模糊 in/ing" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:26 +#: src/fcitx-sunpinyin.desc:26 msgid "Fuzzy Inner Segmentation" msgstr "支持内模糊音节 (xian->xi'an)" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:124 +#: src/fcitx-sunpinyin.desc:124 msgid "Fuzzy Ke Ge" msgstr "模糊 k/g" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:119 +#: src/fcitx-sunpinyin.desc:119 msgid "Fuzzy Le Ri" msgstr "模糊 l/r" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:109 +#: src/fcitx-sunpinyin.desc:109 msgid "Fuzzy Ne Le" msgstr "模糊 n/l" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:79 +#: src/fcitx-sunpinyin.desc:79 msgid "Fuzzy On Ong" msgstr "模糊 on/ong" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:21 +#: src/fcitx-sunpinyin.desc:21 msgid "Fuzzy Segmentation" msgstr "模糊切分" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:69 +#: src/fcitx-sunpinyin.desc:69 msgid "Fuzzy Shi Si" msgstr "模糊 shi/si" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:104 +#: src/fcitx-sunpinyin.desc:104 msgid "Fuzzy Uan Uang" msgstr "模糊 uan/uang" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:59 +#: src/fcitx-sunpinyin.desc:59 msgid "Fuzzy Zhi Zi" msgstr "模糊 zhi/zi" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:54 +#: src/fcitx-sunpinyin.desc:54 msgid "Let sunpinyin process punctuation" msgstr "让 Sunpinyin 处理标点" -#: unknown +#: src/fcitx-sunpinyin.desc:10 msgid "MS2003" msgstr "微软 2003" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:49 +#: src/fcitx-sunpinyin.desc:49 msgid "Memory Strength" msgstr "记忆强度" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:44 +#: src/fcitx-sunpinyin.desc:44 msgid "Number of Best Tail Candidate" -msgstr "" +msgstr "最佳尾候选数" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:35 +#: src/fcitx-sunpinyin.desc:35 msgid "Number of sentence that sunpinyin guess" -msgstr "" +msgstr "Sunpinyin 猜测的句子个数" -#: unknown +#: src/fcitx-sunpinyin.desc:13 msgid "PINYINJIAJIA" msgstr "拼音加加" # unknown +#: src/fcitx-sunpinyin.desc:56 src/fcitx-sunpinyin.desc:61 +#: src/fcitx-sunpinyin.desc:66 src/fcitx-sunpinyin.desc:71 +#: src/fcitx-sunpinyin.desc:76 src/fcitx-sunpinyin.desc:81 +#: src/fcitx-sunpinyin.desc:86 src/fcitx-sunpinyin.desc:91 +#: src/fcitx-sunpinyin.desc:96 src/fcitx-sunpinyin.desc:101 +#: src/fcitx-sunpinyin.desc:106 src/fcitx-sunpinyin.desc:111 +#: src/fcitx-sunpinyin.desc:116 src/fcitx-sunpinyin.desc:121 +#: src/fcitx-sunpinyin.desc:126 src/fcitx-sunpinyin.desc:131 +#: src/fcitx-sunpinyin.desc:136 src/fcitx-sunpinyin.desc:141 +#: src/fcitx-sunpinyin.desc:146 msgid "QuanPin" msgstr "全拼" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:16 +#: src/fcitx-sunpinyin.desc:16 msgid "Shuangpin Scheme in Sunpinyin" msgstr "Sunpinyin 的双拼方案" # unknown -#: /home/saber/Develop/fcitx-sunpinyin/build/po/tmp/fcitx-sunpinyin.conf.in.h:1 -#: /home/saber/Develop/fcitx-sunpinyin/build/po/../..//src/eim.cpp:378 +#: src/eim.cpp:407 src/fcitx-sunpinyin.conf.in:3 src/sunpinyin.conf.in:3 +#: src/fcitx-sunpinyin.desc:1 src/fcitx-sunpinyin.desc:6 +#: src/fcitx-sunpinyin.desc:18 src/fcitx-sunpinyin.desc:23 +#: src/fcitx-sunpinyin.desc:28 src/fcitx-sunpinyin.desc:37 +#: src/fcitx-sunpinyin.desc:46 src/fcitx-sunpinyin.desc:51 msgid "Sunpinyin" msgstr "Sunpinyin" -#: /home/saber/Develop/fcitx-sunpinyin/build/po/tmp/fcitx-sunpinyin.conf.in.h:2 +#: src/fcitx-sunpinyin.conf.in:4 msgid "Sunpinyin Wrapper For Fcitx" msgstr "Fcitx 的 Sunpinyin 封装" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:4 +#: src/fcitx-sunpinyin.desc:4 msgid "Use Shuangpin Instead of Quanpin" msgstr "使用双拼而不是全拼" -#: unknown +#: src/fcitx-sunpinyin.desc:15 msgid "XIAOHE" msgstr "小鹤" -#: unknown +#: src/fcitx-sunpinyin.desc:14 msgid "ZIGUANG" msgstr "紫光" -#: unknown +#: src/fcitx-sunpinyin.desc:12 msgid "ZIRANMA" msgstr "自然码" + +#~ msgid "AutoCorrect Ogn Ong" +#~ msgstr "自动更正 ogn/ong" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/po/zh_TW.po new/fcitx-sunpinyin-0.4.0/po/zh_TW.po --- old/fcitx-sunpinyin-0.3.9/po/zh_TW.po 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/po/zh_TW.po 2013-01-24 03:34:57.000000000 +0100 @@ -1,187 +1,199 @@ -# 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 <[email protected]>, 2012. -# Weng Xuetian <[email protected]>, 2012. +# Weng Xuetian <[email protected]>, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: fcitx\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-16 11:44+0800\n" -"PO-Revision-Date: 2012-07-14 08:40+0000\n" -"Last-Translator: csslayer <[email protected]>\n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/fcitx/"; -"language/zh_TW/)\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2013-01-23 20:34-0500\n" +"PO-Revision-Date: 2013-01-23 20:35-0500\n" +"Last-Translator: Weng Xuetian <[email protected]>\n" +"Language-Team: Chinese Simplified <[email protected]>\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" +"X-Generator: Lokalize 1.5\n" -#: unknown +#: src/fcitx-sunpinyin.desc:41 msgid "0" -msgstr "" +msgstr "0" -#: unknown +#: src/fcitx-sunpinyin.desc:32 src/fcitx-sunpinyin.desc:42 msgid "1" -msgstr "" +msgstr "1" -#: unknown +#: src/fcitx-sunpinyin.desc:33 src/fcitx-sunpinyin.desc:43 msgid "2" -msgstr "" +msgstr "2" -#: unknown +#: src/fcitx-sunpinyin.desc:34 msgid "3" -msgstr "" +msgstr "3" -#: unknown +#: src/fcitx-sunpinyin.desc:11 msgid "ABC" msgstr "智能ABC" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:129 -msgid "AutoCorrect Ign Ing" -msgstr "自動校正 ign/ing" - -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:144 +#: src/fcitx-sunpinyin.desc:139 msgid "AutoCorrect Img Ing" msgstr "自動校正 img/ing" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:149 +#: src/fcitx-sunpinyin.desc:144 msgid "AutoCorrect Iou Iu" msgstr "自動校正 img/ing" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:134 -msgid "AutoCorrect Ogn Ong" -msgstr "自動校正 ogn/ong" - -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:154 +#: src/fcitx-sunpinyin.desc:149 msgid "AutoCorrect Uei Ui" msgstr "自動校正 uei/ui" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:139 +#: src/fcitx-sunpinyin.desc:134 msgid "AutoCorrect Uen Un" msgstr "自動校正 uen/un" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:74 +#: src/fcitx-sunpinyin.desc:129 +msgid "AutoCorrect gn ng" +msgstr "自動校正 gn/ng" + +#: src/fcitx-sunpinyin.desc:74 msgid "Fuzzy An Ang" msgstr "模糊 an/ang" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:64 +#: src/fcitx-sunpinyin.desc:64 msgid "Fuzzy Chi Ci" msgstr "模糊 chi/ci" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:84 +#: src/fcitx-sunpinyin.desc:84 msgid "Fuzzy En Eng" msgstr "模糊 en/eng" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:94 +#: src/fcitx-sunpinyin.desc:94 msgid "Fuzzy Eng Ong" msgstr "模糊 eng/ong" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:114 +#: src/fcitx-sunpinyin.desc:114 msgid "Fuzzy Fo He" msgstr "模糊 f/h" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:99 +#: src/fcitx-sunpinyin.desc:99 msgid "Fuzzy Ian Iang" msgstr "模糊 ian/iang" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:89 +#: src/fcitx-sunpinyin.desc:89 msgid "Fuzzy In Ing" msgstr "模糊 in/ing" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:26 +#: src/fcitx-sunpinyin.desc:26 msgid "Fuzzy Inner Segmentation" msgstr "支援內模糊音節 (xian->xi'an)" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:124 +#: src/fcitx-sunpinyin.desc:124 msgid "Fuzzy Ke Ge" msgstr "模糊 k/g" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:119 +#: src/fcitx-sunpinyin.desc:119 msgid "Fuzzy Le Ri" msgstr "模糊 l/r" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:109 +#: src/fcitx-sunpinyin.desc:109 msgid "Fuzzy Ne Le" msgstr "模糊 n/l" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:79 +#: src/fcitx-sunpinyin.desc:79 msgid "Fuzzy On Ong" msgstr "模糊 on/ong" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:21 +#: src/fcitx-sunpinyin.desc:21 msgid "Fuzzy Segmentation" msgstr "模糊切分" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:69 +#: src/fcitx-sunpinyin.desc:69 msgid "Fuzzy Shi Si" msgstr "模糊 shi/si" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:104 +#: src/fcitx-sunpinyin.desc:104 msgid "Fuzzy Uan Uang" msgstr "模糊 uan/uang" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:59 +#: src/fcitx-sunpinyin.desc:59 msgid "Fuzzy Zhi Zi" msgstr "模糊 zhi/zi" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:54 +#: src/fcitx-sunpinyin.desc:54 msgid "Let sunpinyin process punctuation" msgstr "讓 Sunpinyin 處理標點" -#: unknown +#: src/fcitx-sunpinyin.desc:10 msgid "MS2003" msgstr "微軟 2003" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:49 +#: src/fcitx-sunpinyin.desc:49 msgid "Memory Strength" msgstr "記憶強度" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:44 +#: src/fcitx-sunpinyin.desc:44 msgid "Number of Best Tail Candidate" -msgstr "" +msgstr "最佳尾候選數" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:35 +#: src/fcitx-sunpinyin.desc:35 msgid "Number of sentence that sunpinyin guess" -msgstr "" +msgstr "Sunpinyin 猜測的句子數" -#: unknown +#: src/fcitx-sunpinyin.desc:13 msgid "PINYINJIAJIA" msgstr "拼音加加" # unknown +#: src/fcitx-sunpinyin.desc:56 src/fcitx-sunpinyin.desc:61 +#: src/fcitx-sunpinyin.desc:66 src/fcitx-sunpinyin.desc:71 +#: src/fcitx-sunpinyin.desc:76 src/fcitx-sunpinyin.desc:81 +#: src/fcitx-sunpinyin.desc:86 src/fcitx-sunpinyin.desc:91 +#: src/fcitx-sunpinyin.desc:96 src/fcitx-sunpinyin.desc:101 +#: src/fcitx-sunpinyin.desc:106 src/fcitx-sunpinyin.desc:111 +#: src/fcitx-sunpinyin.desc:116 src/fcitx-sunpinyin.desc:121 +#: src/fcitx-sunpinyin.desc:126 src/fcitx-sunpinyin.desc:131 +#: src/fcitx-sunpinyin.desc:136 src/fcitx-sunpinyin.desc:141 +#: src/fcitx-sunpinyin.desc:146 msgid "QuanPin" msgstr "全拼" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:16 +#: src/fcitx-sunpinyin.desc:16 msgid "Shuangpin Scheme in Sunpinyin" msgstr "Sunpinyin 的雙拼機制" # unknown -#: /home/saber/Develop/fcitx-sunpinyin/build/po/tmp/fcitx-sunpinyin.conf.in.h:1 -#: /home/saber/Develop/fcitx-sunpinyin/build/po/../..//src/eim.cpp:378 +#: src/eim.cpp:407 src/fcitx-sunpinyin.conf.in:3 src/sunpinyin.conf.in:3 +#: src/fcitx-sunpinyin.desc:1 src/fcitx-sunpinyin.desc:6 +#: src/fcitx-sunpinyin.desc:18 src/fcitx-sunpinyin.desc:23 +#: src/fcitx-sunpinyin.desc:28 src/fcitx-sunpinyin.desc:37 +#: src/fcitx-sunpinyin.desc:46 src/fcitx-sunpinyin.desc:51 msgid "Sunpinyin" msgstr "Sunpinyin" -#: /home/saber/Develop/fcitx-sunpinyin/build/po/tmp/fcitx-sunpinyin.conf.in.h:2 +#: src/fcitx-sunpinyin.conf.in:4 msgid "Sunpinyin Wrapper For Fcitx" msgstr "Fcitx 的 Sunpinyin 封装" -#: /home/saber/Develop/fcitx-sunpinyin/data/fcitx-sunpinyin.desc:4 +#: src/fcitx-sunpinyin.desc:4 msgid "Use Shuangpin Instead of Quanpin" msgstr "使用雙拼而不使用全拼" -#: unknown +#: src/fcitx-sunpinyin.desc:15 msgid "XIAOHE" msgstr "小鶴" -#: unknown +#: src/fcitx-sunpinyin.desc:14 msgid "ZIGUANG" msgstr "紫光" -#: unknown +#: src/fcitx-sunpinyin.desc:12 msgid "ZIRANMA" msgstr "自然碼" + +#~ msgid "AutoCorrect Ogn Ong" +#~ msgstr "自動校正 ogn/ong" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/src/CMakeLists.txt new/fcitx-sunpinyin-0.4.0/src/CMakeLists.txt --- old/fcitx-sunpinyin-0.3.9/src/CMakeLists.txt 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/src/CMakeLists.txt 2013-01-24 03:34:57.000000000 +0100 @@ -1,24 +1,25 @@ -include_directories ( - ${PROJECT_BINARY_DIR} - ${SUNPINYIN_INCLUDE_DIR} - ${FCITX4_FCITX_UTILS_INCLUDE_DIRS} - ${FCITX4_FCITX_CONFIG_INCLUDE_DIRS} - ${FCITX4_FCITX_INCLUDE_DIRS} - ${LIBINTL_INCLUDE_DIR} - ) +include_directories( + ${PROJECT_BINARY_DIR} + ${SUNPINYIN_INCLUDE_DIR} + ${FCITX4_FCITX_UTILS_INCLUDE_DIRS} + ${FCITX4_FCITX_CONFIG_INCLUDE_DIRS} + ${FCITX4_FCITX_INCLUDE_DIRS} + ${LIBINTL_INCLUDE_DIR} + ) -link_directories (${SUNPINYIN_LIBRARY_DIRS}) +link_directories(${SUNPINYIN_LIBRARY_DIRS}) -set( fcitx_sunpinyin_sources - eim.cpp - handler.cpp - config.cpp - ) +set(fcitx_sunpinyin_sources + eim.cpp + handler.cpp + config.cpp + ) -add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\" ) +add_definitions(-DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\") -fcitx_add_addon(fcitx-sunpinyin ${fcitx_sunpinyin_sources} ) -target_link_libraries (fcitx-sunpinyin - ${SUNPINYIN_LIBRARIES} - ${LIBINTL_LIBRARIES} - ) +fcitx_add_addon_full(sunpinyin +DESC +SOURCES ${fcitx_sunpinyin_sources} +IM_CONFIG sunpinyin.conf +LINK_LIBS ${SUNPINYIN_LIBRARIES} ${LIBINTL_LIBRARIES} +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/src/config.cpp new/fcitx-sunpinyin-0.4.0/src/config.cpp --- old/fcitx-sunpinyin-0.3.9/src/config.cpp 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/src/config.cpp 2013-01-24 03:34:57.000000000 +0100 @@ -44,8 +44,7 @@ CONFIG_BINDING_REGISTER("QuanPin", "FuzzyFoHe", bFuzzy[FUZZY_INDEX_FoHe]); CONFIG_BINDING_REGISTER("QuanPin", "FuzzyLeRi", bFuzzy[FUZZY_INDEX_LeRi]); CONFIG_BINDING_REGISTER("QuanPin", "FuzzyKeGe", bFuzzy[FUZZY_INDEX_KeGe]); -CONFIG_BINDING_REGISTER("QuanPin", "AutoCorrectingIgnIng", bAutoCorrecting[CORRECT_INDEX_IgnIng]); -CONFIG_BINDING_REGISTER("QuanPin", "AutoCorrectingOgnOng", bAutoCorrecting[CORRECT_INDEX_OgnOng]); +CONFIG_BINDING_REGISTER("QuanPin", "AutoCorrectinggnng", bAutoCorrecting[CORRECT_INDEX_gnng]); CONFIG_BINDING_REGISTER("QuanPin", "AutoCorrectingUenUn", bAutoCorrecting[CORRECT_INDEX_UenUn]); CONFIG_BINDING_REGISTER("QuanPin", "AutoCorrectingImgIng", bAutoCorrecting[CORRECT_INDEX_ImgIng]); CONFIG_BINDING_REGISTER("QuanPin", "AutoCorrectingIouIu", bAutoCorrecting[CORRECT_INDEX_IouIu]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/src/eim.cpp new/fcitx-sunpinyin-0.4.0/src/eim.cpp --- old/fcitx-sunpinyin-0.3.9/src/eim.cpp 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/src/eim.cpp 2013-01-24 03:34:57.000000000 +0100 @@ -35,7 +35,7 @@ #include <fcitx/keys.h> #include <fcitx/module.h> #include <fcitx/context.h> -#include <fcitx/module/punc/punc.h> +#include <fcitx/module/punc/fcitx-punc.h> #include <string> #include <libintl.h> @@ -48,14 +48,10 @@ #ifdef __cplusplus extern "C" { #endif - FCITX_EXPORT_API - FcitxIMClass ime = { - FcitxSunpinyinCreate, - FcitxSunpinyinDestroy + FCITX_DEFINE_PLUGIN(fcitx_sunpinyin, ime, FcitxIMClass) = { + .Create = FcitxSunpinyinCreate, + .Destroy = FcitxSunpinyinDestroy }; - - FCITX_EXPORT_API - int ABI_VERSION = FCITX_ABI_VERSION; #ifdef __cplusplus } #endif @@ -88,13 +84,47 @@ {"k", "g"} }; -static const char *correctionPairs[][2] = { - {"ign", "ing"}, - {"ogn", "ong"}, +struct CorrectionPair { + const char* first; + const char* second; +}; + +static const CorrectionPair uenunPairs[] = { {"uen", "un"}, +}; + +static const CorrectionPair imgingPairs[] = { {"img", "ing"}, +}; + +static const CorrectionPair iouiuPairs[] = { {"iou", "iu"}, - {"uei", "ui"} +}; + +static const CorrectionPair ueiuiPairs[] = { + {"uei", "ui"}, +}; + +static const CorrectionPair gnngPairs[] = { + {"ign", "ing"}, + {"ogn", "ong"}, + {"agn", "ang"}, + {"egn", "eng"}, +}; + +struct CorrectionPairs { + const CorrectionPair* correctionPair; + size_t size; +}; + +#define _DEF_PAIR(NAME) {NAME, sizeof(NAME) / sizeof(NAME[0]) } + +static const CorrectionPairs correctionPairs[] = { + _DEF_PAIR(uenunPairs), + _DEF_PAIR(imgingPairs), + _DEF_PAIR(iouiuPairs), + _DEF_PAIR(ueiuiPairs), + _DEF_PAIR(gnngPairs), }; /** @@ -385,11 +415,10 @@ ReloadConfigFcitxSunpinyin, NULL, 1, - "zh_CN" - ); + "zh_CN"); - AddFunction(addon, (void*) SunpinyinGetFullPinyin); - AddFunction(addon, (void*) SunpinyinAddWord); + FcitxModuleAddFunction(addon, SunpinyinGetFullPinyin); + FcitxModuleAddFunction(addon, SunpinyinAddWord); return sunpinyin; } @@ -497,8 +526,12 @@ fuzzy.push_back(std::make_pair<std::string, std::string>(fuzzyPairs[i][0], fuzzyPairs[i][1])); for (i = 0; i < CORRECT_SIZE; i++) - if (fs->bAutoCorrecting[i]) - correction.push_back(std::make_pair<std::string, std::string>(correctionPairs[i][0], correctionPairs[i][1])); + if (fs->bAutoCorrecting[i]) { + for (int j = 0; j < correctionPairs[i].size; j ++ ) { + correction.push_back(std::make_pair<std::string, std::string>(correctionPairs[i].correctionPair[j].first, + correctionPairs[i].correctionPair[j].second)); + } + } if (fuzzy.size() != 0) { @@ -577,15 +610,11 @@ return; const char symbol[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"; string_pairs puncPairs; - for( int i = 0; i < sizeof(symbol)/sizeof(char) -1; i++) { + for (unsigned int i = 0;i < sizeof(symbol) / sizeof(char) - 1;i++) { int c = symbol[i]; char s[2] = {symbol[i], '\0'}; - char* p1 = NULL, *p2 = NULL; - FcitxModuleFunctionArg args; - args.args[0] = &c; - args.args[1] = &p1; - args.args[2] = &p2; - InvokeFunction(sunpinyin->owner, FCITX_PUNC, GETPUNC2, args); + char *p1 = NULL, *p2 = NULL; + FcitxPuncGetPunc2(sunpinyin->owner, &c, &p1, &p2); string_pair p; p.first = s; if (p1) { @@ -622,9 +651,9 @@ return NULL; /* no way to check real single character pronouce, but let it be here */ - for (int i = 0; i < segments.size(); i ++) { + for (unsigned int i = 0;i < segments.size();i++) { const IPySegmentor::TSegment& segment = segments[i]; - for (int j = 0; j < segment.m_syllables.size(); j ++) { + for (unsigned int j = 0;j < segment.m_syllables.size();j++) { TSyllable syl = segment.m_syllables[j]; if (!syl.isFullSyllable()) return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/src/eim.h new/fcitx-sunpinyin-0.4.0/src/eim.h --- old/fcitx-sunpinyin-0.3.9/src/eim.h 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/src/eim.h 2013-01-24 03:34:57.000000000 +0100 @@ -29,22 +29,6 @@ #define _(x) dgettext("fcitx-sunpinyin", (x)) -class FcitxWindowHandler; -struct FcitxSunpinyinConfig -{ - FcitxGenericConfig gconfig; - boolean bUseShuangpin; - EShuangpinType SPScheme; - boolean bFuzzySegmentation; - boolean bFuzzyInnerSegmentation; - boolean bProcessPunc; - int iMemoryStrength; - int maxBest; - int maxTail; - - boolean bFuzzy[14]; - boolean bAutoCorrecting[6]; -}; #define FUZZY_INDEX_ShiSi 0 #define FUZZY_INDEX_ZhiZi 1 @@ -62,13 +46,29 @@ #define FUZZY_INDEX_KeGe 13 #define FUZZY_SIZE 14 -#define CORRECT_INDEX_IgnIng 0 -#define CORRECT_INDEX_OgnOng 1 -#define CORRECT_INDEX_UenUn 2 -#define CORRECT_INDEX_ImgIng 3 -#define CORRECT_INDEX_IouIu 4 -#define CORRECT_INDEX_UeiUi 5 -#define CORRECT_SIZE 6 +#define CORRECT_INDEX_UenUn 0 +#define CORRECT_INDEX_ImgIng 1 +#define CORRECT_INDEX_IouIu 2 +#define CORRECT_INDEX_UeiUi 3 +#define CORRECT_INDEX_gnng 4 +#define CORRECT_SIZE 5 + +class FcitxWindowHandler; +struct FcitxSunpinyinConfig +{ + FcitxGenericConfig gconfig; + boolean bUseShuangpin; + EShuangpinType SPScheme; + boolean bFuzzySegmentation; + boolean bFuzzyInnerSegmentation; + boolean bProcessPunc; + int iMemoryStrength; + int maxBest; + int maxTail; + + boolean bFuzzy[FUZZY_SIZE]; + boolean bAutoCorrecting[CORRECT_SIZE]; +}; #define BUF_SIZE 4096 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/src/fcitx-sunpinyin.conf.in new/fcitx-sunpinyin-0.4.0/src/fcitx-sunpinyin.conf.in --- old/fcitx-sunpinyin-0.3.9/src/fcitx-sunpinyin.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/fcitx-sunpinyin-0.4.0/src/fcitx-sunpinyin.conf.in 2013-01-24 03:34:57.000000000 +0100 @@ -0,0 +1,10 @@ +[Addon] +Name=fcitx-sunpinyin +_GeneralName=Sunpinyin +_Comment=Sunpinyin Wrapper For Fcitx +Category=InputMethod +Enabled=True +Library=fcitx-sunpinyin.so +Type=SharedLibrary +Dependency= +IMRegisterMethod=ConfigFile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/src/fcitx-sunpinyin.desc new/fcitx-sunpinyin-0.4.0/src/fcitx-sunpinyin.desc --- old/fcitx-sunpinyin-0.3.9/src/fcitx-sunpinyin.desc 1970-01-01 01:00:00.000000000 +0100 +++ new/fcitx-sunpinyin-0.4.0/src/fcitx-sunpinyin.desc 2013-01-24 03:34:57.000000000 +0100 @@ -0,0 +1,152 @@ +[Sunpinyin/UseShuangpin] +Type=Boolean +DefaultValue=False +Description=Use Shuangpin Instead of Quanpin + +[Sunpinyin/ShuangpinScheme] +Type=Enum +DefaultValue=MS2003 +EnumCount=6 +Enum0=MS2003 +Enum1=ABC +Enum2=ZIRANMA +Enum3=PINYINJIAJIA +Enum4=ZIGUANG +Enum5=XIAOHE +Description=Shuangpin Scheme in Sunpinyin + +[Sunpinyin/FuzzySegmentation] +Type=Boolean +DefaultValue=True +Description=Fuzzy Segmentation + +[Sunpinyin/FuzzyInnerSegmentation] +Type=Boolean +DefaultValue=False +Description=Fuzzy Inner Segmentation + +[Sunpinyin/MaxBest] +Type=Enum +DefaultValue=1 +EnumCount=3 +Enum0=1 +Enum1=2 +Enum2=3 +Description=Number of sentence that sunpinyin guess + +[Sunpinyin/MaxTail] +Type=Enum +DefaultValue=0 +EnumCount=3 +Enum0=0 +Enum1=1 +Enum2=2 +Description=Number of Best Tail Candidate + +[Sunpinyin/MemoryStrength] +Type=Integer +DefaultValue=3 +Description=Memory Strength + +[Sunpinyin/ProcessPunc] +Type=Boolean +DefaultValue=False +Description=Let sunpinyin process punctuation + +[QuanPin/FuzzyZhiZi] +Type=Boolean +DefaultValue=False +Description=Fuzzy Zhi Zi + +[QuanPin/FuzzyChiCi] +Type=Boolean +DefaultValue=False +Description=Fuzzy Chi Ci + +[QuanPin/FuzzyShiSi] +Type=Boolean +DefaultValue=False +Description=Fuzzy Shi Si + +[QuanPin/FuzzyAnAng] +Type=Boolean +DefaultValue=False +Description=Fuzzy An Ang + +[QuanPin/FuzzyOnOng] +Type=Boolean +DefaultValue=False +Description=Fuzzy On Ong + +[QuanPin/FuzzyEnEng] +Type=Boolean +DefaultValue=False +Description=Fuzzy En Eng + +[QuanPin/FuzzyInIng] +Type=Boolean +DefaultValue=False +Description=Fuzzy In Ing + +[QuanPin/FuzzyEngOng] +Type=Boolean +DefaultValue=False +Description=Fuzzy Eng Ong + +[QuanPin/FuzzyIanIang] +Type=Boolean +DefaultValue=False +Description=Fuzzy Ian Iang + +[QuanPin/FuzzyUanUang] +Type=Boolean +DefaultValue=False +Description=Fuzzy Uan Uang + +[QuanPin/FuzzyNeLe] +Type=Boolean +DefaultValue=False +Description=Fuzzy Ne Le + +[QuanPin/FuzzyFoHe] +Type=Boolean +DefaultValue=False +Description=Fuzzy Fo He + +[QuanPin/FuzzyLeRi] +Type=Boolean +DefaultValue=False +Description=Fuzzy Le Ri + +[QuanPin/FuzzyKeGe] +Type=Boolean +DefaultValue=False +Description=Fuzzy Ke Ge + +[QuanPin/AutoCorrectinggnng] +Type=Boolean +DefaultValue=True +Description=AutoCorrect gn ng + +[QuanPin/AutoCorrectingUenUn] +Type=Boolean +DefaultValue=False +Description=AutoCorrect Uen Un + +[QuanPin/AutoCorrectingImgIng] +Type=Boolean +DefaultValue=False +Description=AutoCorrect Img Ing + +[QuanPin/AutoCorrectingIouIu] +Type=Boolean +DefaultValue=False +Description=AutoCorrect Iou Iu + +[QuanPin/AutoCorrectingUeiUi] +Type=Boolean +DefaultValue=False +Description=AutoCorrect Uei Ui + +[DescriptionFile] +LocaleDomain=fcitx-sunpinyin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/src/handler.h new/fcitx-sunpinyin-0.4.0/src/handler.h --- old/fcitx-sunpinyin-0.3.9/src/handler.h 2012-08-15 05:08:10.000000000 +0200 +++ new/fcitx-sunpinyin-0.4.0/src/handler.h 2013-01-24 03:34:57.000000000 +0100 @@ -41,4 +41,4 @@ private: FcitxSunpinyin* owner; }; -// kate: indent-mode cstyle; space-indent on; indent-width 0; +// kate: indent-mode cstyle; space-indent on; indent-width 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fcitx-sunpinyin-0.3.9/src/sunpinyin.conf.in new/fcitx-sunpinyin-0.4.0/src/sunpinyin.conf.in --- old/fcitx-sunpinyin-0.3.9/src/sunpinyin.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/fcitx-sunpinyin-0.4.0/src/sunpinyin.conf.in 2013-01-24 03:34:57.000000000 +0100 @@ -0,0 +1,7 @@ +[InputMethod] +UniqueName=sunpinyin +_Name=Sunpinyin +IconName=sunpinyin +Priority=1 +LangCode=zh_CN +Parent=fcitx-sunpinyin -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
