Hello community, here is the log from the commit of package ibus-libpinyin for openSUSE:Factory checked in at 2019-02-14 14:36:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-libpinyin (Old) and /work/SRC/openSUSE:Factory/.ibus-libpinyin.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-libpinyin" Thu Feb 14 14:36:39 2019 rev:21 rq:674891 version:1.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-libpinyin/ibus-libpinyin.changes 2018-12-04 20:55:13.192793392 +0100 +++ /work/SRC/openSUSE:Factory/.ibus-libpinyin.new.28833/ibus-libpinyin.changes 2019-02-14 14:36:42.971561408 +0100 @@ -1,0 +2,9 @@ +Thu Feb 14 06:04:44 UTC 2019 - [email protected] + +- Update version to 1.11.0 + * Fix keypad decimal + * Fix emoji candidates + * Support configurable opencc config +- Drop ibus-libpinyin-fix-build-fault.patch, merged by upstream. + +------------------------------------------------------------------- Old: ---- ibus-libpinyin-1.10.92.tar.gz ibus-libpinyin-fix-build-fault.patch New: ---- ibus-libpinyin-1.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-libpinyin.spec ++++++ --- /var/tmp/diff_new_pack.ZFoUXp/_old 2019-02-14 14:36:43.779561044 +0100 +++ /var/tmp/diff_new_pack.ZFoUXp/_new 2019-02-14 14:36:43.779561044 +0100 @@ -1,8 +1,8 @@ # # spec file for package ibus-libpinyin # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2018 Hillwood Yang <[email protected]> +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 Hillwood Yang <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,13 @@ Name: ibus-libpinyin -Version: 1.10.92 +Version: 1.11.0 Release: 0 Summary: Intelligent Pinyin engine based on libpinyin for IBus License: GPL-2.0-or-later Group: System/I18n/Chinese URL: https://github.com/libpinyin/ibus-libpinyin Source0: http://downloads.sourceforge.net/libpinyin/ibus-libpinyin/%{name}-%{version}.tar.gz -# PATCH-FIX-OPENSUSE ibus-libpinyin-fix-build-fault.patch boo#1115778 [email protected] -- Fix build errors happen in ibus-1.10.91 for openSUSE-Leap 15 -Patch0: ibus-libpinyin-fix-build-fault.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext-devel @@ -56,7 +54,6 @@ %prep %setup -q -%patch0 -p1 %build NOCONFIGURE=1 ./autogen.sh ++++++ ibus-libpinyin-1.10.92.tar.gz -> ibus-libpinyin-1.11.0.tar.gz ++++++ ++++ 5038 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/ibus-libpinyin-1.10.92/ChangeLog new/ibus-libpinyin-1.11.0/ChangeLog --- old/ibus-libpinyin-1.10.92/ChangeLog 2018-10-31 07:53:48.000000000 +0100 +++ new/ibus-libpinyin-1.11.0/ChangeLog 2019-01-21 10:57:25.000000000 +0100 @@ -1,3 +1,110 @@ +commit 9b15d6b86ad84cee5c86c9e27fd24107c6eab89f +Author: Peng Wu <[email protected]> +Date: 2019-01-15 11:57:09 +0800 + + update ChangeLog + +M ChangeLog + +commit f7723fe9a30ea73f6308437e3fa83a140fdf0c02 +Author: Peng Wu <[email protected]> +Date: 2019-01-15 11:50:31 +0800 + + bump version 1.11.0 + +M configure.ac + +commit 7c565e402369eaa82790b9f2550ec11ffd87e7ab +Author: Peng Wu <[email protected]> +Date: 2019-01-13 19:16:06 +0800 + + fixes typo + +M src/PYFallbackEditor.cc + +commit 9a1474c0e4972fa4d7c53e19ac939f6d3faacc69 +Author: Peng Wu <[email protected]> +Date: 2019-01-11 15:41:11 +0800 + + fixes keypad decimal + +M src/PYFallbackEditor.cc + +commit a0a9fd6b1deb4384ac7ca8ce0bc35c98d1193339 +Author: Peng Wu <[email protected]> +Date: 2019-01-11 09:59:06 +0800 + + fixes updateCandidates method + +M src/PYPPhoneticEditor.cc + +commit 052273cbf8f046eb7442bc036823934a68754eb9 +Author: Peng Wu <[email protected]> +Date: 2019-01-09 14:31:56 +0800 + + bump version 1.10.93 + +M configure.ac + +commit 742fdb83a12f5238c0cab3d6ff6b6227c260e2f9 +Author: Peng Wu <[email protected]> +Date: 2019-01-04 12:45:16 +0800 + + update GSettings xml + +M data/com.github.libpinyin.ibus-libpinyin.gschema.xml + +commit d5e38a036b85a011db6a251c814a2f2ee768e6cd +Author: Peng Wu <[email protected]> +Date: 2019-01-04 12:42:09 +0800 + + minor fixes + +M src/PYPConfig.cc + +commit 42b2a4c1fbef71dadc97d0a820d96db977393495 +Author: Marcin Mielniczuk <[email protected]> +Date: 2018-12-27 16:56:18 +0100 + + Support configurable opencc config + +M data/com.github.libpinyin.ibus-libpinyin.gschema.xml +M src/PYConfig.cc +M src/PYConfig.h +M src/PYPConfig.cc +M src/PYPPhoneticEditor.cc +M src/PYPSuggestionEditor.cc +M src/PYPTradCandidates.cc +M src/PYPTradCandidates.h +M src/PYSimpTradConverter.cc +M src/PYSimpTradConverter.h + +commit dd4699124dbaacf5119092d82c090917b78a5f1a +Author: Peng Wu <[email protected]> +Date: 2018-11-15 10:58:18 +0800 + + update english-user.db path + +M src/PYEnglishEditor.cc + +commit b780a46a6914de95a77c4296ddcb45e01e2bfd64 +Author: ZhaoQiang <[email protected]> +Date: 2018-11-14 12:19:49 +0800 + + Update PYPEmojiCandidates.cc: change strcmp to use c++ library. + +M src/PYPEmojiCandidates.cc + +commit be40c06eb53f4832cc741c09b58e2afa5d8f2ce4 +Author: DevilApp <[email protected]> +Date: 2018-11-11 18:45:21 +0100 + + Fixed french translation + + I have updated the outdated french translation and fixed some language errors. Now there's some strings left. + +M po/fr.po + commit 0401ff95be8f8b906d7a79feded7482c4172b28f Author: Peng Wu <[email protected]> Date: 2018-10-31 13:18:22 +0800 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/ibus-libpinyin-1.10.92/compile new/ibus-libpinyin-1.11.0/compile --- old/ibus-libpinyin-1.10.92/compile 2018-10-31 06:15:07.000000000 +0100 +++ new/ibus-libpinyin-1.11.0/compile 2019-01-21 10:56:22.000000000 +0100 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" 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/ibus-libpinyin-1.10.92/configure.ac new/ibus-libpinyin-1.11.0/configure.ac --- old/ibus-libpinyin-1.10.92/configure.ac 2018-10-24 09:32:35.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/configure.ac 2019-01-15 04:50:20.000000000 +0100 @@ -21,8 +21,8 @@ # if not 1, append datestamp to the version number. m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) -m4_define([ibus_minor_version], [10]) -m4_define([ibus_micro_version], [92]) +m4_define([ibus_minor_version], [11]) +m4_define([ibus_micro_version], [0]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) 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/ibus-libpinyin-1.10.92/data/com.github.libpinyin.ibus-libpinyin.gschema.xml new/ibus-libpinyin-1.11.0/data/com.github.libpinyin.ibus-libpinyin.gschema.xml --- old/ibus-libpinyin-1.10.92/data/com.github.libpinyin.ibus-libpinyin.gschema.xml 2018-08-20 11:22:03.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/data/com.github.libpinyin.ibus-libpinyin.gschema.xml 2019-01-04 05:43:55.000000000 +0100 @@ -185,6 +185,10 @@ <default>false</default> <summary>Show Suggestions</summary> </key> + <key name="opencc-config" type="s"> + <default>'s2t.json'</default> + <summary>The config file which should be used by OpenCC for traditional input. Please consult the OpenCC documentation for more information</summary> + </key> </schema> <schema path="/com/github/libpinyin/ibus-libpinyin/libbopomofo/" id="com.github.libpinyin.ibus-libpinyin.libbopomofo"> <key name="auxiliary-select-key-f" type="i"> @@ -319,5 +323,9 @@ <default>false</default> <summary>Show Suggestions</summary> </key> + <key name="opencc-config" type="s"> + <default>'s2t.json'</default> + <summary>The config file which should be used by OpenCC for traditional input. Please consult the OpenCC documentation for more information</summary> + </key> </schema> </schemalist> 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/ibus-libpinyin-1.10.92/missing new/ibus-libpinyin-1.11.0/missing --- old/ibus-libpinyin-1.10.92/missing 2018-10-31 06:15:07.000000000 +0100 +++ new/ibus-libpinyin-1.11.0/missing 2019-01-21 10:56:22.000000000 +0100 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" 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/ibus-libpinyin-1.10.92/po/fr.po new/ibus-libpinyin-1.11.0/po/fr.po --- old/ibus-libpinyin-1.10.92/po/fr.po 2018-08-20 11:46:00.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/po/fr.po 2018-11-13 02:59:38.000000000 +0100 @@ -3,45 +3,42 @@ # Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Ma Jiehong <[email protected]>, 2012. +# Luc Bournaud <[email protected]>, 2018. # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-01-04 16:51+0800\n" -"PO-Revision-Date: 2012-03-19 22:13+0100\n" -"Last-Translator: Ma Jiehong <[email protected]>\n" -"Language-Team: French\n" +"PO-Revision-Date: 2018-11-11 18:38+0100\n" +"Last-Translator: Luc Bournaud <[email protected]>\n" +"Language-Team: français <>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../src/PYMain.cc:98 -#, fuzzy msgid "Libpinyin input method" -msgstr "Méthode de saisie Pinyin" +msgstr "Méthode de saisie libpinyin" #: ../src/PYMain.cc:108 -#, fuzzy msgid "Intelligent Pinyin (debug)" -msgstr "Pinyin (débug)" +msgstr "Pinyin intelligent (débogage)" #: ../src/PYMain.cc:109 -#, fuzzy msgid "Intelligent Pinyin input method (debug)" -msgstr "Méthode de saisie Pinyin (débug)" +msgstr "Méthode de saisie Pinyin intelligente (débogage)" #: ../src/PYMain.cc:119 -#, fuzzy msgid "Bopomofo (debug)" -msgstr "Mode Bopomofo" +msgstr "Bopomofo (débogage)" #: ../src/PYMain.cc:120 -#, fuzzy msgid "Bopomofo input method (debug)" -msgstr "Méthode de saisie Bopomofo (débug)" +msgstr "Méthode de saisie Bopomofo (débogage)" #: ../src/PYPinyinProperties.cc:40 ../src/PYPinyinProperties.cc:105 #: ../setup/ibus-libpinyin-preferences.ui.h:19 @@ -55,66 +52,59 @@ #: ../src/PYPinyinProperties.cc:46 ../src/PYPinyinProperties.cc:117 msgid "Switch to English Mode" -msgstr "" +msgstr "Passer en mode Anglais" #: ../src/PYPinyinProperties.cc:47 ../src/PYPinyinProperties.cc:118 msgid "Switch to Chinese Mode" -msgstr "" +msgstr "Passer en mode Chinois" #: ../src/PYPinyinProperties.cc:51 ../src/PYPinyinProperties.cc:130 msgid "Full Width Letter" -msgstr "" +msgstr "Pleine chasse" #: ../src/PYPinyinProperties.cc:52 ../src/PYPinyinProperties.cc:131 msgid "Half Width Letter" -msgstr "" +msgstr "Demi-chasse" #: ../src/PYPinyinProperties.cc:57 ../src/PYPinyinProperties.cc:136 msgid "Switch to Half Width Letter Mode" -msgstr "" +msgstr "Passer en mode Demi-chasse" #: ../src/PYPinyinProperties.cc:58 ../src/PYPinyinProperties.cc:137 msgid "Switch to Full Width Letter Mode" -msgstr "" +msgstr "Passer en mode Pleine chasse" #: ../src/PYPinyinProperties.cc:62 ../src/PYPinyinProperties.cc:146 -#, fuzzy msgid "Full Width Punct" -msgstr "Chasse de la ponctuation pleine/demie" +msgstr "Ponctuation pleine chasse" #: ../src/PYPinyinProperties.cc:63 ../src/PYPinyinProperties.cc:147 -#, fuzzy msgid "Half Width Punct" -msgstr "Chasse de la ponctuation pleine/demie" +msgstr "Ponctuation demi-chasse" #: ../src/PYPinyinProperties.cc:68 ../src/PYPinyinProperties.cc:152 -#, fuzzy msgid "Switch to Half Width Punctuation Mode" -msgstr "Chasse de la ponctuation pleine/demie" +msgstr "Passer en ponctuation demi-chasse" #: ../src/PYPinyinProperties.cc:69 ../src/PYPinyinProperties.cc:153 -#, fuzzy msgid "Switch to Full Width Punctuation Mode" -msgstr "Chasse de la ponctuation pleine/demie" +msgstr "Passer en ponctuation pleine chasse" #: ../src/PYPinyinProperties.cc:73 ../src/PYPinyinProperties.cc:162 -#, fuzzy msgid "Simplified Chinese" -msgstr "Chinois simplifié/traditionnel" +msgstr "Chinois simplifié" #: ../src/PYPinyinProperties.cc:74 ../src/PYPinyinProperties.cc:163 -#, fuzzy msgid "Traditional Chinese" -msgstr "Chinois simplifié/traditionnel" +msgstr "Chinois traditionnel" #: ../src/PYPinyinProperties.cc:79 ../src/PYPinyinProperties.cc:168 -#, fuzzy msgid "Switch to Traditional Chinese Mode" -msgstr "Chinois simplifié/traditionnel" +msgstr "Passer en mode Chinois traditionnel" #: ../src/PYPinyinProperties.cc:80 ../src/PYPinyinProperties.cc:169 msgid "Switch to Simplfied Chinese Mode" -msgstr "" +msgstr "Passer en mode Chinois simplifié" #: ../src/PYPinyinProperties.cc:83 ../src/PYPinyinProperties.cc:85 #: ../setup/ibus-libpinyin-preferences.ui.h:15 @@ -123,11 +113,11 @@ #: ../src/PYPinyinProperties.cc:88 ../src/PYPinyinProperties.cc:109 msgid "中" -msgstr "" +msgstr "中" #: ../src/PYPinyinProperties.cc:90 ../src/PYPinyinProperties.cc:111 msgid "英" -msgstr "" +msgstr "英" #: ../src/PYEnglishEditor.cc:610 msgid "Please input the english word." @@ -139,33 +129,32 @@ #: ../setup/main2.py:421 msgid "Please choose a file" -msgstr "" +msgstr "Veuillez choisir un fichier" #: ../setup/main2.py:439 msgid "Please save a file" -msgstr "" +msgstr "Veuillez enregistrer le fichier" #: ../setup/main2.py:483 ../setup/ibus-libpinyin-preferences.ui.h:83 -#, fuzzy, no-c-format, python-format +#, no-c-format, python-format msgid "<big><b>Intelligent Pinyin %s</b></big>" -msgstr "<big><b>Ibus Pinyin %s</b></big>" +msgstr "<big><b>Intelligent Pinyin %s</b></big>" #: ../setup/config.py:30 -#, fuzzy msgid "Intelligent Pinyin" -msgstr "Pinyin (débug)" +msgstr "Pinyin intelligent" #: ../setup/dicttreeview.py:52 msgid "Art" -msgstr "" +msgstr "Art" #: ../setup/dicttreeview.py:53 msgid "Culture" -msgstr "" +msgstr "Culture" #: ../setup/dicttreeview.py:54 msgid "Economy" -msgstr "" +msgstr "Économie" #: ../setup/dicttreeview.py:55 msgid "Geology" @@ -173,15 +162,15 @@ #: ../setup/dicttreeview.py:56 msgid "History" -msgstr "" +msgstr "Histoire" #: ../setup/dicttreeview.py:57 msgid "Life" -msgstr "" +msgstr "Vie" #: ../setup/dicttreeview.py:58 msgid "Nature" -msgstr "" +msgstr "Nature" #: ../setup/dicttreeview.py:59 msgid "People" @@ -189,105 +178,103 @@ #: ../setup/dicttreeview.py:60 msgid "Science" -msgstr "" +msgstr "Sciences" #: ../setup/dicttreeview.py:61 msgid "Society" -msgstr "" +msgstr "Société" #: ../setup/dicttreeview.py:62 msgid "Sport" -msgstr "" +msgstr "Sport" #: ../setup/dicttreeview.py:63 msgid "Technology" -msgstr "" +msgstr "Technologies" #: ../setup/dicttreeview.py:110 msgid "Active" -msgstr "" +msgstr "Active" #: ../setup/dicttreeview.py:115 ../setup/shortcuteditor.py:82 msgid "Description" -msgstr "" +msgstr "Description" #: ../setup/keyboardshortcut.py:54 msgid "Shortcut:" -msgstr "" +msgstr "Raccourcie :" #: ../setup/keyboardshortcut.py:67 msgid "Key code:" -msgstr "" +msgstr "Touche :" #: ../setup/keyboardshortcut.py:82 msgid "Modifiers:" -msgstr "" +msgstr "Modificateurs :" #: ../setup/keyboardshortcut.py:171 msgid "" "Please press a key (or a key combination).\n" "The dialog will be closed when the key is released." msgstr "" +"Veuillez presser une touche (ou une combinaison de touches)\n" +"La boîte de dialogue va se fermer quand la touche sera relachée" #: ../setup/keyboardshortcut.py:174 msgid "Please press a key (or a key combination)" -msgstr "" +msgstr "Pressez une touche (ou une combinaison de touches)" #: ../setup/keyboardshortcut.py:186 msgid "Shorcut Editor" -msgstr "" +msgstr "Éditeur de raccourcie" #: ../setup/keyboardshortcut.py:239 ../setup/shortcuteditor.py:195 #: ../setup/shortcuteditor.py:232 msgid "_Cancel" -msgstr "" +msgstr "_Annuler" #: ../setup/keyboardshortcut.py:240 ../setup/shortcuteditor.py:196 #: ../setup/shortcuteditor.py:233 msgid "_OK" -msgstr "" +msgstr "_OK" #: ../setup/shortcuteditor.py:46 msgid "Switch Chinese/English" -msgstr "" +msgstr "Inverser Chinois/Anglais" #: ../setup/shortcuteditor.py:47 -#, fuzzy msgid "Full/Half Width Letter" -msgstr "Chasse" +msgstr "Pleine/Demi-Chasse" #: ../setup/shortcuteditor.py:48 -#, fuzzy msgid "Full/Half Width Punct" -msgstr "Chasse de la ponctuation pleine/demie" +msgstr "Pleine/Demi-chasse de la ponctuation" #: ../setup/shortcuteditor.py:49 -#, fuzzy msgid "Switch Traditional/Simplfied Chinese" -msgstr "Chinois simplifié/traditionnel" +msgstr "Inverser Chinois simplifié/traditionnel" #: ../setup/shortcuteditor.py:87 msgid "Accelerator" -msgstr "" +msgstr "Raccourcie clavier" #: ../setup/shortcuteditor.py:105 msgid "This shortcut key is already used." -msgstr "" +msgstr "Ce raccourcie clavier est déjà utilisé" #. set default button #: ../setup/shortcuteditor.py:163 msgid "_Default" -msgstr "" +msgstr "Par _défaut" #. edit button #: ../setup/shortcuteditor.py:168 msgid "_Edit" -msgstr "" +msgstr "_Modifier" #: ../setup/shortcuteditor.py:194 -#, fuzzy msgid "Select Switching Key" -msgstr "Touches de sélection :" +msgstr "Sélectionner la touche de sélection :" #: ../setup/ibus-libpinyin-preferences.ui.h:1 msgid "Standard" @@ -339,12 +326,11 @@ #: ../setup/ibus-libpinyin-preferences.ui.h:13 msgid "Frequency" -msgstr "" +msgstr "Fréquence" #: ../setup/ibus-libpinyin-preferences.ui.h:14 -#, fuzzy msgid "Pinyin Length" -msgstr "Mode Pinyin" +msgstr "Taille du pinyin" #: ../setup/ibus-libpinyin-preferences.ui.h:16 msgid "Language:" @@ -364,7 +350,7 @@ #: ../setup/ibus-libpinyin-preferences.ui.h:22 msgid "Half" -msgstr "Demie" +msgstr "Demi" #: ../setup/ibus-libpinyin-preferences.ui.h:23 msgid "Chinese:" @@ -392,25 +378,23 @@ #: ../setup/ibus-libpinyin-preferences.ui.h:29 msgid "<b>UI</b>" -msgstr "<b>UI<b/>" +msgstr "<b>UI</b>" #: ../setup/ibus-libpinyin-preferences.ui.h:30 msgid "Dynamic adjust the candidates order." -msgstr "" +msgstr "Ajustement dynamique de l'ordre des candidats." #: ../setup/ibus-libpinyin-preferences.ui.h:31 msgid "Remember every input as a phrase." msgstr "" #: ../setup/ibus-libpinyin-preferences.ui.h:32 -#, fuzzy msgid "Sort candidates by:" -msgstr "Nombre de candidats :" +msgstr "Trier les candidats par :" #: ../setup/ibus-libpinyin-preferences.ui.h:33 -#, fuzzy msgid "<b>Candidates</b>" -msgstr "<b>État initial</b>" +msgstr "<b>Candidats</b>" #: ../setup/ibus-libpinyin-preferences.ui.h:34 msgid "General" @@ -531,6 +515,7 @@ #: ../setup/ibus-libpinyin-preferences.ui.h:63 msgid "Tips: this changes may take effects after ime restarted." msgstr "" +"Note : ce changement peut ne prendre effet qu'après le redémarrage de l'IME" #: ../setup/ibus-libpinyin-preferences.ui.h:64 msgid "<b>Dictionary option</b>" @@ -542,29 +527,27 @@ #: ../setup/ibus-libpinyin-preferences.ui.h:66 msgid "User Lua Script" -msgstr "" +msgstr "Script Lua utilisateur" #: ../setup/ibus-libpinyin-preferences.ui.h:67 msgid "Edit" -msgstr "" +msgstr "Modifier" #: ../setup/ibus-libpinyin-preferences.ui.h:68 -#, fuzzy msgid "<b>Customize IME</b>" -msgstr "Personalisation" +msgstr "<b>Personnaliser l'IME</b>" #: ../setup/ibus-libpinyin-preferences.ui.h:69 msgid "Export" -msgstr "" +msgstr "Exporter" #: ../setup/ibus-libpinyin-preferences.ui.h:70 msgid "Import" -msgstr "" +msgstr "Importer" #: ../setup/ibus-libpinyin-preferences.ui.h:71 -#, fuzzy msgid "User Dictionary" -msgstr "Dictionnaire" +msgstr "Dictionnaire utilisateur" #: ../setup/ibus-libpinyin-preferences.ui.h:72 msgid "Clear All Data" @@ -584,37 +567,33 @@ #: ../setup/ibus-libpinyin-preferences.ui.h:78 msgid "Help" -msgstr "" +msgstr "Aide" #: ../setup/ibus-libpinyin-preferences.ui.h:79 -#, fuzzy msgid "<b>User Dictionary</b>" -msgstr "<b>Dictionnaire</b>" +msgstr "<b>Dictionnaire utilisateur</b>" #: ../setup/ibus-libpinyin-preferences.ui.h:80 msgid "User data" -msgstr "" +msgstr "Donnés utilisateur" #: ../setup/ibus-libpinyin-preferences.ui.h:81 msgid "Shortcuts" -msgstr "" +msgstr "Raccourcis" #: ../setup/ibus-libpinyin-preferences.ui.h:84 -#, fuzzy msgid "Intelligent Pinyin input method for IBus" -msgstr "Méthode de saisie Pinyin pour IBus" +msgstr "Méthode de saisie Pinyin intelligente pour IBus" #: ../setup/ibus-libpinyin-preferences.ui.h:85 -#, fuzzy msgid "<small>Copyright (c) 2011-2012 Peng Wu</small>" -msgstr "<small>Copyright (c) 2009-2010 Peng Huang</small>" +msgstr "<small>Copyright (c) 2011-2012 Peng Wu</small>" #: ../setup/ibus-libpinyin-preferences.ui.h:86 msgid "https://github.com/libpinyin/ibus-libpinyin"; -msgstr "" +msgstr "https://github.com/libpinyin/ibus-libpinyin"; #: ../setup/ibus-libpinyin-preferences.ui.h:87 -#, fuzzy msgid "" "<small>\n" "<b>Authors:</b>\n" @@ -627,10 +606,10 @@ "</small>" msgstr "" "<small>\n" -"<b>Autheurs :</b>\n" +"<b>Auteurs :</b>\n" +"Peng Wu\n" "Peng Huang\n" "BYVoid\n" -"Peng Wu\n" "\n" "<b>Contributeurs :</b>\n" "koterpilla, Zerng07\n" 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/ibus-libpinyin-1.10.92/py-compile new/ibus-libpinyin-1.11.0/py-compile --- old/ibus-libpinyin-1.10.92/py-compile 2018-10-31 06:15:07.000000000 +0100 +++ new/ibus-libpinyin-1.11.0/py-compile 2019-01-21 10:56:22.000000000 +0100 @@ -1,9 +1,9 @@ #!/bin/sh # py-compile - Compile a Python program -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2000-2017 Free Software Foundation, Inc. +# Copyright (C) 2000-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -162,7 +162,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" 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/ibus-libpinyin-1.10.92/setup/config.py new/ibus-libpinyin-1.11.0/setup/config.py --- old/ibus-libpinyin-1.10.92/setup/config.py 2018-10-31 06:15:09.000000000 +0100 +++ new/ibus-libpinyin-1.11.0/setup/config.py 2019-01-21 10:56:26.000000000 +0100 @@ -24,7 +24,7 @@ gettext.install("ibus-libpinyin") def get_version(): - return "1.10.92" + return "1.11.0" def get_longname(): return _("Intelligent Pinyin") 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/ibus-libpinyin-1.10.92/src/PYConfig.cc new/ibus-libpinyin-1.11.0/src/PYConfig.cc --- old/ibus-libpinyin-1.10.92/src/PYConfig.cc 2018-08-20 11:22:03.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/src/PYConfig.cc 2019-01-03 06:54:40.000000000 +0100 @@ -61,6 +61,7 @@ m_dictionaries = ""; m_lua_converter = ""; + m_opencc_config = "s2t.json"; m_main_switch = "<Shift>"; m_letter_switch = ""; 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/ibus-libpinyin-1.10.92/src/PYConfig.h new/ibus-libpinyin-1.11.0/src/PYConfig.h --- old/ibus-libpinyin-1.10.92/src/PYConfig.h 2018-08-20 11:22:03.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/src/PYConfig.h 2019-01-03 06:54:40.000000000 +0100 @@ -69,6 +69,7 @@ std::string letterSwitch (void) const { return m_letter_switch; } std::string punctSwitch (void) const { return m_punct_switch; } std::string tradSwitch (void) const { return m_trad_switch; } + std::string openccConfig (void) const { return m_opencc_config; } protected: bool read (const gchar * name, bool defval); @@ -90,6 +91,7 @@ std::string m_schema_id; std::string m_dictionaries; std::string m_lua_converter; + std::string m_opencc_config; pinyin_option_t m_option; pinyin_option_t m_option_mask; 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/ibus-libpinyin-1.10.92/src/PYEnglishEditor.cc new/ibus-libpinyin-1.11.0/src/PYEnglishEditor.cc --- old/ibus-libpinyin-1.10.92/src/PYEnglishEditor.cc 2018-09-14 07:25:35.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/src/PYEnglishEditor.cc 2018-11-15 03:57:46.000000000 +0100 @@ -366,7 +366,7 @@ m_english_database = new EnglishDatabase; gchar *path = g_build_filename (g_get_user_cache_dir (), - "ibus", "pinyin", "english-user.db", NULL); + "ibus", "libpinyin", "english-user.db", NULL); gboolean result = m_english_database->openDatabase (".." G_DIR_SEPARATOR_S "data" G_DIR_SEPARATOR_S "english.db", 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/ibus-libpinyin-1.10.92/src/PYFallbackEditor.cc new/ibus-libpinyin-1.11.0/src/PYFallbackEditor.cc --- old/ibus-libpinyin-1.10.92/src/PYFallbackEditor.cc 2018-05-22 09:16:33.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/src/PYFallbackEditor.cc 2019-01-13 12:15:42.000000000 +0100 @@ -250,7 +250,7 @@ retval = processPunct ('-', keycode, modifiers); break; case IBUS_KP_Decimal: - retval = processPunct ('.', keycode, modifiers); + retval = FALSE; break; case IBUS_KP_Divide: retval = processPunct ('/', keycode, modifiers); 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/ibus-libpinyin-1.10.92/src/PYPConfig.cc new/ibus-libpinyin-1.11.0/src/PYPConfig.cc --- old/ibus-libpinyin-1.10.92/src/PYPConfig.cc 2018-08-20 11:22:03.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/src/PYPConfig.cc 2019-01-04 04:51:13.000000000 +0100 @@ -48,6 +48,7 @@ const gchar * const CONFIG_INIT_SIMP_CHINESE = "init-simplified-chinese"; const gchar * const CONFIG_DICTIONARIES = "dictionaries"; const gchar * const CONFIG_LUA_CONVERTER = "lua-converter"; +const gchar * const CONFIG_OPENCC_CONFIG = "opencc-config"; const gchar * const CONFIG_BOPOMOFO_KEYBOARD_MAPPING = "bopomofo-keyboard-mapping"; const gchar * const CONFIG_SELECT_KEYS = "select-keys"; const gchar * const CONFIG_GUIDE_KEY = "guide-key"; @@ -118,6 +119,7 @@ m_dictionaries = ""; m_lua_converter = ""; + m_opencc_config = "s2t.json"; m_main_switch = "<Shift>"; m_letter_switch = ""; @@ -209,6 +211,7 @@ m_show_suggestion = read (CONFIG_SHOW_SUGGESTION, false); m_dictionaries = read (CONFIG_DICTIONARIES, ""); + m_opencc_config = read (CONFIG_OPENCC_CONFIG, "s2t.json"); m_main_switch = read (CONFIG_MAIN_SWITCH, "<Shift>"); m_letter_switch = read (CONFIG_LETTER_SWITCH, ""); @@ -273,6 +276,8 @@ m_show_suggestion = normalizeGVariant (value, false); } else if (CONFIG_DICTIONARIES == name) { m_dictionaries = normalizeGVariant (value, std::string ("")); + } else if (CONFIG_OPENCC_CONFIG == name) { + m_opencc_config = normalizeGVariant (value, std::string ("s2t.json")); } else if (CONFIG_MAIN_SWITCH == name) { m_main_switch = normalizeGVariant (value, std::string ("<Shift>")); } else if (CONFIG_LETTER_SWITCH == name) { 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/ibus-libpinyin-1.10.92/src/PYPEmojiCandidates.cc new/ibus-libpinyin-1.11.0/src/PYPEmojiCandidates.cc --- old/ibus-libpinyin-1.10.92/src/PYPEmojiCandidates.cc 2018-09-27 10:20:51.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/src/PYPEmojiCandidates.cc 2018-11-14 05:54:23.000000000 +0100 @@ -23,7 +23,7 @@ #include "PYPEmojiCandidates.h" #include <assert.h> #include <algorithm> -#include <string> +#include <cstring> #include "PYPPhoneticEditor.h" #include "PYConfig.h" #include "PYPEmojiTable.h" @@ -37,7 +37,7 @@ static bool compare_match_less_than (const EmojiItem & lhs, const EmojiItem & rhs) { - return 0 > strcmp (lhs.m_emoji_match, rhs.m_emoji_match); + return 0 > std::strcmp (lhs.m_emoji_match, rhs.m_emoji_match); } static bool search_emoji (const EmojiItem * emojis, 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/ibus-libpinyin-1.10.92/src/PYPPhoneticEditor.cc new/ibus-libpinyin-1.11.0/src/PYPPhoneticEditor.cc --- old/ibus-libpinyin-1.10.92/src/PYPPhoneticEditor.cc 2018-10-31 06:10:22.000000000 +0100 +++ new/ibus-libpinyin-1.11.0/src/PYPPhoneticEditor.cc 2019-01-10 10:50:56.000000000 +0100 @@ -38,7 +38,7 @@ m_lua_converter_candidates (this), #endif m_emoji_candidates (this), - m_traditional_candidates (this) + m_traditional_candidates (this, config) { } @@ -228,8 +228,7 @@ m_libpinyin_candidates.processCandidates (m_candidates); - if (!m_props.modeSimp ()) - m_traditional_candidates.processCandidates (m_candidates); + m_emoji_candidates.processCandidates (m_candidates); #ifdef IBUS_BUILD_LUA_EXTENSION m_lua_trigger_candidates.processCandidates (m_candidates); @@ -242,7 +241,8 @@ } #endif - m_emoji_candidates.processCandidates (m_candidates); + if (!m_props.modeSimp ()) + m_traditional_candidates.processCandidates (m_candidates); return TRUE; } 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/ibus-libpinyin-1.10.92/src/PYPSuggestionEditor.cc new/ibus-libpinyin-1.11.0/src/PYPSuggestionEditor.cc --- old/ibus-libpinyin-1.10.92/src/PYPSuggestionEditor.cc 2018-10-31 06:13:04.000000000 +0100 +++ new/ibus-libpinyin-1.11.0/src/PYPSuggestionEditor.cc 2019-01-03 06:54:40.000000000 +0100 @@ -35,7 +35,7 @@ m_lua_trigger_candidates (this), m_lua_converter_candidates (this), #endif - m_traditional_candidates (this) + m_traditional_candidates (this, config) { /* use m_text to store the prefix string. */ m_text = ""; 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/ibus-libpinyin-1.10.92/src/PYPTradCandidates.cc new/ibus-libpinyin-1.11.0/src/PYPTradCandidates.cc --- old/ibus-libpinyin-1.10.92/src/PYPTradCandidates.cc 2018-06-27 05:08:59.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/src/PYPTradCandidates.cc 2019-01-03 06:54:40.000000000 +0100 @@ -23,7 +23,6 @@ #include <assert.h> #include "PYString.h" #include "PYPPhoneticEditor.h" -#include "PYSimpTradConverter.h" using namespace PY; @@ -42,7 +41,7 @@ enhanced.m_candidate_id = i; trad.truncate (0); - SimpTradConverter::simpToTrad (enhanced.m_display_string.c_str (), trad); + m_converter.simpToTrad (enhanced.m_display_string.c_str (), trad); enhanced.m_display_string = trad; } @@ -62,7 +61,7 @@ if (action & SELECT_CANDIDATE_MODIFY_IN_PLACE) { String trad; - SimpTradConverter::simpToTrad + m_converter.simpToTrad (m_candidates[id].m_display_string.c_str (), trad); enhanced.m_display_string = trad; } 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/ibus-libpinyin-1.10.92/src/PYPTradCandidates.h new/ibus-libpinyin-1.11.0/src/PYPTradCandidates.h --- old/ibus-libpinyin-1.10.92/src/PYPTradCandidates.h 2018-06-27 05:08:59.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/src/PYPTradCandidates.h 2019-01-03 06:54:40.000000000 +0100 @@ -24,6 +24,8 @@ #include <vector> #include "PYPEnhancedCandidates.h" +#include "PYConfig.h" +#include "PYSimpTradConverter.h" namespace PY { @@ -31,7 +33,7 @@ class TraditionalCandidates : public EnhancedCandidates<Editor> { public: - TraditionalCandidates (Editor *editor) { + TraditionalCandidates (Editor *editor, Config & config) : m_converter(config) { m_editor = editor; } @@ -42,6 +44,7 @@ protected: std::vector<EnhancedCandidate> m_candidates; + SimpTradConverter m_converter; }; }; 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/ibus-libpinyin-1.10.92/src/PYSimpTradConverter.cc new/ibus-libpinyin-1.11.0/src/PYSimpTradConverter.cc --- old/ibus-libpinyin-1.10.92/src/PYSimpTradConverter.cc 2018-05-22 09:16:33.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/src/PYSimpTradConverter.cc 2019-01-03 07:01:56.000000000 +0100 @@ -41,9 +41,9 @@ class opencc { public: - opencc (void) + opencc (const char* configFileName) { - m_cc = opencc_open (OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD); + m_cc = opencc_open (configFileName); g_assert (m_cc != NULL); } @@ -66,7 +66,7 @@ void SimpTradConverter::simpToTrad (const gchar *in, String &out) { - static opencc opencc; + static opencc opencc(m_config.openccConfig().c_str()); opencc.convert (in, out); } 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/ibus-libpinyin-1.10.92/src/PYSimpTradConverter.h new/ibus-libpinyin-1.11.0/src/PYSimpTradConverter.h --- old/ibus-libpinyin-1.10.92/src/PYSimpTradConverter.h 2018-05-22 09:16:33.000000000 +0200 +++ new/ibus-libpinyin-1.11.0/src/PYSimpTradConverter.h 2019-01-03 06:58:38.000000000 +0100 @@ -22,6 +22,7 @@ #define __PY_SIMP_TRAD_CONVERTER_H_ #include <glib.h> +#include "PYConfig.h" namespace PY { @@ -29,7 +30,10 @@ class SimpTradConverter { public: - static void simpToTrad (const gchar *in, String &out); + SimpTradConverter(Config & config) : m_config(config) {} + void simpToTrad (const gchar *in, String &out); +private: + Config & m_config; }; }; 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/ibus-libpinyin-1.10.92/src/libpinyin.xml.in new/ibus-libpinyin-1.11.0/src/libpinyin.xml.in --- old/ibus-libpinyin-1.10.92/src/libpinyin.xml.in 2018-10-31 06:15:09.000000000 +0100 +++ new/ibus-libpinyin-1.11.0/src/libpinyin.xml.in 2019-01-21 10:56:26.000000000 +0100 @@ -4,7 +4,7 @@ <name>org.freedesktop.IBus.Libpinyin</name> <description>Libpinyin Component</description> <exec>${libexecdir}/ibus-engine-libpinyin --ibus</exec> - <version>1.10.92</version> + <version>1.11.0</version> <author>Peng Wu <[email protected]></author> <license>GPL</license> <homepage>https://github.com/libpinyin/ibus-libpinyin</homepage> 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/ibus-libpinyin-1.10.92/test-driver new/ibus-libpinyin-1.11.0/test-driver --- old/ibus-libpinyin-1.10.92/test-driver 2018-10-31 06:15:07.000000000 +0100 +++ new/ibus-libpinyin-1.11.0/test-driver 2019-01-21 10:56:22.000000000 +0100 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -140,7 +140,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0"
