Hello community, here is the log from the commit of package ibus-libpinyin for openSUSE:Factory checked in at 2015-12-29 12:59:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-libpinyin (Old) and /work/SRC/openSUSE:Factory/.ibus-libpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-libpinyin" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-libpinyin/ibus-libpinyin.changes 2015-10-06 13:25:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-libpinyin.new/ibus-libpinyin.changes 2015-12-29 12:59:21.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Dec 25 05:55:45 UTC 2015 - [email protected] + +- update version 1.7.4 + * use pinyin_in_chewing_keyboard method + * fixes m_bopomofo_keyboard_mapping option +- changes in version 1.7.3 + * use libpinyin 1.2.91 + * add Catalan + * fix for lua 5.2 API change (luaL_register is deprecated) + * update clearPinyinUserData method + * update m_dictionaries + * use pinyin_load_addon_phrase_library function + * update setup dialog + +------------------------------------------------------------------- Old: ---- ibus-libpinyin-1.7.2git20150720.tar.gz New: ---- ibus-libpinyin-1.7.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-libpinyin.spec ++++++ --- /var/tmp/diff_new_pack.LWtpQT/_old 2015-12-29 12:59:22.000000000 +0100 +++ /var/tmp/diff_new_pack.LWtpQT/_new 2015-12-29 12:59:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ibus-libpinyin # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 Hillwood Yang ([email protected]) # # All modifications and additions to the file contributed by third parties @@ -18,14 +18,13 @@ Name: ibus-libpinyin -Version: 1.7.2git20150720 +Version: 1.7.4 Release: 0 Summary: Intelligent Pinyin engine based on libpinyin for IBus License: GPL-2.0+ Group: System/I18n/Chinese Url: https://github.com/libpinyin/ibus-libpinyin -Source0: %{name}-%{version}.tar.gz -BuildRequires: automake +Source: https://github.com/libpinyin/ibus-libpinyin/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext-devel @@ -34,7 +33,6 @@ BuildRequires: intltool BuildRequires: libtool BuildRequires: libuuid-devel -BuildRequires: opencc >= 1.0.0 BuildRequires: opencc-devel >= 1.0.0 BuildRequires: pkgconfig BuildRequires: sqlite3 @@ -42,17 +40,14 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(gdk-3.0) BuildRequires: pkgconfig(libpinyin) >= 1.0.99 +Requires: python-xdg +Provides: locale(ibus:zh_CN;zh_SG) +%{ibus_requires} %if 0%{?suse_version} <= 1320 BuildRequires: lua51-devel %else BuildRequires: pkgconfig(lua) %endif -# Requires(post): sqlite -Requires: ibus >= 1.4.99 -Requires: libpinyin6 >= 1.0.99 -Requires: opencc -Requires: python-xdg -Provides: locale(ibus:zh_CN;zh_SG) %description It includes a Chinese Pinyin input method and a Chinese ZhuYin (Bopomofo) input method based on libpinyin for IBus. @@ -72,8 +67,7 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=${RPM_BUILD_ROOT} install +make DESTDIR=%{buildroot} install %{?_smp_mflags} %fdupes %{buildroot} %find_lang %{name} @@ -82,7 +76,7 @@ %suse_update_desktop_file ibus-setup-libbopomofo Utility DesktopUtility System %files -f %{name}.lang -%defattr(-,root,root,-) +%defattr(-,root,root) %doc AUTHORS COPYING README %{_libdir}/ibus/ibus-engine-libpinyin %{_libdir}/ibus/ibus-setup-libpinyin ++++++ ibus-libpinyin-1.7.2git20150720.tar.gz -> ibus-libpinyin-1.7.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.2git20150720/configure.ac new/ibus-libpinyin-1.7.4/configure.ac --- old/ibus-libpinyin-1.7.2git20150720/configure.ac 2015-07-20 07:29:53.000000000 +0200 +++ new/ibus-libpinyin-1.7.4/configure.ac 2015-12-17 07:51:46.000000000 +0100 @@ -22,7 +22,7 @@ m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [7]) -m4_define([ibus_micro_version], [2]) +m4_define([ibus_micro_version], [4]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -61,10 +61,14 @@ PKG_CHECK_MODULES(SQLITE, [ sqlite3 ]) + AC_PATH_PROG(SQLITE3, sqlite3) +if test -z "$SQLITE3"; then + AC_MSG_ERROR([could not find sqlite3 tool.]) +fi PKG_CHECK_MODULES(LIBPINYIN, [ - libpinyin >= 1.1.91 + libpinyin >= 1.2.91 ], [enable_libpinyin=yes]) LIBPINYIN_DATADIR=`$PKG_CONFIG --variable=pkgdatadir libpinyin` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.2git20150720/po/LINGUAS new/ibus-libpinyin-1.7.4/po/LINGUAS --- old/ibus-libpinyin-1.7.2git20150720/po/LINGUAS 2015-07-20 07:29:53.000000000 +0200 +++ new/ibus-libpinyin-1.7.4/po/LINGUAS 2015-12-17 07:51:46.000000000 +0100 @@ -1,3 +1,4 @@ +ca fr ru zh_CN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.2git20150720/po/ca.po new/ibus-libpinyin-1.7.4/po/ca.po --- old/ibus-libpinyin-1.7.2git20150720/po/ca.po 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-libpinyin-1.7.4/po/ca.po 2015-12-17 07:51:46.000000000 +0100 @@ -0,0 +1,621 @@ +# Robert Antoni Buj Gelonch <[email protected]>, 2015. #zanata +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-02-25 14:39+0800\n" +"PO-Revision-Date: 2015-09-24 09:36-0400\n" +"Last-Translator: Robert Antoni Buj Gelonch <[email protected]>\n" +"Language-Team: Catalan\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"X-Generator: Zanata 3.7.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: ../src/PYMain.cc:97 +msgid "Libpinyin input method" +msgstr "Mètode d'entrada Libpinyin" + +#: ../src/PYMain.cc:107 +msgid "Intelligent Pinyin (debug)" +msgstr "Pinyin intel·ligent (depuració)" + +#: ../src/PYMain.cc:108 +msgid "Intelligent Pinyin input method (debug)" +msgstr "Mètode d'entrada pinyin intel·ligent (depuració)" + +#: ../src/PYMain.cc:118 +msgid "Bopomofo (debug)" +msgstr "Bopomofo (depuració)" + +#: ../src/PYMain.cc:119 +msgid "Bopomofo input method (debug)" +msgstr "Mètode d'entrada bopomofo (depuració)" + +#: ../src/PYPinyinProperties.cc:40 +#: ../src/PYPinyinProperties.cc:105 +#: ../setup/ibus-libpinyin-preferences.ui.h:17 +msgid "Chinese" +msgstr "Xinès" + +#: ../src/PYPinyinProperties.cc:41 +#: ../src/PYPinyinProperties.cc:106 +#: ../setup/ibus-libpinyin-preferences.ui.h:18 +msgid "English" +msgstr "Anglès" + +#: ../src/PYPinyinProperties.cc:46 +#: ../src/PYPinyinProperties.cc:117 +msgid "Switch to English Mode" +msgstr "Commuta al mode anglès" + +#: ../src/PYPinyinProperties.cc:47 +#: ../src/PYPinyinProperties.cc:118 +msgid "Switch to Chinese Mode" +msgstr "Commuta al mode xinès" + +#: ../src/PYPinyinProperties.cc:51 +#: ../src/PYPinyinProperties.cc:130 +msgid "Full Width Letter" +msgstr "Lletra d'amplada completa" + +#: ../src/PYPinyinProperties.cc:52 +#: ../src/PYPinyinProperties.cc:131 +msgid "Half Width Letter" +msgstr "Lletra d'amplada mitjana" + +#: ../src/PYPinyinProperties.cc:57 +#: ../src/PYPinyinProperties.cc:136 +msgid "Switch to Half Width Letter Mode" +msgstr "Commuta al mode de lletra d'amplada mitjana" + +#: ../src/PYPinyinProperties.cc:58 +#: ../src/PYPinyinProperties.cc:137 +msgid "Switch to Full Width Letter Mode" +msgstr "Commuta al mode de lletra d'amplada completa" + +#: ../src/PYPinyinProperties.cc:62 +#: ../src/PYPinyinProperties.cc:146 +msgid "Full Width Punct" +msgstr "Puntuació d'amplada completa" + +#: ../src/PYPinyinProperties.cc:63 +#: ../src/PYPinyinProperties.cc:147 +msgid "Half Width Punct" +msgstr "Puntuació d'amplada mitjana" + +#: ../src/PYPinyinProperties.cc:68 +#: ../src/PYPinyinProperties.cc:152 +msgid "Switch to Half Width Punctuation Mode" +msgstr "Commuta al mode de puntuació d'amplada mitjana" + +#: ../src/PYPinyinProperties.cc:69 +#: ../src/PYPinyinProperties.cc:153 +msgid "Switch to Full Width Punctuation Mode" +msgstr "Commuta al mode de puntuació d'amplada completa" + +#: ../src/PYPinyinProperties.cc:73 +#: ../src/PYPinyinProperties.cc:162 +msgid "Simplified Chinese" +msgstr "Xinès simplificat" + +#: ../src/PYPinyinProperties.cc:74 +#: ../src/PYPinyinProperties.cc:163 +msgid "Traditional Chinese" +msgstr "Xinès tradicional" + +#: ../src/PYPinyinProperties.cc:79 +#: ../src/PYPinyinProperties.cc:168 +msgid "Switch to Traditional Chinese Mode" +msgstr "Commuta al mode xinès tradicional" + +#: ../src/PYPinyinProperties.cc:80 +#: ../src/PYPinyinProperties.cc:169 +msgid "Switch to Simplfied Chinese Mode" +msgstr "Commuta al mode xinès simplificat" + +#: ../src/PYPinyinProperties.cc:83 +#: ../src/PYPinyinProperties.cc:85 +#: ../setup/ibus-libpinyin-preferences.ui.h:13 +msgid "Preferences" +msgstr "Preferències" + +#: ../src/PYPinyinProperties.cc:88 +#: ../src/PYPinyinProperties.cc:109 +msgid "中" +msgstr "中" + +#: ../src/PYPinyinProperties.cc:90 +#: ../src/PYPinyinProperties.cc:111 +msgid "英" +msgstr "英" + +#: ../src/PYEnglishEditor.cc:610 +msgid "Please input the english word." +msgstr "Si us plau, introduïu la paraula anglesa." + +#: ../src/PYStrokeEditor.cc:386 +msgid "Please use \"hspnz\" to input." +msgstr "Si us plau, utilitzeu \"hspnz\" per a l'entrada." + +#: ../setup/main2.py:390 +msgid "Please choose a file" +msgstr "Si us plau, seleccioneu un fitxer" + +#: ../setup/main2.py:408 +msgid "Please save a file" +msgstr "Si us plau, deseu un fitxer" + +#: ../setup/main2.py:452 +#: ../setup/ibus-libpinyin-preferences.ui.h:80 +#, no-c-format, python-format +msgid "<big><b>Intelligent Pinyin %s</b></big>" +msgstr "<big><b>Pinyin intel·ligent %s</b></big>" + +#: ../setup/dicttreeview.py:56 +msgid "Low Frequent Characters" +msgstr "Caràcters amb freqüència baixa" + +#: ../setup/dicttreeview.py:57 +msgid "Art" +msgstr "Art" + +#: ../setup/dicttreeview.py:58 +msgid "Culture" +msgstr "Cultura" + +#: ../setup/dicttreeview.py:59 +msgid "Economy" +msgstr "Economia" + +#: ../setup/dicttreeview.py:60 +msgid "Geology" +msgstr "Geologia" + +#: ../setup/dicttreeview.py:61 +msgid "History" +msgstr "Història" + +#: ../setup/dicttreeview.py:62 +msgid "Life" +msgstr "Vida" + +#: ../setup/dicttreeview.py:63 +msgid "Nature" +msgstr "Natura" + +#: ../setup/dicttreeview.py:64 +msgid "SciTech" +msgstr "Ciència i tecnologia" + +#: ../setup/dicttreeview.py:65 +msgid "Society" +msgstr "Societat" + +#: ../setup/dicttreeview.py:66 +msgid "Sport" +msgstr "Esport" + +#: ../setup/dicttreeview.py:113 +msgid "Active" +msgstr "Actiu" + +#: ../setup/dicttreeview.py:118 +#: ../setup/shortcuteditor.py:82 +msgid "Description" +msgstr "Descripció" + +#: ../setup/keyboardshortcut.py:54 +msgid "Shortcut:" +msgstr "Drecera:" + +#: ../setup/keyboardshortcut.py:67 +msgid "Key code:" +msgstr "Codi de tecla:" + +#: ../setup/keyboardshortcut.py:82 +msgid "Modifiers:" +msgstr "Modificadors:" + +#: ../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 "" +"Si us plau, premeu qualsevol tecla (o combinació de tecles).\n" +"El diàleg es tancarà quan deixeu de prémer la tecla." + +#: ../setup/keyboardshortcut.py:174 +msgid "Please press a key (or a key combination)" +msgstr "Si us plau, premeu qualsevol tecla (o combinació de tecles)" + +#: ../setup/keyboardshortcut.py:186 +msgid "Shorcut Editor" +msgstr "Editor de dreceres" + +#: ../setup/keyboardshortcut.py:239 +#: ../setup/shortcuteditor.py:193 +#: ../setup/shortcuteditor.py:228 +msgid "_Cancel" +msgstr "_Cancel·la" + +#: ../setup/keyboardshortcut.py:240 +#: ../setup/shortcuteditor.py:194 +#: ../setup/shortcuteditor.py:229 +msgid "_OK" +msgstr "D'ac_ord" + +#: ../setup/shortcuteditor.py:46 +msgid "Switch Chinese/English" +msgstr "Commuta xinès/anglès" + +#: ../setup/shortcuteditor.py:47 +msgid "Full/Half Width Letter" +msgstr "Amplada de la lletra mitjana/completa" + +#: ../setup/shortcuteditor.py:48 +msgid "Full/Half Width Punct" +msgstr "Amplada de la puntuació mitjana/completa" + +#: ../setup/shortcuteditor.py:49 +msgid "Switch Traditional/Simplfied Chinese" +msgstr "Commuta xinès tradicional/simplificat" + +#: ../setup/shortcuteditor.py:87 +msgid "Accelerator" +msgstr "Accelerador" + +#: ../setup/shortcuteditor.py:105 +msgid "This shortcut key is already used." +msgstr "La tecla de la drecera ja està en ús." + +#. set default button +#: ../setup/shortcuteditor.py:163 +msgid "_Default" +msgstr "Pre_determinat" + +#. edit button +#: ../setup/shortcuteditor.py:169 +msgid "_Edit" +msgstr "_Edita" + +#: ../setup/shortcuteditor.py:192 +msgid "Select Switching Key" +msgstr "Selecciona la tecla de commutació" + +#: ../setup/ibus-libpinyin-preferences.ui.h:1 +msgid "Standard" +msgstr "Estàndard" + +#: ../setup/ibus-libpinyin-preferences.ui.h:2 +msgid "GinYieh" +msgstr "GinYieh" + +#: ../setup/ibus-libpinyin-preferences.ui.h:3 +msgid "Eten" +msgstr "Eten" + +#: ../setup/ibus-libpinyin-preferences.ui.h:4 +msgid "IBM" +msgstr "IBM" + +#: ../setup/ibus-libpinyin-preferences.ui.h:5 +msgid "MSPY" +msgstr "MSPY" + +#: ../setup/ibus-libpinyin-preferences.ui.h:6 +msgid "ZRM" +msgstr "ZRM" + +#: ../setup/ibus-libpinyin-preferences.ui.h:7 +msgid "ABC" +msgstr "ABC" + +#: ../setup/ibus-libpinyin-preferences.ui.h:8 +msgid "ZGPY" +msgstr "ZGPY" + +#: ../setup/ibus-libpinyin-preferences.ui.h:9 +msgid "PYJJ" +msgstr "PYJJ" + +#: ../setup/ibus-libpinyin-preferences.ui.h:10 +msgid "XHE" +msgstr "XHE" + +#: ../setup/ibus-libpinyin-preferences.ui.h:11 +msgid "Horizontal" +msgstr "Horitzontal" + +#: ../setup/ibus-libpinyin-preferences.ui.h:12 +msgid "Vertical" +msgstr "Vertical" + +#: ../setup/ibus-libpinyin-preferences.ui.h:14 +msgid "Language:" +msgstr "Idioma:" + +#: ../setup/ibus-libpinyin-preferences.ui.h:15 +msgid "Half/full width:" +msgstr "Amplada mitjana/completa:" + +#: ../setup/ibus-libpinyin-preferences.ui.h:16 +msgid "Punctuations:" +msgstr "Puntuacions:" + +#: ../setup/ibus-libpinyin-preferences.ui.h:19 +msgid "Full" +msgstr "Completa" + +#: ../setup/ibus-libpinyin-preferences.ui.h:20 +msgid "Half" +msgstr "Mitjana" + +#: ../setup/ibus-libpinyin-preferences.ui.h:21 +msgid "Chinese:" +msgstr "Xinès:" + +#: ../setup/ibus-libpinyin-preferences.ui.h:22 +msgid "Simplified" +msgstr "Simplificat" + +#: ../setup/ibus-libpinyin-preferences.ui.h:23 +msgid "Traditional" +msgstr "Tradicional" + +#: ../setup/ibus-libpinyin-preferences.ui.h:24 +msgid "<b>Initial state</b>" +msgstr "<b>Estat inicial</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:25 +msgid "Orientation of candidates:" +msgstr "Orientació dels candidats:" + +#: ../setup/ibus-libpinyin-preferences.ui.h:26 +msgid "Number of candidates:" +msgstr "Nombre de candidats:" + +#: ../setup/ibus-libpinyin-preferences.ui.h:27 +msgid "<b>UI</b>" +msgstr "<b>Interfície d'usuari</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:28 +msgid "Dynamic adjust the candidates order." +msgstr "Ajusta dinàmicament l'ordre dels candidats." + +#: ../setup/ibus-libpinyin-preferences.ui.h:29 +msgid "Remember every input as a phrase." +msgstr "Recorda cada entrada com a una frase." + +#: ../setup/ibus-libpinyin-preferences.ui.h:30 +msgid "<b>Candidates</b>" +msgstr "<b>Candidats</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:31 +msgid "General" +msgstr "General" + +#: ../setup/ibus-libpinyin-preferences.ui.h:32 +msgid "Full pinyin" +msgstr "Pinyin complet" + +#: ../setup/ibus-libpinyin-preferences.ui.h:33 +msgid "Double pinyin" +msgstr "Pinyin doble" + +#: ../setup/ibus-libpinyin-preferences.ui.h:34 +msgid "Show raw input of Double Pinyin" +msgstr "Mostra l'entrada raw del pinyin doble" + +#: ../setup/ibus-libpinyin-preferences.ui.h:35 +msgid "Incomplete pinyin" +msgstr "Pinyin incomplet" + +#: ../setup/ibus-libpinyin-preferences.ui.h:36 +msgid "<b>Pinyin mode</b>" +msgstr "<b>Mode pinyin</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:37 +msgid "[Shift] select candidate" +msgstr "[Maj.] selecciona el candidat" + +#: ../setup/ibus-libpinyin-preferences.ui.h:38 +msgid "[-] [=] flip page" +msgstr "[-] [=] gira la pàgina" + +#: ../setup/ibus-libpinyin-preferences.ui.h:39 +msgid "[,] [.] flip page" +msgstr "[,] [.] gira la pàgina" + +#: ../setup/ibus-libpinyin-preferences.ui.h:40 +msgid "Auto commit" +msgstr "Consignació automàtica:" + +#: ../setup/ibus-libpinyin-preferences.ui.h:41 +msgid "<b>Input Custom</b>" +msgstr "<b>Entrada personalitzada</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:42 +msgid "Enable correct pinyin" +msgstr "Habilita la correcció de pinyin" + +#: ../setup/ibus-libpinyin-preferences.ui.h:43 +msgid "<b>Correct pinyin</b>" +msgstr "<b>Correcció de pinyin</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:44 +msgid "Pinyin mode" +msgstr "Mode pinyin" + +#: ../setup/ibus-libpinyin-preferences.ui.h:45 +msgid "Incomplete Bopomofo" +msgstr "Bopomofo incomplet" + +#: ../setup/ibus-libpinyin-preferences.ui.h:46 +msgid "Keyboard Mapping:" +msgstr "Assignació del teclat:" + +#: ../setup/ibus-libpinyin-preferences.ui.h:47 +msgid "<b>Bopomofo mode</b>" +msgstr "<b>Mode bopomofo</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:48 +msgid "Selection Keys:" +msgstr "Tecles de selecció:" + +#: ../setup/ibus-libpinyin-preferences.ui.h:49 +msgid "Enable Guidekey for Candidates Selection" +msgstr "Habilita Guidekey per a la selecció de candidats" + +#: ../setup/ibus-libpinyin-preferences.ui.h:50 +msgid "Enable Auxiliary Select Keys F1 .. F10" +msgstr "Habilita les tecles auxiliars de selecció F1..F10" + +#: ../setup/ibus-libpinyin-preferences.ui.h:51 +msgid "Enable Auxiliary Select Keys Numbers on Keypad" +msgstr "Habilita les tecles auxiliars de selecció del teclat de números" + +#: ../setup/ibus-libpinyin-preferences.ui.h:52 +msgid "<b>Selection mode</b>" +msgstr "<b>Mode de selecció</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:53 +msgid "Feature of Enter key:" +msgstr "Funcionalitat de la tecla de Retorn:" + +#: ../setup/ibus-libpinyin-preferences.ui.h:54 +msgid "Commit first candidate" +msgstr "Consigna el primer candidat" + +#: ../setup/ibus-libpinyin-preferences.ui.h:55 +msgid "Commit original text" +msgstr "Consigna el text original" + +#: ../setup/ibus-libpinyin-preferences.ui.h:56 +msgid "<b>Other</b>" +msgstr "<b>Altres</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:57 +msgid "Bopomofo mode" +msgstr "Mode bopomofo" + +#: ../setup/ibus-libpinyin-preferences.ui.h:58 +msgid "Enable fuzzy syllable" +msgstr "Habilita la síl·laba difusa" + +#: ../setup/ibus-libpinyin-preferences.ui.h:59 +msgid "Fuzzy syllable" +msgstr "Síl·laba difusa" + +#: ../setup/ibus-libpinyin-preferences.ui.h:60 +msgid "Tips: this changes may take effects after ime restarted." +msgstr "" +"Consell: aquests canvis poden tenir efecte després de reiniciar l'ime." + +#: ../setup/ibus-libpinyin-preferences.ui.h:61 +msgid "<b>Dictionary option</b>" +msgstr "<b>Opció del diccionari</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:62 +msgid "Dictionary" +msgstr "Diccionari" + +#: ../setup/ibus-libpinyin-preferences.ui.h:63 +msgid "User Lua Script" +msgstr "Script lua d'usuari" + +#: ../setup/ibus-libpinyin-preferences.ui.h:64 +msgid "Edit" +msgstr "Edita" + +#: ../setup/ibus-libpinyin-preferences.ui.h:65 +msgid "<b>Customize IME</b>" +msgstr "<b>Personalitza l'IME</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:66 +msgid "Export" +msgstr "Exporta" + +#: ../setup/ibus-libpinyin-preferences.ui.h:67 +msgid "Import" +msgstr "Importa" + +#: ../setup/ibus-libpinyin-preferences.ui.h:68 +msgid "User Dictionary" +msgstr "Directori d'usuari" + +#: ../setup/ibus-libpinyin-preferences.ui.h:69 +msgid "Clear All Data" +msgstr "Neteja totes les dades" + +#: ../setup/ibus-libpinyin-preferences.ui.h:70 +msgid "Clear" +msgstr "Neteja" + +#: ../setup/ibus-libpinyin-preferences.ui.h:71 +msgid "" +"<b>Dictionary File Format:</b>\n" +" Each line contains one of the following:\n" +" \"phrase pinyin\" or \"phrase pinyin frequency\"\n" +" like \"你好 ni'hao\" or \"你好 ni'hao 5\"." +msgstr "" +"<b>Format del fitxer de diccionari:</b>\n" +" Cada línia conté una de les següents:\n" +" \"frase pinyin\" o \"frase pinyin freqüència\"\n" +" com ara \"你好 ni'hao\" o \"你好 ni'hao 5\"." + +#: ../setup/ibus-libpinyin-preferences.ui.h:75 +msgid "Help" +msgstr "Ajuda" + +#: ../setup/ibus-libpinyin-preferences.ui.h:76 +msgid "<b>User Dictionary</b>" +msgstr "<b>Diccionari d'usuari</b>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:77 +msgid "User data" +msgstr "Dades de l'usuari" + +#: ../setup/ibus-libpinyin-preferences.ui.h:78 +msgid "Shortcuts" +msgstr "Dreceres" + +#: ../setup/ibus-libpinyin-preferences.ui.h:81 +msgid "Intelligent Pinyin input method for IBus" +msgstr "Mètode d'entrada pinyin intel·ligent per a l'IBus" + +#: ../setup/ibus-libpinyin-preferences.ui.h:82 +msgid "<small>Copyright (c) 2011-2012 Peng Wu</small>" +msgstr "<small>Copyright (c) 2011-2012 Peng Wu</small>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:83 +msgid "https://github.com/libpinyin/ibus-libpinyin"; +msgstr "https://github.com/libpinyin/ibus-libpinyin"; + +#: ../setup/ibus-libpinyin-preferences.ui.h:84 +msgid "" +"<small>\n" +"<b>Authors:</b>\n" +"Peng Wu\n" +"Peng Huang\n" +"BYVoid\n" +"\n" +"<b>Contributors:</b>\n" +"koterpilla, Zerng07\n" +"</small>" +msgstr "" +"<small>\n" +"<b>Autors:</b>\n" +"Peng Wu\n" +"Peng Huang\n" +"BYVoid\n" +"\n" +"<b>Contribuïdors:</b>\n" +"koterpilla, Zerng07\n" +"</small>" + +#: ../setup/ibus-libpinyin-preferences.ui.h:93 +msgid "About" +msgstr "Quant a" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.2git20150720/scripts/valid_hanzi.py new/ibus-libpinyin-1.7.4/scripts/valid_hanzi.py --- old/ibus-libpinyin-1.7.2git20150720/scripts/valid_hanzi.py 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-libpinyin-1.7.4/scripts/valid_hanzi.py 2015-12-29 12:59:23.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to ../data/db/android/valid_hanzi.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.2git20150720/src/PYConfig.h new/ibus-libpinyin-1.7.4/src/PYConfig.h --- old/ibus-libpinyin-1.7.2git20150720/src/PYConfig.h 2015-07-20 07:29:53.000000000 +0200 +++ new/ibus-libpinyin-1.7.4/src/PYConfig.h 2015-12-17 07:51:46.000000000 +0100 @@ -58,7 +58,7 @@ gboolean initFullPunct (void) const { return m_init_full_punct; } gboolean initSimpChinese (void) const { return m_init_simp_chinese; } gboolean specialPhrases (void) const { return m_special_phrases; } - ChewingScheme bopomofoKeyboardMapping (void) const { return m_bopomofo_keyboard_mapping; } + ZhuyinScheme bopomofoKeyboardMapping (void) const { return m_bopomofo_keyboard_mapping; } gint selectKeys (void) const { return m_select_keys; } gboolean guideKey (void) const { return m_guide_key; } gboolean auxiliarySelectKeyF (void) const { return m_auxiliary_select_key_f; } @@ -112,7 +112,7 @@ gboolean m_init_simp_chinese; gboolean m_special_phrases; - ChewingScheme m_bopomofo_keyboard_mapping; + ZhuyinScheme m_bopomofo_keyboard_mapping; gint m_select_keys; gboolean m_guide_key; gboolean m_auxiliary_select_key_f; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.2git20150720/src/PYExtEditor.cc new/ibus-libpinyin-1.7.4/src/PYExtEditor.cc --- old/ibus-libpinyin-1.7.2git20150720/src/PYExtEditor.cc 2015-07-20 07:29:53.000000000 +0200 +++ new/ibus-libpinyin-1.7.4/src/PYExtEditor.cc 2015-12-17 07:51:46.000000000 +0100 @@ -603,7 +603,7 @@ return FALSE; } - if ( ! 'i' == m_text[0] ) { + if ( 'i' != m_text[0] ) { g_warning ("i is expected in m_text string.\n"); return FALSE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.2git20150720/src/PYLibPinyin.cc new/ibus-libpinyin-1.7.4/src/PYLibPinyin.cc --- old/ibus-libpinyin-1.7.2git20150720/src/PYLibPinyin.cc 2015-07-20 07:29:53.000000000 +0200 +++ new/ibus-libpinyin-1.7.4/src/PYLibPinyin.cc 2015-12-17 07:51:46.000000000 +0100 @@ -180,8 +180,8 @@ if (NULL == m_chewing_context) return FALSE; - ChewingScheme scheme = config->bopomofoKeyboardMapping (); - pinyin_set_chewing_scheme (m_chewing_context, scheme); + ZhuyinScheme scheme = config->bopomofoKeyboardMapping (); + pinyin_set_zhuyin_scheme (m_chewing_context, scheme); pinyin_option_t options = config->option() | USE_TONE; pinyin_set_options(m_chewing_context, options); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.2git20150720/src/PYPBopomofoEditor.cc new/ibus-libpinyin-1.7.4/src/PYPBopomofoEditor.cc --- old/ibus-libpinyin-1.7.2git20150720/src/PYPBopomofoEditor.cc 2015-07-20 07:29:53.000000000 +0200 +++ new/ibus-libpinyin-1.7.4/src/PYPBopomofoEditor.cc 2015-12-17 07:51:46.000000000 +0100 @@ -18,7 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + #include "PYPBopomofoEditor.h" +#include <assert.h> #include "PYConfig.h" #include "PYLibPinyin.h" #include "PYPinyinProperties.h" @@ -170,8 +172,10 @@ if (G_UNLIKELY (cmshm_filter (modifiers) != 0)) return m_text ? TRUE : FALSE; - if (!(pinyin_in_chewing_keyboard (m_instance, keyval, NULL))) + gchar ** symbols = NULL; + if (!pinyin_in_chewing_keyboard (m_instance, keyval, &symbols)) return FALSE; + g_strfreev (symbols); if (keyval == IBUS_space) return FALSE; @@ -273,9 +277,11 @@ /* text after pinyin */ const gchar *p = m_text.c_str() + m_pinyin_len; while (*p != '\0') { - const char * symbol = NULL; - if (pinyin_in_chewing_keyboard(m_instance, *p, &symbol)) { - m_buffer << symbol; + gchar ** symbols = NULL; + if (pinyin_in_chewing_keyboard (m_instance, *p, &symbols)) { + assert (1 == g_strv_length (symbols)); + m_buffer << symbols[0]; + g_strfreev (symbols); } else { if (G_UNLIKELY (m_props.modeFull ())) { m_buffer.appendUnichar (HalfFullConverter::toFull (*p)); @@ -353,7 +359,7 @@ gchar * str = NULL; if (G_UNLIKELY (cursor == m_cursor)) { /* at word boundary. */ - pinyin_get_chewing_string (m_instance, key, &str); + pinyin_get_zhuyin_string (m_instance, key, &str); m_buffer << '|' << str; g_free (str); } else if (G_LIKELY (cursor < m_cursor && @@ -368,22 +374,28 @@ String before = raw.substr (0, offset); String after = raw.substr (offset); String::const_iterator iter; - const char * symbol = NULL; - for ( iter = before.begin (); iter != before.end (); ++iter) { - if ( pinyin_in_chewing_keyboard(m_instance, *iter, &symbol)) - m_buffer << symbol; - else + gchar ** symbols = NULL; + for (iter = before.begin (); iter != before.end (); ++iter) { + if (pinyin_in_chewing_keyboard(m_instance, *iter, &symbols)) { + assert (1 == g_strv_length (symbols)); + m_buffer << symbols[0]; + g_strfreev (symbols); + } else { m_buffer << *iter; + } } m_buffer << '|'; - for ( iter = after.begin (); iter != after.end (); ++iter) { - if ( pinyin_in_chewing_keyboard (m_instance, *iter, &symbol)) - m_buffer << symbol; - else + for (iter = after.begin (); iter != after.end (); ++iter) { + if (pinyin_in_chewing_keyboard (m_instance, *iter, &symbols)) { + assert (1 == g_strv_length (symbols)); + m_buffer << symbols[0]; + g_strfreev (symbols); + } else { m_buffer << *iter; + } } } else { /* other words */ - pinyin_get_chewing_string (m_instance, key, &str); + pinyin_get_zhuyin_string (m_instance, key, &str); m_buffer << ' ' << str; g_free (str); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.2git20150720/src/PYPConfig.cc new/ibus-libpinyin-1.7.4/src/PYPConfig.cc --- old/ibus-libpinyin-1.7.2git20150720/src/PYPConfig.cc 2015-07-20 07:29:53.000000000 +0200 +++ new/ibus-libpinyin-1.7.4/src/PYPConfig.cc 2015-12-17 07:51:46.000000000 +0100 @@ -63,7 +63,7 @@ const pinyin_option_t PINYIN_DEFAULT_OPTION = PINYIN_INCOMPLETE | - CHEWING_INCOMPLETE| + ZHUYIN_INCOMPLETE| PINYIN_CORRECT_ALL| 0; @@ -88,7 +88,7 @@ LibPinyinConfig::initDefaultValues (void) { m_option = PINYIN_DEFAULT_OPTION; - m_option_mask = PINYIN_INCOMPLETE | CHEWING_INCOMPLETE | PINYIN_CORRECT_ALL; + m_option_mask = PINYIN_INCOMPLETE | ZHUYIN_INCOMPLETE | PINYIN_CORRECT_ALL; m_orientation = IBUS_ORIENTATION_HORIZONTAL; m_page_size = 5; @@ -109,6 +109,8 @@ m_init_simp_chinese = TRUE; m_special_phrases = TRUE; + m_bopomofo_keyboard_mapping = ZHUYIN_DEFAULT; + m_dictionaries = ""; m_main_switch = "<Shift>"; @@ -121,7 +123,7 @@ const gchar * const name; guint option; } options [] = { - { "IncompletePinyin", PINYIN_INCOMPLETE|CHEWING_INCOMPLETE}, + { "IncompletePinyin", PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE}, /* fuzzy pinyin */ { "FuzzyPinyin_C_CH", PINYIN_AMB_C_CH }, { "FuzzyPinyin_Z_ZH", PINYIN_AMB_Z_ZH }, @@ -464,12 +466,12 @@ /* Here are the chewing keyboard scheme mapping table. */ static const struct { gint bopomofo_keyboard; - ChewingScheme scheme; + ZhuyinScheme scheme; } chewing_schemes [] = { - {0, CHEWING_STANDARD}, - {1, CHEWING_GINYIEH}, - {2, CHEWING_ETEN}, - {3, CHEWING_IBM} + {0, ZHUYIN_STANDARD}, + {1, ZHUYIN_GINYIEH}, + {2, ZHUYIN_ETEN}, + {3, ZHUYIN_IBM} }; BopomofoConfig::BopomofoConfig (Bus & bus) @@ -500,7 +502,7 @@ m_special_phrases = read (CONFIG_SPECIAL_PHRASES, false); const gint map = read (CONFIG_BOPOMOFO_KEYBOARD_MAPPING, 0); - m_bopomofo_keyboard_mapping = CHEWING_DEFAULT; + m_bopomofo_keyboard_mapping = ZHUYIN_DEFAULT; for (guint i = 0; i < G_N_ELEMENTS (chewing_schemes); i++) { if (map == chewing_schemes[i].bopomofo_keyboard) { @@ -542,7 +544,7 @@ m_special_phrases = normalizeGVariant (value, false); else if (CONFIG_BOPOMOFO_KEYBOARD_MAPPING == name) { const gint map = normalizeGVariant (value, 0); - m_bopomofo_keyboard_mapping = CHEWING_DEFAULT; + m_bopomofo_keyboard_mapping = ZHUYIN_DEFAULT; for (guint i = 0; i < G_N_ELEMENTS (chewing_schemes); i++) { if (map == chewing_schemes[i].bopomofo_keyboard) {
