Hello community, here is the log from the commit of package ibus-libzhuyin for openSUSE:Factory checked in at 2016-10-20 23:07:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-libzhuyin (Old) and /work/SRC/openSUSE:Factory/.ibus-libzhuyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-libzhuyin" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-libzhuyin/ibus-libzhuyin.changes 2015-12-29 12:59:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ibus-libzhuyin.new/ibus-libzhuyin.changes 2016-10-20 23:07:56.000000000 +0200 @@ -1,0 +2,16 @@ +Sat Sep 10 08:57:00 UTC 2016 - [email protected] + +- Update to 1.7.8 + * fixes leak + * Fixes FallbackEditor + * fixes full punctuation in English mode + * use Shift-Space to toggle full English mode + * update class ZhuyinProperties + * update class ZhuyinConfig + * update main.py + * update setup UI + * combine two full/width modes into one mode + * fixes compile + + +------------------------------------------------------------------- Old: ---- ibus-libzhuyin-1.7.6.tar.gz New: ---- ibus-libzhuyin-1.7.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-libzhuyin.spec ++++++ --- /var/tmp/diff_new_pack.iG0yvW/_old 2016-10-20 23:07:57.000000000 +0200 +++ /var/tmp/diff_new_pack.iG0yvW/_new 2016-10-20 23:07:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ibus-libzhuyin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ibus-libzhuyin -Version: 1.7.6 +Version: 1.7.8 Release: 0 Summary: New Zhuyin engine based on libzhuyin for IBus License: GPL-2.0 ++++++ ibus-libzhuyin-1.7.6.tar.gz -> ibus-libzhuyin-1.7.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/ChangeLog new/ibus-libzhuyin-1.7.8/ChangeLog --- old/ibus-libzhuyin-1.7.6/ChangeLog 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/ChangeLog 2016-09-05 08:08:35.000000000 +0200 @@ -1,3 +1,7 @@ +version 1.7.7 +* bug fixes. +* update translations. + version 1.7.4 * add option - "Use Space Key to Show Candidates". * add option - "Show Candidates After the Cursor". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/configure.ac new/ibus-libzhuyin-1.7.8/configure.ac --- old/ibus-libzhuyin-1.7.6/configure.ac 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/configure.ac 2016-09-05 08:08:35.000000000 +0200 @@ -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], [6]) +m4_define([ibus_micro_version], [8]) 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' old/ibus-libzhuyin-1.7.6/po/zh_CN.po new/ibus-libzhuyin-1.7.8/po/zh_CN.po --- old/ibus-libzhuyin-1.7.6/po/zh_CN.po 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/po/zh_CN.po 2016-09-05 08:08:35.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: ibus-libpinyin 1.2.99\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-11 13:56+0800\n" -"PO-Revision-Date: 2015-08-11 14:01+0800\n" +"POT-Creation-Date: 2016-09-05 13:57+0800\n" +"PO-Revision-Date: 2016-09-05 14:07+0800\n" "Last-Translator: Peng Huang <[email protected]>\n" "Language-Team: Peng Huang <[email protected]>\n" "Language: \n" @@ -16,79 +16,63 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/ZYZhuyinProperties.cc:40 ../src/ZYZhuyinProperties.cc:105 +#: ../src/ZYZhuyinProperties.cc:39 ../src/ZYZhuyinProperties.cc:92 msgid "Chinese" msgstr "中文" -#: ../src/ZYZhuyinProperties.cc:41 ../src/ZYZhuyinProperties.cc:106 +#: ../src/ZYZhuyinProperties.cc:40 ../src/ZYZhuyinProperties.cc:93 msgid "English" msgstr "英文" -#: ../src/ZYZhuyinProperties.cc:46 ../src/ZYZhuyinProperties.cc:117 +#: ../src/ZYZhuyinProperties.cc:45 ../src/ZYZhuyinProperties.cc:104 msgid "Switch to English Mode" msgstr "切换到英文模式" -#: ../src/ZYZhuyinProperties.cc:47 ../src/ZYZhuyinProperties.cc:118 +#: ../src/ZYZhuyinProperties.cc:46 ../src/ZYZhuyinProperties.cc:105 msgid "Switch to Chinese Mode" msgstr "切换到中文模式" -#: ../src/ZYZhuyinProperties.cc:51 ../src/ZYZhuyinProperties.cc:130 -msgid "Full Width Letter" -msgstr "全角字母" - -#: ../src/ZYZhuyinProperties.cc:52 ../src/ZYZhuyinProperties.cc:131 -msgid "Half Width Letter" -msgstr "半角字母" - -#: ../src/ZYZhuyinProperties.cc:57 ../src/ZYZhuyinProperties.cc:136 -msgid "Switch to Half Width Letter Mode" -msgstr "切换到半母字母模式" - -#: ../src/ZYZhuyinProperties.cc:58 ../src/ZYZhuyinProperties.cc:137 -msgid "Switch to Full Width Letter Mode" -msgstr "切换到全角字母模式" - -#: ../src/ZYZhuyinProperties.cc:62 ../src/ZYZhuyinProperties.cc:146 -msgid "Full Width Punct" -msgstr "全角符号" - -#: ../src/ZYZhuyinProperties.cc:63 ../src/ZYZhuyinProperties.cc:147 -msgid "Half Width Punct" -msgstr "半角符号" - -#: ../src/ZYZhuyinProperties.cc:68 ../src/ZYZhuyinProperties.cc:152 -msgid "Switch to Half Width Punctuation Mode" -msgstr "切换到半角符号模式" - -#: ../src/ZYZhuyinProperties.cc:69 ../src/ZYZhuyinProperties.cc:153 -msgid "Switch to Full Width Punctuation Mode" -msgstr "切换到全角符号模式" +#: ../src/ZYZhuyinProperties.cc:50 ../src/ZYZhuyinProperties.cc:114 +msgid "Full Width" +msgstr "全角" + +#: ../src/ZYZhuyinProperties.cc:51 ../src/ZYZhuyinProperties.cc:115 +msgid "Half Width" +msgstr "半角" + +#: ../src/ZYZhuyinProperties.cc:56 ../src/ZYZhuyinProperties.cc:120 +msgid "Switch to Half Width Mode" +msgstr "切换到半角模式" + +#: ../src/ZYZhuyinProperties.cc:57 ../src/ZYZhuyinProperties.cc:121 +msgid "Switch to Full Width Mode" +msgstr "切换到全角模式" -#: ../src/ZYZhuyinProperties.cc:73 ../src/ZYZhuyinProperties.cc:162 +#: ../src/ZYZhuyinProperties.cc:61 ../src/ZYZhuyinProperties.cc:130 msgid "Traditional Chinese" msgstr "繁体中文" -#: ../src/ZYZhuyinProperties.cc:74 ../src/ZYZhuyinProperties.cc:163 +#: ../src/ZYZhuyinProperties.cc:62 ../src/ZYZhuyinProperties.cc:131 msgid "Simplified Chinese" msgstr "简体中文" -#: ../src/ZYZhuyinProperties.cc:79 ../src/ZYZhuyinProperties.cc:168 +#: ../src/ZYZhuyinProperties.cc:67 ../src/ZYZhuyinProperties.cc:136 msgid "Switch to Simplfied Chinese Mode" msgstr "切换到简体中文模式" -#: ../src/ZYZhuyinProperties.cc:80 ../src/ZYZhuyinProperties.cc:169 +#: ../src/ZYZhuyinProperties.cc:68 ../src/ZYZhuyinProperties.cc:137 msgid "Switch to Traditional Chinese Mode" msgstr "切换到繁体中文模式" -#: ../src/ZYZhuyinProperties.cc:83 ../src/ZYZhuyinProperties.cc:85 +#: ../src/ZYZhuyinProperties.cc:71 ../src/ZYZhuyinProperties.cc:73 msgid "Preferences" msgstr "首选项" -#: ../src/ZYZhuyinProperties.cc:88 ../src/ZYZhuyinProperties.cc:109 +#: ../src/ZYZhuyinProperties.cc:76 ../src/ZYZhuyinProperties.cc:96 msgid "中" msgstr "中" -#: ../src/ZYZhuyinProperties.cc:90 ../src/ZYZhuyinProperties.cc:111 +#: ../src/ZYZhuyinProperties.cc:78 ../src/ZYZhuyinProperties.cc:98 msgid "英" msgstr "英" @@ -104,11 +88,11 @@ msgid "New Zhuyin input method (debug)" msgstr "新注音输入法（调试）" -#: ../setup/main.py:242 +#: ../setup/main.py:249 msgid "Please choose a file" msgstr "请选择文件" -#: ../setup/main.py:268 +#: ../setup/main.py:275 #, python-format msgid "<big><b>New Zhuyin %s</b></big>" msgstr "<big><b>IBus 新注音 %s</b></big>" @@ -166,126 +150,122 @@ msgstr "启动后使用中文模式" #: ../setup/ibus-libzhuyin-preferences.ui.h:14 -msgid "Use Full Width English When Start-up" -msgstr "启动后使用全角英文模式" +msgid "Use Full Width When Start-up" +msgstr "启动后使用全角模式" #: ../setup/ibus-libzhuyin-preferences.ui.h:15 -msgid "Use Full Width Punctuation When Start-up" -msgstr "启动后使用全角符号模式" - -#: ../setup/ibus-libzhuyin-preferences.ui.h:16 msgid "Use Traditional Chinese When Start-up" msgstr "启动后使用繁体中文模式" -#: ../setup/ibus-libzhuyin-preferences.ui.h:17 +#: ../setup/ibus-libzhuyin-preferences.ui.h:16 msgid "Always Input Numbers by Input Pad" msgstr "小键盘始终输入数字" -#: ../setup/ibus-libzhuyin-preferences.ui.h:18 +#: ../setup/ibus-libzhuyin-preferences.ui.h:17 msgid "Use Space Key to Show Candidates" msgstr "使用空格键显示候选词" -#: ../setup/ibus-libzhuyin-preferences.ui.h:19 +#: ../setup/ibus-libzhuyin-preferences.ui.h:18 msgid "Show Candidates After the Cursor" msgstr "显示光标后的候选词" -#: ../setup/ibus-libzhuyin-preferences.ui.h:20 +#: ../setup/ibus-libzhuyin-preferences.ui.h:19 msgid "Inputting" msgstr "输入" -#: ../setup/ibus-libzhuyin-preferences.ui.h:21 +#: ../setup/ibus-libzhuyin-preferences.ui.h:20 msgid "Keyboard Layout" msgstr "键盘布局：" -#: ../setup/ibus-libzhuyin-preferences.ui.h:22 +#: ../setup/ibus-libzhuyin-preferences.ui.h:21 msgid "Candidate Choose Keys" msgstr "候选词选择键" -#: ../setup/ibus-libzhuyin-preferences.ui.h:23 +#: ../setup/ibus-libzhuyin-preferences.ui.h:22 msgid "Candidates per Page" msgstr "候选词每页显示个数" -#: ../setup/ibus-libzhuyin-preferences.ui.h:24 +#: ../setup/ibus-libzhuyin-preferences.ui.h:23 msgid "Keyboard" msgstr "键盘" -#: ../setup/ibus-libzhuyin-preferences.ui.h:25 +#: ../setup/ibus-libzhuyin-preferences.ui.h:24 msgid "Enable Fuzzy Zhuyin" msgstr "启动模糊音" -#: ../setup/ibus-libzhuyin-preferences.ui.h:26 +#: ../setup/ibus-libzhuyin-preferences.ui.h:25 msgid "l <=> n" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:27 +#: ../setup/ibus-libzhuyin-preferences.ui.h:26 msgid "f <=> h" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:28 +#: ../setup/ibus-libzhuyin-preferences.ui.h:27 msgid "l <=> r" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:29 +#: ../setup/ibus-libzhuyin-preferences.ui.h:28 msgid "g <=> k" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:30 +#: ../setup/ibus-libzhuyin-preferences.ui.h:29 msgid "c <=> ch" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:31 +#: ../setup/ibus-libzhuyin-preferences.ui.h:30 msgid "z <=> zh" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:32 +#: ../setup/ibus-libzhuyin-preferences.ui.h:31 msgid "s <=> sh" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:33 +#: ../setup/ibus-libzhuyin-preferences.ui.h:32 msgid "an <=> ang" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:34 +#: ../setup/ibus-libzhuyin-preferences.ui.h:33 msgid "in <=> ing" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:35 +#: ../setup/ibus-libzhuyin-preferences.ui.h:34 msgid "en <=> eng" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:36 +#: ../setup/ibus-libzhuyin-preferences.ui.h:35 msgid "Fuzzy Zhuyin" msgstr "模糊注音" -#: ../setup/ibus-libzhuyin-preferences.ui.h:37 +#: ../setup/ibus-libzhuyin-preferences.ui.h:36 msgid "User Symbols" msgstr "用户自定义符号" -#: ../setup/ibus-libzhuyin-preferences.ui.h:38 +#: ../setup/ibus-libzhuyin-preferences.ui.h:37 msgid "Edit" msgstr "编辑" -#: ../setup/ibus-libzhuyin-preferences.ui.h:39 +#: ../setup/ibus-libzhuyin-preferences.ui.h:38 msgid "Easy Symbols" msgstr "自定义快捷符号" -#: ../setup/ibus-libzhuyin-preferences.ui.h:40 +#: ../setup/ibus-libzhuyin-preferences.ui.h:39 msgid "User Phrases" msgstr "使用自定义词组" -#: ../setup/ibus-libzhuyin-preferences.ui.h:41 +#: ../setup/ibus-libzhuyin-preferences.ui.h:40 msgid "Clear" msgstr "清除" -#: ../setup/ibus-libzhuyin-preferences.ui.h:42 +#: ../setup/ibus-libzhuyin-preferences.ui.h:41 msgid "Import" msgstr "导入" -#: ../setup/ibus-libzhuyin-preferences.ui.h:43 +#: ../setup/ibus-libzhuyin-preferences.ui.h:42 msgid "Clear All Data" msgstr "清除所有数据" -#: ../setup/ibus-libzhuyin-preferences.ui.h:44 +#: ../setup/ibus-libzhuyin-preferences.ui.h:43 msgid "" "<b>Dictionary File Format:</b>\n" " Each line contains the following:\n" @@ -297,24 +277,24 @@ " \"短语 注音\"\n" " 例如 \"你好 ㄋㄧˇ ㄏㄠˇ\"" -#: ../setup/ibus-libzhuyin-preferences.ui.h:48 +#: ../setup/ibus-libzhuyin-preferences.ui.h:47 msgid "Help" msgstr "帮助" -#: ../setup/ibus-libzhuyin-preferences.ui.h:50 +#: ../setup/ibus-libzhuyin-preferences.ui.h:49 #, no-c-format msgid "<big><b>IBus Zhuyin %s</b></big>" msgstr "<big><b>IBus 注音 %s</b></big>" -#: ../setup/ibus-libzhuyin-preferences.ui.h:51 +#: ../setup/ibus-libzhuyin-preferences.ui.h:50 msgid "New Zhuyin input method for IBus" msgstr "IBus 新注音输入法" -#: ../setup/ibus-libzhuyin-preferences.ui.h:52 +#: ../setup/ibus-libzhuyin-preferences.ui.h:51 msgid "<small>Copyright (c) 2013-2014 Peng Wu</small>" msgstr "<small>版权所有 (c) 2013-2014 吴鹏</small>" -#: ../setup/ibus-libzhuyin-preferences.ui.h:53 +#: ../setup/ibus-libzhuyin-preferences.ui.h:52 msgid "" "<small>\n" "<b>Authors:</b>\n" @@ -336,6 +316,21 @@ "...\n" "</small>" -#: ../setup/ibus-libzhuyin-preferences.ui.h:62 +#: ../setup/ibus-libzhuyin-preferences.ui.h:61 msgid "About" msgstr "关于" + +#~ msgid "Full Width Letter" +#~ msgstr "全角字母" + +#~ msgid "Half Width Letter" +#~ msgstr "半角字母" + +#~ msgid "Switch to Half Width Punctuation Mode" +#~ msgstr "切换到半角符号模式" + +#~ msgid "Switch to Full Width Punctuation Mode" +#~ msgstr "切换到全角符号模式" + +#~ msgid "Use Full Width Punctuation When Start-up" +#~ msgstr "启动后使用全角符号模式" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/po/zh_HK.po new/ibus-libzhuyin-1.7.8/po/zh_HK.po --- old/ibus-libzhuyin-1.7.6/po/zh_HK.po 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/po/zh_HK.po 2016-09-05 08:08:35.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ibus-libpinyin 1.2.99\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-11 13:56+0800\n" +"POT-Creation-Date: 2016-09-05 13:57+0800\n" "PO-Revision-Date: 2015-05-13 16:00+0800\n" "Last-Translator: Peng Huang <[email protected]>\n" "Language-Team: Peng Huang <[email protected]>\n" @@ -16,79 +16,67 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/ZYZhuyinProperties.cc:40 ../src/ZYZhuyinProperties.cc:105 +#: ../src/ZYZhuyinProperties.cc:39 ../src/ZYZhuyinProperties.cc:92 msgid "Chinese" msgstr "中文" -#: ../src/ZYZhuyinProperties.cc:41 ../src/ZYZhuyinProperties.cc:106 +#: ../src/ZYZhuyinProperties.cc:40 ../src/ZYZhuyinProperties.cc:93 msgid "English" msgstr "英文" -#: ../src/ZYZhuyinProperties.cc:46 ../src/ZYZhuyinProperties.cc:117 +#: ../src/ZYZhuyinProperties.cc:45 ../src/ZYZhuyinProperties.cc:104 msgid "Switch to English Mode" msgstr "切換到英文模式" -#: ../src/ZYZhuyinProperties.cc:47 ../src/ZYZhuyinProperties.cc:118 +#: ../src/ZYZhuyinProperties.cc:46 ../src/ZYZhuyinProperties.cc:105 msgid "Switch to Chinese Mode" msgstr "切換到中文模式" -#: ../src/ZYZhuyinProperties.cc:51 ../src/ZYZhuyinProperties.cc:130 -msgid "Full Width Letter" -msgstr "全角字母" - -#: ../src/ZYZhuyinProperties.cc:52 ../src/ZYZhuyinProperties.cc:131 -msgid "Half Width Letter" -msgstr "半角字母" - -#: ../src/ZYZhuyinProperties.cc:57 ../src/ZYZhuyinProperties.cc:136 -msgid "Switch to Half Width Letter Mode" -msgstr "切換到半母字母模式" - -#: ../src/ZYZhuyinProperties.cc:58 ../src/ZYZhuyinProperties.cc:137 -msgid "Switch to Full Width Letter Mode" -msgstr "切換到全角字母模式" - -#: ../src/ZYZhuyinProperties.cc:62 ../src/ZYZhuyinProperties.cc:146 -msgid "Full Width Punct" +#: ../src/ZYZhuyinProperties.cc:50 ../src/ZYZhuyinProperties.cc:114 +#, fuzzy +msgid "Full Width" msgstr "全角符號" -#: ../src/ZYZhuyinProperties.cc:63 ../src/ZYZhuyinProperties.cc:147 -msgid "Half Width Punct" +#: ../src/ZYZhuyinProperties.cc:51 ../src/ZYZhuyinProperties.cc:115 +#, fuzzy +msgid "Half Width" msgstr "半角符號" -#: ../src/ZYZhuyinProperties.cc:68 ../src/ZYZhuyinProperties.cc:152 -msgid "Switch to Half Width Punctuation Mode" -msgstr "切換到半角符號模式" - -#: ../src/ZYZhuyinProperties.cc:69 ../src/ZYZhuyinProperties.cc:153 -msgid "Switch to Full Width Punctuation Mode" -msgstr "切換到全角符號模式" +#: ../src/ZYZhuyinProperties.cc:56 ../src/ZYZhuyinProperties.cc:120 +#, fuzzy +msgid "Switch to Half Width Mode" +msgstr "切換到半母字母模式" + +#: ../src/ZYZhuyinProperties.cc:57 ../src/ZYZhuyinProperties.cc:121 +#, fuzzy +msgid "Switch to Full Width Mode" +msgstr "切換到全角字母模式" -#: ../src/ZYZhuyinProperties.cc:73 ../src/ZYZhuyinProperties.cc:162 +#: ../src/ZYZhuyinProperties.cc:61 ../src/ZYZhuyinProperties.cc:130 msgid "Traditional Chinese" msgstr "繁體中文" -#: ../src/ZYZhuyinProperties.cc:74 ../src/ZYZhuyinProperties.cc:163 +#: ../src/ZYZhuyinProperties.cc:62 ../src/ZYZhuyinProperties.cc:131 msgid "Simplified Chinese" msgstr "簡體中文" -#: ../src/ZYZhuyinProperties.cc:79 ../src/ZYZhuyinProperties.cc:168 +#: ../src/ZYZhuyinProperties.cc:67 ../src/ZYZhuyinProperties.cc:136 msgid "Switch to Simplfied Chinese Mode" msgstr "切換到簡體中文模式" -#: ../src/ZYZhuyinProperties.cc:80 ../src/ZYZhuyinProperties.cc:169 +#: ../src/ZYZhuyinProperties.cc:68 ../src/ZYZhuyinProperties.cc:137 msgid "Switch to Traditional Chinese Mode" msgstr "切換到繁體中文模式" -#: ../src/ZYZhuyinProperties.cc:83 ../src/ZYZhuyinProperties.cc:85 +#: ../src/ZYZhuyinProperties.cc:71 ../src/ZYZhuyinProperties.cc:73 msgid "Preferences" msgstr "首選項" -#: ../src/ZYZhuyinProperties.cc:88 ../src/ZYZhuyinProperties.cc:109 +#: ../src/ZYZhuyinProperties.cc:76 ../src/ZYZhuyinProperties.cc:96 msgid "中" msgstr "中" -#: ../src/ZYZhuyinProperties.cc:90 ../src/ZYZhuyinProperties.cc:111 +#: ../src/ZYZhuyinProperties.cc:78 ../src/ZYZhuyinProperties.cc:98 msgid "英" msgstr "英" @@ -104,11 +92,11 @@ msgid "New Zhuyin input method (debug)" msgstr "新注音輸入法（調試）" -#: ../setup/main.py:242 +#: ../setup/main.py:249 msgid "Please choose a file" msgstr "請選擇文件" -#: ../setup/main.py:268 +#: ../setup/main.py:275 #, python-format msgid "<big><b>New Zhuyin %s</b></big>" msgstr "<big><b>IBus 新注音 %s</b></big>" @@ -166,126 +154,123 @@ msgstr "啓動後使用中文模式" #: ../setup/ibus-libzhuyin-preferences.ui.h:14 -msgid "Use Full Width English When Start-up" +#, fuzzy +msgid "Use Full Width When Start-up" msgstr "啓動後使用全角英文模式" #: ../setup/ibus-libzhuyin-preferences.ui.h:15 -msgid "Use Full Width Punctuation When Start-up" -msgstr "啓動後使用全角符號模式" - -#: ../setup/ibus-libzhuyin-preferences.ui.h:16 msgid "Use Traditional Chinese When Start-up" msgstr "啓動後使用繁體中文模式" -#: ../setup/ibus-libzhuyin-preferences.ui.h:17 +#: ../setup/ibus-libzhuyin-preferences.ui.h:16 msgid "Always Input Numbers by Input Pad" msgstr "小鍵盤始終輸入數字" -#: ../setup/ibus-libzhuyin-preferences.ui.h:18 +#: ../setup/ibus-libzhuyin-preferences.ui.h:17 msgid "Use Space Key to Show Candidates" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:19 +#: ../setup/ibus-libzhuyin-preferences.ui.h:18 msgid "Show Candidates After the Cursor" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:20 +#: ../setup/ibus-libzhuyin-preferences.ui.h:19 msgid "Inputting" msgstr "輸入" -#: ../setup/ibus-libzhuyin-preferences.ui.h:21 +#: ../setup/ibus-libzhuyin-preferences.ui.h:20 msgid "Keyboard Layout" msgstr "鍵盤佈局：" -#: ../setup/ibus-libzhuyin-preferences.ui.h:22 +#: ../setup/ibus-libzhuyin-preferences.ui.h:21 msgid "Candidate Choose Keys" msgstr "候選詞選擇鍵" -#: ../setup/ibus-libzhuyin-preferences.ui.h:23 +#: ../setup/ibus-libzhuyin-preferences.ui.h:22 msgid "Candidates per Page" msgstr "候選詞每頁顯示個數" -#: ../setup/ibus-libzhuyin-preferences.ui.h:24 +#: ../setup/ibus-libzhuyin-preferences.ui.h:23 msgid "Keyboard" msgstr "鍵盤" -#: ../setup/ibus-libzhuyin-preferences.ui.h:25 +#: ../setup/ibus-libzhuyin-preferences.ui.h:24 msgid "Enable Fuzzy Zhuyin" msgstr "啓動模糊音" -#: ../setup/ibus-libzhuyin-preferences.ui.h:26 +#: ../setup/ibus-libzhuyin-preferences.ui.h:25 msgid "l <=> n" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:27 +#: ../setup/ibus-libzhuyin-preferences.ui.h:26 msgid "f <=> h" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:28 +#: ../setup/ibus-libzhuyin-preferences.ui.h:27 msgid "l <=> r" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:29 +#: ../setup/ibus-libzhuyin-preferences.ui.h:28 msgid "g <=> k" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:30 +#: ../setup/ibus-libzhuyin-preferences.ui.h:29 msgid "c <=> ch" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:31 +#: ../setup/ibus-libzhuyin-preferences.ui.h:30 msgid "z <=> zh" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:32 +#: ../setup/ibus-libzhuyin-preferences.ui.h:31 msgid "s <=> sh" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:33 +#: ../setup/ibus-libzhuyin-preferences.ui.h:32 msgid "an <=> ang" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:34 +#: ../setup/ibus-libzhuyin-preferences.ui.h:33 msgid "in <=> ing" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:35 +#: ../setup/ibus-libzhuyin-preferences.ui.h:34 msgid "en <=> eng" msgstr "" -#: ../setup/ibus-libzhuyin-preferences.ui.h:36 +#: ../setup/ibus-libzhuyin-preferences.ui.h:35 msgid "Fuzzy Zhuyin" msgstr "模糊註音" -#: ../setup/ibus-libzhuyin-preferences.ui.h:37 +#: ../setup/ibus-libzhuyin-preferences.ui.h:36 msgid "User Symbols" msgstr "用戶自定義符號" -#: ../setup/ibus-libzhuyin-preferences.ui.h:38 +#: ../setup/ibus-libzhuyin-preferences.ui.h:37 msgid "Edit" msgstr "編輯" -#: ../setup/ibus-libzhuyin-preferences.ui.h:39 +#: ../setup/ibus-libzhuyin-preferences.ui.h:38 msgid "Easy Symbols" msgstr "自定義快捷符號" -#: ../setup/ibus-libzhuyin-preferences.ui.h:40 +#: ../setup/ibus-libzhuyin-preferences.ui.h:39 msgid "User Phrases" msgstr "使用自定義詞組" -#: ../setup/ibus-libzhuyin-preferences.ui.h:41 +#: ../setup/ibus-libzhuyin-preferences.ui.h:40 msgid "Clear" msgstr "清除" -#: ../setup/ibus-libzhuyin-preferences.ui.h:42 +#: ../setup/ibus-libzhuyin-preferences.ui.h:41 msgid "Import" msgstr "導入" -#: ../setup/ibus-libzhuyin-preferences.ui.h:43 +#: ../setup/ibus-libzhuyin-preferences.ui.h:42 msgid "Clear All Data" msgstr "清除所有數據" -#: ../setup/ibus-libzhuyin-preferences.ui.h:44 +#: ../setup/ibus-libzhuyin-preferences.ui.h:43 msgid "" "<b>Dictionary File Format:</b>\n" " Each line contains the following:\n" @@ -297,24 +282,24 @@ " \"短語 註音\"\n" " 例如 \"你好 ㄋㄧˇ ㄏㄠˇ\"" -#: ../setup/ibus-libzhuyin-preferences.ui.h:48 +#: ../setup/ibus-libzhuyin-preferences.ui.h:47 msgid "Help" msgstr "幫助" -#: ../setup/ibus-libzhuyin-preferences.ui.h:50 +#: ../setup/ibus-libzhuyin-preferences.ui.h:49 #, no-c-format msgid "<big><b>IBus Zhuyin %s</b></big>" msgstr "<big><b>IBus 註音 %s</b></big>" -#: ../setup/ibus-libzhuyin-preferences.ui.h:51 +#: ../setup/ibus-libzhuyin-preferences.ui.h:50 msgid "New Zhuyin input method for IBus" msgstr "IBus 新注音輸入法" -#: ../setup/ibus-libzhuyin-preferences.ui.h:52 +#: ../setup/ibus-libzhuyin-preferences.ui.h:51 msgid "<small>Copyright (c) 2013-2014 Peng Wu</small>" msgstr "<small>版權所有 (c) 2013-2014 吳鵬</small>" -#: ../setup/ibus-libzhuyin-preferences.ui.h:53 +#: ../setup/ibus-libzhuyin-preferences.ui.h:52 msgid "" "<small>\n" "<b>Authors:</b>\n" @@ -336,6 +321,21 @@ "...\n" "</small>" -#: ../setup/ibus-libzhuyin-preferences.ui.h:62 +#: ../setup/ibus-libzhuyin-preferences.ui.h:61 msgid "About" msgstr "關於" + +#~ msgid "Full Width Letter" +#~ msgstr "全角字母" + +#~ msgid "Half Width Letter" +#~ msgstr "半角字母" + +#~ msgid "Switch to Half Width Punctuation Mode" +#~ msgstr "切換到半角符號模式" + +#~ msgid "Switch to Full Width Punctuation Mode" +#~ msgstr "切換到全角符號模式" + +#~ msgid "Use Full Width Punctuation When Start-up" +#~ msgstr "啓動後使用全角符號模式" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/po/zh_TW.po new/ibus-libzhuyin-1.7.8/po/zh_TW.po --- old/ibus-libzhuyin-1.7.6/po/zh_TW.po 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/po/zh_TW.po 2016-09-05 08:08:35.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: ibus-libpinyin 1.2.99\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-11 13:56+0800\n" -"PO-Revision-Date: 2015-08-19 23:35+0800\n" +"POT-Creation-Date: 2016-09-05 13:57+0800\n" +"PO-Revision-Date: 2016-09-05 14:06+0800\n" "Last-Translator: Cheng-Chia Tseng <[email protected]>\n" "Language-Team: Peng Huang <[email protected]>\n" "Language: zh_TW\n" @@ -17,79 +17,63 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.4\n" -#: ../src/ZYZhuyinProperties.cc:40 ../src/ZYZhuyinProperties.cc:105 +#: ../src/ZYZhuyinProperties.cc:39 ../src/ZYZhuyinProperties.cc:92 msgid "Chinese" msgstr "中文" -#: ../src/ZYZhuyinProperties.cc:41 ../src/ZYZhuyinProperties.cc:106 +#: ../src/ZYZhuyinProperties.cc:40 ../src/ZYZhuyinProperties.cc:93 msgid "English" msgstr "英文" -#: ../src/ZYZhuyinProperties.cc:46 ../src/ZYZhuyinProperties.cc:117 +#: ../src/ZYZhuyinProperties.cc:45 ../src/ZYZhuyinProperties.cc:104 msgid "Switch to English Mode" msgstr "切換到英文模式" -#: ../src/ZYZhuyinProperties.cc:47 ../src/ZYZhuyinProperties.cc:118 +#: ../src/ZYZhuyinProperties.cc:46 ../src/ZYZhuyinProperties.cc:105 msgid "Switch to Chinese Mode" msgstr "切換到中文模式" -#: ../src/ZYZhuyinProperties.cc:51 ../src/ZYZhuyinProperties.cc:130 -msgid "Full Width Letter" -msgstr "全形字母" - -#: ../src/ZYZhuyinProperties.cc:52 ../src/ZYZhuyinProperties.cc:131 -msgid "Half Width Letter" -msgstr "半形字母" - -#: ../src/ZYZhuyinProperties.cc:57 ../src/ZYZhuyinProperties.cc:136 -msgid "Switch to Half Width Letter Mode" -msgstr "切換到半形字母模式" - -#: ../src/ZYZhuyinProperties.cc:58 ../src/ZYZhuyinProperties.cc:137 -msgid "Switch to Full Width Letter Mode" -msgstr "切換到全形字母模式" - -#: ../src/ZYZhuyinProperties.cc:62 ../src/ZYZhuyinProperties.cc:146 -msgid "Full Width Punct" -msgstr "全形符號" - -#: ../src/ZYZhuyinProperties.cc:63 ../src/ZYZhuyinProperties.cc:147 -msgid "Half Width Punct" -msgstr "半形符號" - -#: ../src/ZYZhuyinProperties.cc:68 ../src/ZYZhuyinProperties.cc:152 -msgid "Switch to Half Width Punctuation Mode" -msgstr "切換到半形符號模式" - -#: ../src/ZYZhuyinProperties.cc:69 ../src/ZYZhuyinProperties.cc:153 -msgid "Switch to Full Width Punctuation Mode" -msgstr "切換到全形符號模式" +#: ../src/ZYZhuyinProperties.cc:50 ../src/ZYZhuyinProperties.cc:114 +msgid "Full Width" +msgstr "全形" + +#: ../src/ZYZhuyinProperties.cc:51 ../src/ZYZhuyinProperties.cc:115 +msgid "Half Width" +msgstr "半形" + +#: ../src/ZYZhuyinProperties.cc:56 ../src/ZYZhuyinProperties.cc:120 +msgid "Switch to Half Width Mode" +msgstr "切換到半形模式" + +#: ../src/ZYZhuyinProperties.cc:57 ../src/ZYZhuyinProperties.cc:121 +msgid "Switch to Full Width Mode" +msgstr "切換到全形模式" -#: ../src/ZYZhuyinProperties.cc:73 ../src/ZYZhuyinProperties.cc:162 +#: ../src/ZYZhuyinProperties.cc:61 ../src/ZYZhuyinProperties.cc:130 msgid "Traditional Chinese" msgstr "繁體中文" -#: ../src/ZYZhuyinProperties.cc:74 ../src/ZYZhuyinProperties.cc:163 +#: ../src/ZYZhuyinProperties.cc:62 ../src/ZYZhuyinProperties.cc:131 msgid "Simplified Chinese" msgstr "簡體中文" -#: ../src/ZYZhuyinProperties.cc:79 ../src/ZYZhuyinProperties.cc:168 +#: ../src/ZYZhuyinProperties.cc:67 ../src/ZYZhuyinProperties.cc:136 msgid "Switch to Simplfied Chinese Mode" msgstr "切換到簡體中文模式" -#: ../src/ZYZhuyinProperties.cc:80 ../src/ZYZhuyinProperties.cc:169 +#: ../src/ZYZhuyinProperties.cc:68 ../src/ZYZhuyinProperties.cc:137 msgid "Switch to Traditional Chinese Mode" msgstr "切換到繁體中文模式" -#: ../src/ZYZhuyinProperties.cc:83 ../src/ZYZhuyinProperties.cc:85 +#: ../src/ZYZhuyinProperties.cc:71 ../src/ZYZhuyinProperties.cc:73 msgid "Preferences" msgstr "偏好設定" -#: ../src/ZYZhuyinProperties.cc:88 ../src/ZYZhuyinProperties.cc:109 +#: ../src/ZYZhuyinProperties.cc:76 ../src/ZYZhuyinProperties.cc:96 msgid "中" msgstr "中" -#: ../src/ZYZhuyinProperties.cc:90 ../src/ZYZhuyinProperties.cc:111 +#: ../src/ZYZhuyinProperties.cc:78 ../src/ZYZhuyinProperties.cc:98 msgid "英" msgstr "英" @@ -105,11 +89,11 @@ msgid "New Zhuyin input method (debug)" msgstr "新注音輸入法 (除錯)" -#: ../setup/main.py:242 +#: ../setup/main.py:249 msgid "Please choose a file" msgstr "請選擇檔案" -#: ../setup/main.py:268 +#: ../setup/main.py:275 #, python-format msgid "<big><b>New Zhuyin %s</b></big>" msgstr "<big><b>IBus 新注音 %s</b></big>" @@ -167,126 +151,122 @@ msgstr "啓動後使用中文模式" #: ../setup/ibus-libzhuyin-preferences.ui.h:14 -msgid "Use Full Width English When Start-up" -msgstr "啓動後使用全形英文模式" +msgid "Use Full Width When Start-up" +msgstr "啓動後使用全形模式" #: ../setup/ibus-libzhuyin-preferences.ui.h:15 -msgid "Use Full Width Punctuation When Start-up" -msgstr "啓動後使用全形符號模式" - -#: ../setup/ibus-libzhuyin-preferences.ui.h:16 msgid "Use Traditional Chinese When Start-up" msgstr "啓動後使用繁體中文模式" -#: ../setup/ibus-libzhuyin-preferences.ui.h:17 +#: ../setup/ibus-libzhuyin-preferences.ui.h:16 msgid "Always Input Numbers by Input Pad" msgstr "小鍵盤始終輸入數字" -#: ../setup/ibus-libzhuyin-preferences.ui.h:18 +#: ../setup/ibus-libzhuyin-preferences.ui.h:17 msgid "Use Space Key to Show Candidates" msgstr "用空白鍵叫出候選字詞" -#: ../setup/ibus-libzhuyin-preferences.ui.h:19 +#: ../setup/ibus-libzhuyin-preferences.ui.h:18 msgid "Show Candidates After the Cursor" msgstr "游標後方挑選候選字詞" -#: ../setup/ibus-libzhuyin-preferences.ui.h:20 +#: ../setup/ibus-libzhuyin-preferences.ui.h:19 msgid "Inputting" msgstr "輸入" -#: ../setup/ibus-libzhuyin-preferences.ui.h:21 +#: ../setup/ibus-libzhuyin-preferences.ui.h:20 msgid "Keyboard Layout" msgstr "鍵盤配置" -#: ../setup/ibus-libzhuyin-preferences.ui.h:22 +#: ../setup/ibus-libzhuyin-preferences.ui.h:21 msgid "Candidate Choose Keys" msgstr "候選字詞選擇鍵" -#: ../setup/ibus-libzhuyin-preferences.ui.h:23 +#: ../setup/ibus-libzhuyin-preferences.ui.h:22 msgid "Candidates per Page" msgstr "候選字詞每頁顯示個數" -#: ../setup/ibus-libzhuyin-preferences.ui.h:24 +#: ../setup/ibus-libzhuyin-preferences.ui.h:23 msgid "Keyboard" msgstr "鍵盤" -#: ../setup/ibus-libzhuyin-preferences.ui.h:25 +#: ../setup/ibus-libzhuyin-preferences.ui.h:24 msgid "Enable Fuzzy Zhuyin" msgstr "啓動模糊音" -#: ../setup/ibus-libzhuyin-preferences.ui.h:26 +#: ../setup/ibus-libzhuyin-preferences.ui.h:25 msgid "l <=> n" msgstr "ㄌ <=> ㄋ" -#: ../setup/ibus-libzhuyin-preferences.ui.h:27 +#: ../setup/ibus-libzhuyin-preferences.ui.h:26 msgid "f <=> h" msgstr "ㄈ <=> ㄏ" -#: ../setup/ibus-libzhuyin-preferences.ui.h:28 +#: ../setup/ibus-libzhuyin-preferences.ui.h:27 msgid "l <=> r" msgstr "ㄌ <=> ㄖ" -#: ../setup/ibus-libzhuyin-preferences.ui.h:29 +#: ../setup/ibus-libzhuyin-preferences.ui.h:28 msgid "g <=> k" msgstr "ㄍ <=> ㄎ" -#: ../setup/ibus-libzhuyin-preferences.ui.h:30 +#: ../setup/ibus-libzhuyin-preferences.ui.h:29 msgid "c <=> ch" msgstr "ㄘ <=> ㄔ" -#: ../setup/ibus-libzhuyin-preferences.ui.h:31 +#: ../setup/ibus-libzhuyin-preferences.ui.h:30 msgid "z <=> zh" msgstr "ㄗ <=> ㄓ" -#: ../setup/ibus-libzhuyin-preferences.ui.h:32 +#: ../setup/ibus-libzhuyin-preferences.ui.h:31 msgid "s <=> sh" msgstr "ㄙ <=> ㄕ" -#: ../setup/ibus-libzhuyin-preferences.ui.h:33 +#: ../setup/ibus-libzhuyin-preferences.ui.h:32 msgid "an <=> ang" msgstr "ㄢ <=> ㄤ" -#: ../setup/ibus-libzhuyin-preferences.ui.h:34 +#: ../setup/ibus-libzhuyin-preferences.ui.h:33 msgid "in <=> ing" msgstr "ㄣ <=> ㄥ" -#: ../setup/ibus-libzhuyin-preferences.ui.h:35 +#: ../setup/ibus-libzhuyin-preferences.ui.h:34 msgid "en <=> eng" msgstr "ㄧㄣ <=> ㄧㄥ" -#: ../setup/ibus-libzhuyin-preferences.ui.h:36 +#: ../setup/ibus-libzhuyin-preferences.ui.h:35 msgid "Fuzzy Zhuyin" msgstr "模糊注音" -#: ../setup/ibus-libzhuyin-preferences.ui.h:37 +#: ../setup/ibus-libzhuyin-preferences.ui.h:36 msgid "User Symbols" msgstr "用戶自定義符號" -#: ../setup/ibus-libzhuyin-preferences.ui.h:38 +#: ../setup/ibus-libzhuyin-preferences.ui.h:37 msgid "Edit" msgstr "編輯" -#: ../setup/ibus-libzhuyin-preferences.ui.h:39 +#: ../setup/ibus-libzhuyin-preferences.ui.h:38 msgid "Easy Symbols" msgstr "自定義快捷符號" -#: ../setup/ibus-libzhuyin-preferences.ui.h:40 +#: ../setup/ibus-libzhuyin-preferences.ui.h:39 msgid "User Phrases" msgstr "使用自定義詞組" -#: ../setup/ibus-libzhuyin-preferences.ui.h:41 +#: ../setup/ibus-libzhuyin-preferences.ui.h:40 msgid "Clear" msgstr "清除" -#: ../setup/ibus-libzhuyin-preferences.ui.h:42 +#: ../setup/ibus-libzhuyin-preferences.ui.h:41 msgid "Import" msgstr "匯入" -#: ../setup/ibus-libzhuyin-preferences.ui.h:43 +#: ../setup/ibus-libzhuyin-preferences.ui.h:42 msgid "Clear All Data" msgstr "清除所有資料" -#: ../setup/ibus-libzhuyin-preferences.ui.h:44 +#: ../setup/ibus-libzhuyin-preferences.ui.h:43 msgid "" "<b>Dictionary File Format:</b>\n" " Each line contains the following:\n" @@ -298,24 +278,24 @@ " 「短語 注音」\n" " 例如「你好 ㄋㄧˇ ㄏㄠˇ」" -#: ../setup/ibus-libzhuyin-preferences.ui.h:48 +#: ../setup/ibus-libzhuyin-preferences.ui.h:47 msgid "Help" msgstr "幫助" -#: ../setup/ibus-libzhuyin-preferences.ui.h:50 +#: ../setup/ibus-libzhuyin-preferences.ui.h:49 #, no-c-format msgid "<big><b>IBus Zhuyin %s</b></big>" msgstr "<big><b>IBus 注音 %s</b></big>" -#: ../setup/ibus-libzhuyin-preferences.ui.h:51 +#: ../setup/ibus-libzhuyin-preferences.ui.h:50 msgid "New Zhuyin input method for IBus" msgstr "IBus 新注音輸入法" -#: ../setup/ibus-libzhuyin-preferences.ui.h:52 +#: ../setup/ibus-libzhuyin-preferences.ui.h:51 msgid "<small>Copyright (c) 2013-2014 Peng Wu</small>" msgstr "<small>著作權所有 (c) 2013-2014 吳鵬</small>" -#: ../setup/ibus-libzhuyin-preferences.ui.h:53 +#: ../setup/ibus-libzhuyin-preferences.ui.h:52 msgid "" "<small>\n" "<b>Authors:</b>\n" @@ -337,6 +317,21 @@ "...\n" "</small>" -#: ../setup/ibus-libzhuyin-preferences.ui.h:62 +#: ../setup/ibus-libzhuyin-preferences.ui.h:61 msgid "About" msgstr "關於" + +#~ msgid "Full Width Letter" +#~ msgstr "全形字母" + +#~ msgid "Half Width Letter" +#~ msgstr "半形字母" + +#~ msgid "Switch to Half Width Punctuation Mode" +#~ msgstr "切換到半形符號模式" + +#~ msgid "Switch to Full Width Punctuation Mode" +#~ msgstr "切換到全形符號模式" + +#~ msgid "Use Full Width Punctuation When Start-up" +#~ msgstr "啓動後使用全形符號模式" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/setup/ibus-libzhuyin-preferences.ui new/ibus-libzhuyin-1.7.8/setup/ibus-libzhuyin-preferences.ui --- old/ibus-libzhuyin-1.7.6/setup/ibus-libzhuyin-preferences.ui 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/setup/ibus-libzhuyin-preferences.ui 2016-09-05 08:08:35.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.10"/> <object class="GtkAdjustment" id="adjustmentCandidate"> @@ -117,8 +117,8 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="fullhalfenglish"> - <property name="label" translatable="yes">Use Full Width English When Start-up</property> + <object class="GtkCheckButton" id="fullhalfwidth"> + <property name="label" translatable="yes">Use Full Width When Start-up</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -135,24 +135,6 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="fullhalfpunct"> - <property name="label" translatable="yes">Use Full Width Punctuation When Start-up</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="margin_left">10</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="traditionalchinese"> <property name="label" translatable="yes">Use Traditional Chinese When Start-up</property> <property name="visible">True</property> @@ -167,7 +149,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -185,7 +167,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -203,7 +185,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> @@ -221,7 +203,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> </object> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/setup/main.py new/ibus-libzhuyin-1.7.8/setup/main.py --- old/ibus-libzhuyin-1.7.6/setup/main.py 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/setup/main.py 2016-09-05 08:08:35.000000000 +0200 @@ -26,7 +26,17 @@ import os import sys +from gi import require_version as gi_require_version +gi_require_version('GLib', '2.0') +gi_require_version('Gtk', '3.0') +gi_require_version('IBus', '1.0') + from gi.repository import GLib + +# set_prgname before importing other modules to show the name in warning +# messages when import modules are failed. E.g. Gtk. +GLib.set_prgname('ibus-setup-libzhuyin') + from gi.repository import Gtk from gi.repository import IBus @@ -85,8 +95,7 @@ # init state self.__chinese_mode = self.__builder.get_object("chinesemode") - self.__full_half_english = self.__builder.get_object("fullhalfenglish") - self.__full_half_punct = self.__builder.get_object("fullhalfpunct") + self.__full_half_width = self.__builder.get_object("fullhalfwidth") self.__traditional_chinese = self.__builder.get_object("traditionalchinese") self.__always_input_num = self.__builder.get_object("alwaysinputnum") self.__space_show_candidates = self.__builder.get_object("spaceshowcandidates") @@ -94,8 +103,7 @@ # read values self.__chinese_mode.set_active(self.__get_value("chinesemode", True)) - self.__full_half_english.set_active(self.__get_value("fullhalfenglish", False)) - self.__full_half_punct.set_active(self.__get_value("fullhalfpunct", True)) + self.__full_half_width.set_active(self.__get_value("fullhalfwidth", False)) self.__traditional_chinese.set_active(self.__get_value("traditionalchinese", True)) self.__always_input_num.set_active(self.__get_value("alwaysinputnum", False)) self.__space_show_candidates.set_active(self.__get_value("spaceshowcandidates", False)) @@ -103,8 +111,7 @@ # connect signals self.__chinese_mode.connect("toggled", self.__toggled_cb, "chinesemode") - self.__full_half_english.connect("toggled", self.__toggled_cb, "fullhalfenglish") - self.__full_half_punct.connect("toggled", self.__toggled_cb, "fullhalfpunct") + self.__full_half_width.connect("toggled", self.__toggled_cb, "fullhalfwidth") self.__traditional_chinese.connect("toggled", self.__toggled_cb, "traditionalchinese") self.__always_input_num.connect("toggled", self.__toggled_cb, "alwaysinputnum") self.__space_show_candidates.connect("toggled", self.__toggled_cb, "spaceshowcandidates") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/src/ZYConfig.cc new/ibus-libzhuyin-1.7.8/src/ZYConfig.cc --- old/ibus-libzhuyin-1.7.6/src/ZYConfig.cc 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/src/ZYConfig.cc 2016-09-05 08:08:35.000000000 +0200 @@ -49,8 +49,7 @@ m_keyboard_layout = CHEWING_DEFAULT; m_init_chinese = TRUE; - m_init_full_english = FALSE; - m_init_full_punct = TRUE; + m_init_full_width = FALSE; m_init_trad_chinese = TRUE; m_always_input_numbers = FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/src/ZYConfig.h new/ibus-libzhuyin-1.7.8/src/ZYConfig.h --- old/ibus-libzhuyin-1.7.6/src/ZYConfig.h 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/src/ZYConfig.h 2016-09-05 08:08:35.000000000 +0200 @@ -46,8 +46,7 @@ guint pageSize (void) const { return m_page_size; } ZhuyinScheme keyboardLayout (void) const { return m_keyboard_layout; } gboolean initChinese (void) const { return m_init_chinese; } - gboolean initFullEnglish (void) const { return m_init_full_english; } - gboolean initFullPunct (void) const { return m_init_full_punct; } + gboolean initFullWidth (void) const { return m_init_full_width; } gboolean initTradChinese (void) const { return m_init_trad_chinese; } gboolean alwaysInputNumbers (void) const { return m_always_input_numbers; } gboolean spaceShowCandidates (void) const { return m_space_show_candidates; } @@ -85,8 +84,7 @@ ZhuyinScheme m_keyboard_layout; gboolean m_init_chinese; - gboolean m_init_full_english; - gboolean m_init_full_punct; + gboolean m_init_full_width; gboolean m_init_trad_chinese; gboolean m_always_input_numbers; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/src/ZYFallbackEditor.cc new/ibus-libzhuyin-1.7.8/src/ZYFallbackEditor.cc --- old/ibus-libzhuyin-1.7.6/src/ZYFallbackEditor.cc 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/src/ZYFallbackEditor.cc 2016-09-05 08:08:35.000000000 +0200 @@ -31,11 +31,6 @@ { guint cmshm_modifiers = cmshm_filter (modifiers); - if (G_UNLIKELY (keyval == IBUS_period && cmshm_modifiers == IBUS_CONTROL_MASK)) { - m_props.toggleModeFullPunct (); - return TRUE; - } - /* check ctrl, alt, hyper, supper masks */ if (cmshm_modifiers != 0) return FALSE; @@ -45,7 +40,13 @@ /* Punctuation character */ if (is_half_punct (keyval)) { - commit (keyval); + if(G_UNLIKELY (m_props.modeFullWidth ())) { + String punct; + half_punct_to_full_punct (keyval, punct); + commit (punct); + } else { + commit (keyval); + } return TRUE; } @@ -70,7 +71,7 @@ /* English character */ if (is_half_english (keyval)) { - if (G_UNLIKELY (m_props.modeFullEnglish ())) { + if (G_UNLIKELY (m_props.modeFullWidth ())) { String english; half_english_to_full_english (keyval, english); commit (english); @@ -93,8 +94,7 @@ { gboolean retval = FALSE; - modifiers &= (IBUS_SHIFT_MASK | - IBUS_CONTROL_MASK | + modifiers &= (IBUS_CONTROL_MASK | IBUS_MOD1_MASK | IBUS_SUPER_MASK | IBUS_HYPER_MASK | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/src/ZYLibZhuyin.cc new/ibus-libzhuyin-1.7.8/src/ZYLibZhuyin.cc --- old/ibus-libzhuyin-1.7.6/src/ZYLibZhuyin.cc 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/src/ZYLibZhuyin.cc 2016-09-05 08:08:35.000000000 +0200 @@ -160,8 +160,10 @@ import_iterator_t * iter = zhuyin_begin_add_phrases (m_zhuyin_context, USER_DICTIONARY); - if (NULL == iter) + if (NULL == iter) { + fclose(dictfile); return FALSE; + } char* linebuf = NULL; size_t size = 0; ssize_t read; while ((read = getline (&linebuf, &size, dictfile)) != -1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/src/ZYZConfig.cc new/ibus-libzhuyin-1.7.8/src/ZYZConfig.cc --- old/ibus-libzhuyin-1.7.6/src/ZYZConfig.cc 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/src/ZYZConfig.cc 2016-09-05 08:08:35.000000000 +0200 @@ -31,8 +31,7 @@ const gchar * const CONFIG_PAGE_SIZE = "candidatenum"; const gchar * const CONFIG_INIT_CHINESE = "chinesemode"; -const gchar * const CONFIG_INIT_FULL_ENGLISH = "fullhalfenglish"; -const gchar * const CONFIG_INIT_FULL_PUNCT = "fullhalfpunct"; +const gchar * const CONFIG_INIT_FULL_WIDTH = "fullhalfwidth"; const gchar * const CONFIG_INIT_TRAD_CHINESE = "traditionalchinese"; const gchar * const CONFIG_ALWAYS_INPUT_NUMBERS = "alwaysinputnum"; const gchar * const CONFIG_SPACE_SHOW_CANDIDATES = "spaceshowcandidates"; @@ -91,8 +90,7 @@ m_keyboard_layout = CHEWING_DEFAULT; m_init_chinese = TRUE; - m_init_full_english = FALSE; - m_init_full_punct = TRUE; + m_init_full_width = FALSE; m_init_trad_chinese = TRUE; m_always_input_numbers = FALSE; @@ -184,8 +182,7 @@ /* init states */ m_init_chinese = read (CONFIG_INIT_CHINESE, true); - m_init_full_english = read (CONFIG_INIT_FULL_ENGLISH, false); - m_init_full_punct = read (CONFIG_INIT_FULL_PUNCT, true); + m_init_full_width = read (CONFIG_INIT_FULL_WIDTH, false); m_init_trad_chinese = read (CONFIG_INIT_TRAD_CHINESE, true); m_always_input_numbers = read (CONFIG_ALWAYS_INPUT_NUMBERS, false); @@ -239,10 +236,8 @@ /* init states */ if (CONFIG_INIT_CHINESE == name) m_init_chinese = normalizeGVariant (value, true); - else if (CONFIG_INIT_FULL_ENGLISH == name) - m_init_full_english = normalizeGVariant (value, false); - else if (CONFIG_INIT_FULL_PUNCT == name) - m_init_full_punct = normalizeGVariant (value, true); + else if (CONFIG_INIT_FULL_WIDTH == name) + m_init_full_width = normalizeGVariant (value, false); else if (CONFIG_INIT_TRAD_CHINESE == name) m_init_trad_chinese = normalizeGVariant (value, true); else if (CONFIG_ALWAYS_INPUT_NUMBERS == name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/src/ZYZPhoneticEditor.cc new/ibus-libzhuyin-1.7.8/src/ZYZPhoneticEditor.cc --- old/ibus-libzhuyin-1.7.6/src/ZYZPhoneticEditor.cc 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/src/ZYZPhoneticEditor.cc 2016-09-05 08:08:35.000000000 +0200 @@ -150,7 +150,7 @@ if (m_text.empty ()) { assert (is_half_english (' ')); - if (m_props.modeFullEnglish ()) { + if (m_props.modeFullWidth ()) { String english; half_english_to_full_english (keyval, english); commit (english); @@ -960,7 +960,7 @@ { /* for punctuations. */ if (is_half_punct (ch)) { - if (m_props.modeFullPunct ()) { + if (m_props.modeFullWidth ()) { String choice; assert (half_punct_to_full_punct (ch, choice)); @@ -988,7 +988,7 @@ { /* for English. */ if (is_half_english (ch)) { - if (m_props.modeFullEnglish ()) { + if (m_props.modeFullWidth ()) { String choice; assert (half_english_to_full_english (ch, choice)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/src/ZYZZhuyinEngine.cc new/ibus-libzhuyin-1.7.8/src/ZYZZhuyinEngine.cc --- old/ibus-libzhuyin-1.7.6/src/ZYZZhuyinEngine.cc 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/src/ZYZZhuyinEngine.cc 2016-09-05 08:08:35.000000000 +0200 @@ -146,6 +146,12 @@ /* store ignored key event by editors */ m_prev_pressed_key = retval ? IBUS_VoidSymbol : keyval; + if (modifiers == IBUS_SHIFT_MASK && keyval == IBUS_space) { + m_props.toggleModeFullWidth (); + m_prev_pressed_key = keyval; + return TRUE; + } + return retval; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/src/ZYZhuyinProperties.cc new/ibus-libzhuyin-1.7.8/src/ZYZhuyinProperties.cc --- old/ibus-libzhuyin-1.7.6/src/ZYZhuyinProperties.cc 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/src/ZYZhuyinProperties.cc 2016-09-05 08:08:35.000000000 +0200 @@ -31,8 +31,7 @@ ZhuyinProperties::ZhuyinProperties (Config & config) : m_config (config), m_mode_chinese (m_config.initChinese ()), - m_mode_full_english (m_config.initFullEnglish ()), - m_mode_full_punct (m_config.initFullPunct ()), + m_mode_full_width (m_config.initFullWidth ()), m_mode_trad (m_config.initTradChinese ()), m_prop_chinese ("InputMode", PROP_TYPE_NORMAL, @@ -45,28 +44,17 @@ StaticText (m_mode_chinese ? _("Switch to English Mode") : _("Switch to Chinese Mode"))), - m_prop_full_english ("mode.full", + m_prop_full_width ("mode.full", PROP_TYPE_NORMAL, - StaticText (m_mode_full_english ? - _("Full Width Letter") : - _("Half Width Letter")), - m_mode_full_english ? + StaticText (m_mode_full_width ? + _("Full Width") : + _("Half Width")), + m_mode_full_width ? PKGDATADIR"/icons/full.svg" : PKGDATADIR"/icons/half.svg", - StaticText (m_mode_full_english ? - _("Switch to Half Width Letter Mode"): - _("Switch to Full Width Letter Mode"))), - m_prop_full_punct ("mode.full_punct", - PROP_TYPE_NORMAL, - StaticText (m_mode_full_punct ? - _("Full Width Punct") : - _("Half Width Punct")), - m_mode_full_punct ? - PKGDATADIR"/icons/full-punct.svg" : - PKGDATADIR"/icons/half-punct.svg", - StaticText (m_mode_full_punct ? - _("Switch to Half Width Punctuation Mode"): - _("Switch to Full Width Punctuation Mode"))), + StaticText (m_mode_full_width ? + _("Switch to Half Width Mode"): + _("Switch to Full Width Mode"))), m_prop_trad ( "mode.trad", PROP_TYPE_NORMAL, StaticText (m_mode_trad ? @@ -90,8 +78,7 @@ m_prop_chinese.setSymbol(N_("英")); m_props.append (m_prop_chinese); - m_props.append (m_prop_full_english); - m_props.append (m_prop_full_punct); + m_props.append (m_prop_full_width); m_props.append (m_prop_trad); m_props.append (m_prop_setup); @@ -117,41 +104,22 @@ _("Switch to English Mode") : _("Switch to Chinese Mode")); updateProperty (m_prop_chinese); - - m_prop_full_punct.setSensitive (m_mode_chinese); - updateProperty (m_prop_full_punct); } void -ZhuyinProperties::toggleModeFullEnglish (void) +ZhuyinProperties::toggleModeFullWidth (void) { - m_mode_full_english = !m_mode_full_english; - m_prop_full_english.setLabel (m_mode_full_english ? - _("Full Width Letter") : - _("Half Width Letter")); - m_prop_full_english.setIcon (m_mode_full_english ? + m_mode_full_width = !m_mode_full_width; + m_prop_full_width.setLabel (m_mode_full_width ? + _("Full Width") : + _("Half Width")); + m_prop_full_width.setIcon (m_mode_full_width ? PKGDATADIR"/icons/full.svg" : PKGDATADIR"/icons/half.svg"); - m_prop_full_english.setTooltip (m_mode_full_english ? - _("Switch to Half Width Letter Mode"): - _("Switch to Full Width Letter Mode")); - updateProperty (m_prop_full_english); -} - -void -ZhuyinProperties::toggleModeFullPunct (void) -{ - m_mode_full_punct = !m_mode_full_punct; - m_prop_full_punct.setLabel (m_mode_full_punct ? - _("Full Width Punct") : - _("Half Width Punct")); - m_prop_full_punct.setIcon (m_mode_full_punct ? - PKGDATADIR"/icons/full-punct.svg" : - PKGDATADIR"/icons/half-punct.svg"); - m_prop_full_punct.setTooltip(m_mode_full_punct ? - _("Switch to Half Width Punctuation Mode"): - _("Switch to Full Width Punctuation Mode")); - updateProperty (m_prop_full_punct); + m_prop_full_width.setTooltip (m_mode_full_width ? + _("Switch to Half Width Mode"): + _("Switch to Full Width Mode")); + updateProperty (m_prop_full_width); } void @@ -176,11 +144,8 @@ if (modeChinese () != m_config.initChinese ()) { toggleModeChinese (); } - if (modeFullEnglish () != m_config.initFullEnglish ()) { - toggleModeFullEnglish (); - } - if (modeFullPunct () != m_config.initFullPunct ()) { - toggleModeFullPunct (); + if (modeFullWidth () != m_config.initFullWidth ()) { + toggleModeFullWidth (); } if (modeTrad () != m_config.initTradChinese ()) { toggleModeTrad (); @@ -191,7 +156,6 @@ ZhuyinProperties::propertyActivate (const gchar *prop_name, guint prop_state) { const static std::string mode_chinese ("InputMode"); const static std::string mode_full ("mode.full"); - const static std::string mode_full_punct ("mode.full_punct"); const static std::string mode_trad ("mode.trad"); if (mode_chinese == prop_name) { @@ -199,11 +163,7 @@ return TRUE; } else if (mode_full == prop_name) { - toggleModeFullEnglish (); - return TRUE; - } - else if (mode_full_punct == prop_name) { - toggleModeFullPunct (); + toggleModeFullWidth (); return TRUE; } else if (mode_trad == prop_name) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libzhuyin-1.7.6/src/ZYZhuyinProperties.h new/ibus-libzhuyin-1.7.8/src/ZYZhuyinProperties.h --- old/ibus-libzhuyin-1.7.6/src/ZYZhuyinProperties.h 2015-12-11 07:12:26.000000000 +0100 +++ new/ibus-libzhuyin-1.7.8/src/ZYZhuyinProperties.h 2016-09-05 08:08:35.000000000 +0200 @@ -33,15 +33,13 @@ ZhuyinProperties (Config & config); void toggleModeChinese (void); - void toggleModeFullEnglish (void); - void toggleModeFullPunct (void); + void toggleModeFullWidth (void); void toggleModeTrad (void); void reset (void); gboolean modeChinese (void) const { return m_mode_chinese; } - gboolean modeFullEnglish (void) const { return m_mode_full_english; } - gboolean modeFullPunct (void) const { return m_mode_full_punct; } + gboolean modeFullWidth (void) const { return m_mode_full_width; } gboolean modeTrad (void) const { return m_mode_trad; } PropList & properties (void) { return m_props; } @@ -64,14 +62,12 @@ private: Config & m_config; gboolean m_mode_chinese; - gboolean m_mode_full_english; - gboolean m_mode_full_punct; + gboolean m_mode_full_width; gboolean m_mode_trad; /* properties */ Property m_prop_chinese; - Property m_prop_full_english; - Property m_prop_full_punct; + Property m_prop_full_width; Property m_prop_trad; Property m_prop_setup; PropList m_props;
