summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/make-check.yml30
-rw-r--r--ChangeLog54
-rw-r--r--NEWS78
-rw-r--r--configure.ac16
-rw-r--r--data/Makefile.am26
-rw-r--r--data/ibus-setup-libzhuyin.desktop.in8
-rw-r--r--data/ibus-setup-libzhuyin.desktop.in.in14
-rw-r--r--data/libzhuyin.appdata.xml6
-rw-r--r--data/model/Makefile.am6
-rw-r--r--data/model/table.conf.in11
-rw-r--r--ibus-libzhuyin.spec.in1
-rw-r--r--po/LINGUAS3
-rw-r--r--po/Makevars78
-rw-r--r--po/POTFILES.in4
-rw-r--r--po/POTFILES.skip1
-rw-r--r--po/de.po341
-rw-r--r--po/ibus-libzhuyin.pot327
-rw-r--r--po/zh_CN.po197
-rw-r--r--po/zh_HK.po162
-rw-r--r--po/zh_TW.po160
-rw-r--r--setup/main.py9
-rw-r--r--src/ZYEditor.cc3
-rw-r--r--src/ZYEnhancedText.cc4
-rw-r--r--src/ZYFallbackEditor.cc3
-rw-r--r--src/ZYLibZhuyin.cc3
-rw-r--r--src/ZYUtil.h7
-rw-r--r--src/ZYZBopomofoSymbolSection.cc2
-rw-r--r--src/ZYZEnhancedEditor.cc2
-rw-r--r--src/ZYZPhoneticEditor.cc6
-rw-r--r--src/ZYZPinyinEditor.cc3
-rw-r--r--src/ZYZZhuyinEditor.cc5
-rw-r--r--src/ZYZZhuyinEngine.cc4
32 files changed, 1228 insertions, 346 deletions
diff --git a/.github/workflows/make-check.yml b/.github/workflows/make-check.yml
new file mode 100644
index 0000000..cb40927
--- /dev/null
+++ b/.github/workflows/make-check.yml
@@ -0,0 +1,30 @@
+name: C/C++ CI
+
+on:
+ push:
+ branches: [ main ]
+ pull_request:
+ branches: [ main ]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-22.04
+
+ container:
+ image: fedora:rawhide
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: install build dependency
+ run: sudo dnf install -y gcc-c++ gettext-devel libtool pkgconfig sqlite-devel ibus-devel libpinyin-devel python3-devel libpinyin-tools make gnome-common which wget
+ - name: autoconf
+ run: ./autogen.sh
+ - name: configure
+ run: ./configure
+ - name: make
+ run: make
+ - name: make check
+ run: make check
+ - name: make distcheck
+ run: make distcheck
diff --git a/ChangeLog b/ChangeLog
index cb498f1..49687aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,54 +1,4 @@
-version 1.9.0
-* fixes special symbol
-* add need-tone option
+2022-08-24 gettextize <bug-gnu-gettext@gnu.org>
-version 1.8.93
-* fixes Space handling
+ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.21.
-version 1.8.92
-* fixes easy symbol and user symbol
-
-version 1.8.91
-* migrate to use GSettings
-
-version 1.8.3
-* translate input method name in ibus menu
-
-version 1.8.2
-* fixes cursor move
-
-version 1.8.1
-* fixes application shortcut issue
-* fixes numpad issue
-
-version 1.8.0
-* bump version
-
-version 1.7.91
-* merge libzhuyin data
-
-version 1.7.10
-* fix issue 33 - fixes full/half width symbol input problem
-
-version 1.7.9
-* fix issue 31 - full width punctuation input with wrong symbol
-* fix issue 32 - full/half width shortcut key switch with extra space output
-
-version 1.7.8
-* combine English/Punctuation modes into one mode.
-
-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".
-* use zhuyin_valid_zhuyin_keys method.
-
-version 1.7.1
-* migrate setup dialog to python 3.x.
-* support gnome-software.
-
-version 1.7.0
-* the first release of 1.7.x series.
diff --git a/NEWS b/NEWS
index e69de29..ffa6857 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1,78 @@
+version 1.10.3
+* bug fixes
+
+version 1.10.2
+* bug fixes
+
+version 1.10.1
+* fix setup dialog
+
+version 1.10.0
+* bug fixes
+
+version 1.9.92
+* update zhuyin data
+
+version 1.9.91
+* support libpinyin 2.4.92
+
+version 1.9.1
+* fixes page up and page down shortcut key
+* fixes special symbols
+* fixes escape handling
+* fixes numpad
+
+version 1.9.0
+* fixes special symbol
+* add need-tone option
+
+version 1.8.93
+* fixes Space handling
+
+version 1.8.92
+* fixes easy symbol and user symbol
+
+version 1.8.91
+* migrate to use GSettings
+
+version 1.8.3
+* translate input method name in ibus menu
+
+version 1.8.2
+* fixes cursor move
+
+version 1.8.1
+* fixes application shortcut issue
+* fixes numpad issue
+
+version 1.8.0
+* bump version
+
+version 1.7.91
+* merge libzhuyin data
+
+version 1.7.10
+* fix issue 33 - fixes full/half width symbol input problem
+
+version 1.7.9
+* fix issue 31 - full width punctuation input with wrong symbol
+* fix issue 32 - full/half width shortcut key switch with extra space output
+
+version 1.7.8
+* combine English/Punctuation modes into one mode.
+
+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".
+* use zhuyin_valid_zhuyin_keys method.
+
+version 1.7.1
+* migrate setup dialog to python 3.x.
+* support gnome-software.
+
+version 1.7.0
+* the first release of 1.7.x series.
diff --git a/configure.ac b/configure.ac
index f49bfe3..a004111 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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], [9])
-m4_define([ibus_micro_version], [1])
+m4_define([ibus_minor_version], [10])
+m4_define([ibus_micro_version], [3])
m4_define(ibus_maybe_datestamp,
m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
@@ -48,7 +48,6 @@ AC_PROG_CXX
AM_PROG_CC_C_O
AC_ISC_POSIX
AC_HEADER_STDC
-IT_PROG_INTLTOOL([0.35.0])
LT_INIT
AC_PROG_SED
@@ -57,10 +56,12 @@ PKG_CHECK_MODULES(IBUS, [
ibus-1.0 >= 1.4.0
])
-# check libzhuyin
+# check libzhuyin and database format
PKG_CHECK_MODULES(LIBZHUYIN, [
- libzhuyin >= 2.2.0
+ libzhuyin >= 2.6.0
], [enable_libzhuyin=yes])
+DATABASE_FORMAT=`$PKG_CONFIG --variable=database_format libzhuyin`
+AC_SUBST(DATABASE_FORMAT)
# check if ibus_config_get_values, which is available in ibus-1.3.99+ (git master)
save_CFLAGS="$CFLAGS"
@@ -117,7 +118,8 @@ GETTEXT_PACKAGE=ibus-libzhuyin
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-AM_GLIB_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.21])
+AM_GNU_GETTEXT([external])
# Checks for GSettings.
PKG_CHECK_MODULES(GIO2, [gio-2.0 >= 2.26.0])
@@ -136,6 +138,7 @@ ibus-libzhuyin.spec
data/Makefile
data/icons/Makefile
data/model/Makefile
+data/model/table.conf
])
AC_OUTPUT
@@ -144,6 +147,7 @@ AC_MSG_RESULT([
Build options:
Version $VERSION
Install prefix $prefix
+ DBM $DATABASE_FORMAT
Use boost $enable_boost
Use opencc $enable_opencc
Use libzhuyin $enable_libzhuyin
diff --git a/data/Makefile.am b/data/Makefile.am
index 44b0973..7dcc286 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -30,26 +30,24 @@ SUBDIRS = \
model \
$(NULL)
-appdatadir = @datadir@/appdata
+appdatadir = @datadir@/metainfo
appdata_DATA = $(APPDATA_XML)
-desktop_in_in_files = \
- ibus-setup-libzhuyin.desktop.in.in \
+desktop_in_files = \
+ ibus-setup-libzhuyin.desktop.in \
$(NULL)
-desktop_in_files = $(desktop_in_in_files:.in.in=.in)
+desktop_files = $(desktop_in_files:.desktop.in=.desktop)
-$(desktop_in_files): %.desktop.in: %.desktop.in.in Makefile
- $(AM_V_GEN) sed \
- -e "s|\@libexecdir\@|$(libexecdir)|" \
- -e "s|\@pkgdatadir\@|$(pkgdatadir)|" \
- $< > $@.tmp && mv $@.tmp $@
+%.desktop: %.desktop.in
+ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@.tmp
+ sed -e 's|@libexecdir[@]|$(libexecdir)|g' \
+ -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@.tmp > $@
+ rm $@.tmp
desktopdir=$(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-@INTLTOOL_DESKTOP_RULE@
+desktop_DATA = $(desktop_files)
symbols_DATA = \
easysymbol.txt \
@@ -59,13 +57,13 @@ symbols_DATA = \
symbolsdir = $(pkgdatadir)
EXTRA_DIST = \
- $(desktop_in_in_files) \
+ $(desktop_in_files) \
$(symbols_DATA) \
$(APPDATA_XML) \
$(gsettings_SCHEMAS) \
$(NULL)
DISTCLEANFILES = \
- $(desktop_in_files) \
+ $(desktop_files) \
$(desktop_DATA) \
$(NULL)
diff --git a/data/ibus-setup-libzhuyin.desktop.in b/data/ibus-setup-libzhuyin.desktop.in
new file mode 100644
index 0000000..071d6ba
--- /dev/null
+++ b/data/ibus-setup-libzhuyin.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IBus LibZhuyin Setup
+Comment=Set ibus-libzhuyin Preferences
+Exec=@libexecdir@/ibus-setup-libzhuyin
+Icon=@pkgdatadir@/icons/ibus-zhuyin.svg
+NoDisplay=true
+Type=Application
+StartupNotify=true
diff --git a/data/ibus-setup-libzhuyin.desktop.in.in b/data/ibus-setup-libzhuyin.desktop.in.in
deleted file mode 100644
index e085550..0000000
--- a/data/ibus-setup-libzhuyin.desktop.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=IBus LibZhuyin Setup
-Name[zh_CN]=IBus 新注音配置工具
-Name[zh_TW]=IBus 新注音配置工具
-Name[zh_HK]=IBus 新注音配置工具
-Comment=Set ibus-libzhuyin Preferences
-Comment[zh_CN]=设置 IBus 新注音首选项
-Comment[zh_TW]=設定 IBus 新注音個人偏好
-Comment[zh_HK]=設定 IBus 新注音個人偏好
-Exec=@libexecdir@/ibus-setup-libzhuyin
-Icon=@pkgdatadir@/icons/ibus-zhuyin.svg
-NoDisplay=true
-Type=Application
-StartupNotify=true
diff --git a/data/libzhuyin.appdata.xml b/data/libzhuyin.appdata.xml
index bce6879..c6ad14b 100644
--- a/data/libzhuyin.appdata.xml
+++ b/data/libzhuyin.appdata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="inputmethod">
- <id>libzhuyin.xml</id>
+ <id>com.github.libzhuyin</id>
<metadata_license>CC0-1.0</metadata_license>
<name>Zhuyin</name>
<summary>Chinese Zhuyin and Pinyin input method</summary>
@@ -20,7 +20,7 @@
<project_group>GNOME</project_group>
<developer_name>The GNOME Project</developer_name>
<url type="bugtracker">https://code.google.com/p/ibus/issues/list</url>
- <url type="donation">http://www.gnome.org/friends/</url>
+ <url type="donation">https://www.gnome.org/friends/</url>
<url type="help">https://code.google.com/p/ibus/wiki/FAQ</url>
- <update_contact><!-- upstream-contact_at_email.com --></update_contact>
+ <update_contact>alexepico_AT_gmail.com</update_contact>
</component>
diff --git a/data/model/Makefile.am b/data/model/Makefile.am
index 00a6e75..70b90f2 100644
--- a/data/model/Makefile.am
+++ b/data/model/Makefile.am
@@ -34,7 +34,7 @@ binary_model_data = phrase_index.bin pinyin_index.bin \
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = $(textual_model_data) \
- table.conf
+ table.conf.in
model_db_DATA = $(binary_model_data) \
table.conf
@@ -44,8 +44,8 @@ model_dbdir = $(libdir)/ibus-libzhuyin/data
CLEANFILES = $(binary_model_data)
interpolation2.text:
- wget http://downloads.sourceforge.net/libzhuyin/models/model11.text.tar.gz
- tar xvf model11.text.tar.gz -C $(top_srcdir)/data/model
+ wget http://downloads.sourceforge.net/libzhuyin/models/model13.text.tar.gz
+ tar xvf model13.text.tar.gz -C $(top_srcdir)/data/model
$(tablefiles) table.conf: interpolation2.text
diff --git a/data/model/table.conf.in b/data/model/table.conf.in
new file mode 100644
index 0000000..2a51e5b
--- /dev/null
+++ b/data/model/table.conf.in
@@ -0,0 +1,11 @@
+binary format version:6
+model data version:11
+lambda parameter:0.136866
+
+source table format:zhuyin
+database format:@DATABASE_FORMAT@
+
+default RESERVED NULL NULL NULL NOT_USED
+default TSI_DICTIONARY tsi.table tsi.bin tsi.dbin SYSTEM_FILE
+default NETWORK_DICTIONARY NULL NULL network.bin USER_FILE
+default USER_DICTIONARY NULL NULL user.bin USER_FILE
diff --git a/ibus-libzhuyin.spec.in b/ibus-libzhuyin.spec.in
index c05c50e..7fc5f51 100644
--- a/ibus-libzhuyin.spec.in
+++ b/ibus-libzhuyin.spec.in
@@ -8,7 +8,6 @@ URL: https://github.com/libzhuyin/ibus-libzhuyin
Source0: http://downloads.sourceforge.net/libzhuyin/ibus-libzhuyin/%{name}-%{version}.tar.gz
BuildRequires: gettext-devel
-BuildRequires: intltool
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: sqlite-devel
diff --git a/po/LINGUAS b/po/LINGUAS
index 053a3af..f1aa8ed 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,3 +1,4 @@
zh_CN
zh_HK
-zh_TW \ No newline at end of file
+de
+zh_TW
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..9b02d79
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty. If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context. Possible values are "yes" and "no". Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+# --previous to keep previous msgids of translated messages,
+# --quiet to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed. Possible values are "yes" and "no". Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist". Possible values are "yes" and
+# "no". Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 715f819..6355914 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,5 +2,5 @@ src/ZYZhuyinProperties.cc
src/ZYMain.cc
setup/main.py
setup/config.py
-[type: gettext/glade]setup/ibus-libzhuyin-preferences.ui
-data/ibus-setup-libzhuyin.desktop.in.in
+setup/ibus-libzhuyin-preferences.ui
+data/ibus-setup-libzhuyin.desktop.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1a6ce89..e69de29 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +0,0 @@
-data/ibus-setup-libzhuyin.desktop.in
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..46e5f40
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,341 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ibus-libzhuyin package.
+# Mike FABIAN <mfabian@redhat.com>, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version: ibus-libzhuyin 1.10.1\n"
+"Report-Msgid-Bugs-To: https://github.com/libzhuyin/ibus-libzhuyin/issues/"
+"new\n"
+"POT-Creation-Date: 2023-01-16 14:39+0800\n"
+"PO-Revision-Date: 2022-10-07 09:19+0000\n"
+"Last-Translator: Mike FABIAN <mfabian@redhat.com>\n"
+"Language-Team: German <https://translate.fedoraproject.org/projects/ibus-"
+"libzhuyin/main/de/>\n"
+"Language: de\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: Weblate 4.14.1\n"
+
+#: src/ZYZhuyinProperties.cc:39 src/ZYZhuyinProperties.cc:92
+msgid "Chinese"
+msgstr "Chinesisch"
+
+#: src/ZYZhuyinProperties.cc:40 src/ZYZhuyinProperties.cc:93
+msgid "English"
+msgstr "Englisch"
+
+#: src/ZYZhuyinProperties.cc:45 src/ZYZhuyinProperties.cc:104
+msgid "Switch to English Mode"
+msgstr "Auf englischen Modus umschalten"
+
+#: src/ZYZhuyinProperties.cc:46 src/ZYZhuyinProperties.cc:105
+msgid "Switch to Chinese Mode"
+msgstr "Auf chinesischen Modus umschalten"
+
+#: src/ZYZhuyinProperties.cc:50 src/ZYZhuyinProperties.cc:114
+msgid "Full Width"
+msgstr "Volle Breite"
+
+#: src/ZYZhuyinProperties.cc:51 src/ZYZhuyinProperties.cc:115
+msgid "Half Width"
+msgstr "Halbe Breite"
+
+#: src/ZYZhuyinProperties.cc:56 src/ZYZhuyinProperties.cc:120
+msgid "Switch to Half Width Mode"
+msgstr "Wechseln zum „Halbe Breite“ Modus"
+
+#: src/ZYZhuyinProperties.cc:57 src/ZYZhuyinProperties.cc:121
+msgid "Switch to Full Width Mode"
+msgstr "Wechseln zum „Volle Breite“ Modus"
+
+#: src/ZYZhuyinProperties.cc:61 src/ZYZhuyinProperties.cc:130
+msgid "Traditional Chinese"
+msgstr "Traditionelles Chinesisch"
+
+#: src/ZYZhuyinProperties.cc:62 src/ZYZhuyinProperties.cc:131
+msgid "Simplified Chinese"
+msgstr "Vereinfachtes Chinesisch"
+
+#: src/ZYZhuyinProperties.cc:67 src/ZYZhuyinProperties.cc:136
+msgid "Switch to Simplfied Chinese Mode"
+msgstr "Wechseln zum vereinfachten chinesischen Modus"
+
+#: src/ZYZhuyinProperties.cc:68 src/ZYZhuyinProperties.cc:137
+msgid "Switch to Traditional Chinese Mode"
+msgstr "Wechsel zum traditionellen chinesischen Modus"
+
+#: src/ZYZhuyinProperties.cc:71 src/ZYZhuyinProperties.cc:73
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: src/ZYZhuyinProperties.cc:76 src/ZYZhuyinProperties.cc:96
+msgid "中"
+msgstr "中"
+
+#: src/ZYZhuyinProperties.cc:78 src/ZYZhuyinProperties.cc:98
+msgid "英"
+msgstr "英"
+
+#: src/ZYMain.cc:98
+msgid "Libzhuyin input method"
+msgstr "Libzhuyin Eingabemethode"
+
+#: src/ZYMain.cc:108
+msgid "New Zhuyin (debug)"
+msgstr "Neues Zhuyin (debug)"
+
+#: src/ZYMain.cc:109
+msgid "New Zhuyin input method (debug)"
+msgstr "Neue Zhuyin Eingabemethode (debug)"
+
+#: setup/main.py:281
+msgid "Please choose a file"
+msgstr "Bitte wähle eine Datei"
+
+#: setup/main.py:307
+#, python-format
+msgid "<big><b>New Zhuyin %s</b></big>"
+msgstr "<big><b>Neues Zhuyin %s</b></big>"
+
+#: setup/config.py:29
+msgid "New Zhuyin"
+msgstr "Neues Zhuyin"
+
+#: setup/ibus-libzhuyin-preferences.ui:23
+msgid "Standard"
+msgstr "Standard"
+
+#: setup/ibus-libzhuyin-preferences.ui:28
+msgid "HSU"
+msgstr "HSU"
+
+#: setup/ibus-libzhuyin-preferences.ui:33
+msgid "IBM"
+msgstr "IBM"
+
+#: setup/ibus-libzhuyin-preferences.ui:38
+msgid "GinYieh"
+msgstr "GinYieh"
+
+#: setup/ibus-libzhuyin-preferences.ui:43
+msgid "Eten"
+msgstr "Eten"
+
+#: setup/ibus-libzhuyin-preferences.ui:48
+msgid "Eten26"
+msgstr "Eten26"
+
+#: setup/ibus-libzhuyin-preferences.ui:53
+msgid "Standard Dvorak"
+msgstr "Standard Dvorak"
+
+#: setup/ibus-libzhuyin-preferences.ui:58
+msgid "HSU Dvorak"
+msgstr "HSU Dvorak"
+
+#: setup/ibus-libzhuyin-preferences.ui:63
+msgid "DaChen CP26"
+msgstr "DaChen CP26"
+
+#: setup/ibus-libzhuyin-preferences.ui:68
+msgid "Hanyu Pinyin"
+msgstr "Hanyu Pinyin"
+
+#: setup/ibus-libzhuyin-preferences.ui:73
+msgid "Luoma Pinyin"
+msgstr "Luoma Pinyin"
+
+#: setup/ibus-libzhuyin-preferences.ui:78
+msgid "Secondary Bopomofo"
+msgstr "Zweites Bopomofo"
+
+#: setup/ibus-libzhuyin-preferences.ui:134
+msgid "Use Chinese Mode When Start-up"
+msgstr "Beim Start chinesischen Modus benutzen"
+
+#: setup/ibus-libzhuyin-preferences.ui:152
+msgid "Use Full Width When Start-up"
+msgstr "Beim Start „Volle Breite“ Modus benutzen"
+
+#: setup/ibus-libzhuyin-preferences.ui:170
+msgid "Use Traditional Chinese When Start-up"
+msgstr "Beim Start traditionellen chinesischen Modus benutzen"
+
+#: setup/ibus-libzhuyin-preferences.ui:188
+msgid "Always Input Numbers by Input Pad"
+msgstr "Immer Zahlen mit dem Ziffernblock eingeben"
+
+#: setup/ibus-libzhuyin-preferences.ui:206
+msgid "Use Space Key to Show Candidates"
+msgstr "Leertaste benutzen um Kandidaten anzuzeigen"
+
+#: setup/ibus-libzhuyin-preferences.ui:224
+msgid "Show Candidates After the Cursor"
+msgstr "Kandidaten hinter dem Cursor anzeigen"
+
+#: setup/ibus-libzhuyin-preferences.ui:246
+msgid "Inputting"
+msgstr "Eingeben"
+
+#: setup/ibus-libzhuyin-preferences.ui:271
+msgid "Keyboard Layout"
+msgstr "Tastaturbelegung"
+
+#: setup/ibus-libzhuyin-preferences.ui:285
+msgid "Candidate Choose Keys"
+msgstr "Kandidatenwahltasten"
+
+#: setup/ibus-libzhuyin-preferences.ui:319
+msgid "Candidates per Page"
+msgstr "Kandidaten pro Seite"
+
+#: setup/ibus-libzhuyin-preferences.ui:369
+msgid "Require tone information"
+msgstr "Verlange Toninformation"
+
+#: setup/ibus-libzhuyin-preferences.ui:397
+msgid "Keyboard"
+msgstr "Tastatur"
+
+#: setup/ibus-libzhuyin-preferences.ui:412
+msgid "Enable Fuzzy Zhuyin"
+msgstr "Fuzzy Zhuyin einschalten"
+
+#: setup/ibus-libzhuyin-preferences.ui:430
+msgid "l <=> n"
+msgstr "l <=> n"
+
+#: setup/ibus-libzhuyin-preferences.ui:447
+msgid "f <=> h"
+msgstr "f <=> h"
+
+#: setup/ibus-libzhuyin-preferences.ui:464
+msgid "l <=> r"
+msgstr "l <=> r"
+
+#: setup/ibus-libzhuyin-preferences.ui:481
+msgid "g <=> k"
+msgstr "g <=> k"
+
+#: setup/ibus-libzhuyin-preferences.ui:498
+msgid "c <=> ch"
+msgstr "c <=> ch"
+
+#: setup/ibus-libzhuyin-preferences.ui:515
+msgid "z <=> zh"
+msgstr "z <=> zh"
+
+#: setup/ibus-libzhuyin-preferences.ui:532
+msgid "s <=> sh"
+msgstr "s <=> sh"
+
+#: setup/ibus-libzhuyin-preferences.ui:549
+msgid "an <=> ang"
+msgstr "an <=> ang"
+
+#: setup/ibus-libzhuyin-preferences.ui:566
+msgid "in <=> ing"
+msgstr "in <=> ing"
+
+#: setup/ibus-libzhuyin-preferences.ui:583
+msgid "en <=> eng"
+msgstr "en <=> eng"
+
+#: setup/ibus-libzhuyin-preferences.ui:616
+msgid "Fuzzy Zhuyin"
+msgstr "Fuzzy Zhuyin"
+
+#: setup/ibus-libzhuyin-preferences.ui:638
+msgid "User Symbols"
+msgstr "Benutzersymbole"
+
+#: setup/ibus-libzhuyin-preferences.ui:654
+#: setup/ibus-libzhuyin-preferences.ui:697
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: setup/ibus-libzhuyin-preferences.ui:681
+msgid "Easy Symbols"
+msgstr "Einfache Symbole"
+
+#: setup/ibus-libzhuyin-preferences.ui:727
+#: setup/ibus-libzhuyin-preferences.ui:844
+msgid "User Phrases"
+msgstr "Benutzerphrasen"
+
+#: setup/ibus-libzhuyin-preferences.ui:737
+msgid "Clear"
+msgstr "Löschen"
+
+#: setup/ibus-libzhuyin-preferences.ui:752
+msgid "Import"
+msgstr "Importieren"
+
+#: setup/ibus-libzhuyin-preferences.ui:780
+msgid "Clear All Data"
+msgstr "Alle Daten löschen"
+
+#: setup/ibus-libzhuyin-preferences.ui:811
+msgid ""
+"<b>Dictionary File Format:</b>\n"
+" Each line contains the following:\n"
+" \"phrase zhuyin\"\n"
+" like \"你好 ㄋㄧˇ ㄏㄠˇ\"."
+msgstr ""
+"<b>Wörterbuchdateiformat:</b>\n"
+" Jede Zeile enthält Folgendes:\n"
+" \"Phrase zhuyin\"\n"
+" wie \"你好 ㄋㄧˇ ㄏㄠˇ\"."
+
+#: setup/ibus-libzhuyin-preferences.ui:822
+msgid "Help"
+msgstr "Hilfe"
+
+#: setup/ibus-libzhuyin-preferences.ui:883
+msgid "<big><b>IBus Zhuyin %s</b></big>"
+msgstr "<big><b>IBus Zhuyin %s</b></big>"
+
+#: setup/ibus-libzhuyin-preferences.ui:896
+msgid "New Zhuyin input method for IBus"
+msgstr "Neue Zhuyin Eingabemethode für IBus"
+
+#: setup/ibus-libzhuyin-preferences.ui:908
+msgid "<small>Copyright (c) 2013-2014 Peng Wu</small>"
+msgstr "<small>Copyright (c) 2013-2014 Peng Wu</small>"
+
+#: setup/ibus-libzhuyin-preferences.ui:936
+msgid ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Wu\n"
+"Peng Huang\n"
+"...\n"
+"\n"
+"<b>Contributors:</b>\n"
+"...\n"
+"</small>"
+msgstr ""
+"<small>\n"
+"<b>Autoren:</b>\n"
+"Peng Wu\n"
+"Peng Huang\n"
+"...\n"
+"\n"
+"<b>Beitragende:</b>\n"
+"...\n"
+"</small>"
+
+#: setup/ibus-libzhuyin-preferences.ui:965
+msgid "About"
+msgstr "Über"
+
+#: data/ibus-setup-libzhuyin.desktop.in:3
+msgid "IBus LibZhuyin Setup"
+msgstr "IBus LibZhuyin Einstellungen"
+
+#: data/ibus-setup-libzhuyin.desktop.in:4
+msgid "Set ibus-libzhuyin Preferences"
+msgstr "ibus-libzhuyin Optionen einstellen"
diff --git a/po/ibus-libzhuyin.pot b/po/ibus-libzhuyin.pot
new file mode 100644
index 0000000..0d17039
--- /dev/null
+++ b/po/ibus-libzhuyin.pot
@@ -0,0 +1,327 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ibus-libzhuyin package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ibus-libzhuyin 1.10.2\n"
+"Report-Msgid-Bugs-To: https://github.com/libzhuyin/ibus-libzhuyin/issues/"
+"new\n"
+"POT-Creation-Date: 2023-01-16 14:39+0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/ZYZhuyinProperties.cc:39 src/ZYZhuyinProperties.cc:92
+msgid "Chinese"
+msgstr ""
+
+#: src/ZYZhuyinProperties.cc:40 src/ZYZhuyinProperties.cc:93
+msgid "English"
+msgstr ""
+
+#: src/ZYZhuyinProperties.cc:45 src/ZYZhuyinProperties.cc:104
+msgid "Switch to English Mode"
+msgstr ""
+
+#: src/ZYZhuyinProperties.cc:46 src/ZYZhuyinProperties.cc:105
+msgid "Switch to Chinese 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:61 src/ZYZhuyinProperties.cc:130
+msgid "Traditional Chinese"
+msgstr ""
+
+#: src/ZYZhuyinProperties.cc:62 src/ZYZhuyinProperties.cc:131
+msgid "Simplified Chinese"
+msgstr ""
+
+#: src/ZYZhuyinProperties.cc:67 src/ZYZhuyinProperties.cc:136
+msgid "Switch to Simplfied Chinese Mode"
+msgstr ""
+
+#: src/ZYZhuyinProperties.cc:68 src/ZYZhuyinProperties.cc:137
+msgid "Switch to Traditional Chinese Mode"
+msgstr ""
+
+#: src/ZYZhuyinProperties.cc:71 src/ZYZhuyinProperties.cc:73
+msgid "Preferences"
+msgstr ""
+
+#: src/ZYZhuyinProperties.cc:76 src/ZYZhuyinProperties.cc:96
+msgid "中"
+msgstr ""
+
+#: src/ZYZhuyinProperties.cc:78 src/ZYZhuyinProperties.cc:98
+msgid "英"
+msgstr ""
+
+#: src/ZYMain.cc:98
+msgid "Libzhuyin input method"
+msgstr ""
+
+#: src/ZYMain.cc:108
+msgid "New Zhuyin (debug)"
+msgstr ""
+
+#: src/ZYMain.cc:109
+msgid "New Zhuyin input method (debug)"
+msgstr ""
+
+#: setup/main.py:281
+msgid "Please choose a file"
+msgstr ""
+
+#: setup/main.py:307
+#, python-format
+msgid "<big><b>New Zhuyin %s</b></big>"
+msgstr ""
+
+#: setup/config.py:29
+msgid "New Zhuyin"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:23
+msgid "Standard"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:28
+msgid "HSU"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:33
+msgid "IBM"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:38
+msgid "GinYieh"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:43
+msgid "Eten"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:48
+msgid "Eten26"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:53
+msgid "Standard Dvorak"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:58
+msgid "HSU Dvorak"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:63
+msgid "DaChen CP26"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:68
+msgid "Hanyu Pinyin"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:73
+msgid "Luoma Pinyin"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:78
+msgid "Secondary Bopomofo"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:134
+msgid "Use Chinese Mode When Start-up"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:152
+msgid "Use Full Width When Start-up"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:170
+msgid "Use Traditional Chinese When Start-up"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:188
+msgid "Always Input Numbers by Input Pad"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:206
+msgid "Use Space Key to Show Candidates"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:224
+msgid "Show Candidates After the Cursor"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:246
+msgid "Inputting"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:271
+msgid "Keyboard Layout"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:285
+msgid "Candidate Choose Keys"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:319
+msgid "Candidates per Page"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:369
+msgid "Require tone information"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:397
+msgid "Keyboard"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:412
+msgid "Enable Fuzzy Zhuyin"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:430
+msgid "l <=> n"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:447
+msgid "f <=> h"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:464
+msgid "l <=> r"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:481
+msgid "g <=> k"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:498
+msgid "c <=> ch"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:515
+msgid "z <=> zh"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:532
+msgid "s <=> sh"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:549
+msgid "an <=> ang"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:566
+msgid "in <=> ing"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:583
+msgid "en <=> eng"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:616
+msgid "Fuzzy Zhuyin"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:638
+msgid "User Symbols"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:654
+#: setup/ibus-libzhuyin-preferences.ui:697
+msgid "Edit"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:681
+msgid "Easy Symbols"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:727
+#: setup/ibus-libzhuyin-preferences.ui:844
+msgid "User Phrases"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:737
+msgid "Clear"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:752
+msgid "Import"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:780
+msgid "Clear All Data"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:811
+msgid ""
+"<b>Dictionary File Format:</b>\n"
+" Each line contains the following:\n"
+" \"phrase zhuyin\"\n"
+" like \"你好 ㄋㄧˇ ㄏㄠˇ\"."
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:822
+msgid "Help"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:883
+msgid "<big><b>IBus Zhuyin %s</b></big>"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:896
+msgid "New Zhuyin input method for IBus"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:908
+msgid "<small>Copyright (c) 2013-2014 Peng Wu</small>"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:936
+msgid ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Wu\n"
+"Peng Huang\n"
+"...\n"
+"\n"
+"<b>Contributors:</b>\n"
+"...\n"
+"</small>"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:965
+msgid "About"
+msgstr ""
+
+#: data/ibus-setup-libzhuyin.desktop.in:3
+msgid "IBus LibZhuyin Setup"
+msgstr ""
+
+#: data/ibus-setup-libzhuyin.desktop.in:4
+msgid "Set ibus-libzhuyin Preferences"
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3238ffc..7d8a3bc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,274 +2,284 @@
# Copyright (C) YEAR Peng Wu <alexepico@gmail.com>
# This file is distributed under the same license as the ibus-libzhuyin package.
# Peng Wu <alexepico@gmail.com>, 2015.
-#
+# Peng Wu <pwu@redhat.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: ibus-libpinyin 1.2.99\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-04 15:35+0800\n"
-"PO-Revision-Date: 2018-01-04 15:27+0800\n"
-"Last-Translator: Peng Huang <shawn.p.huang@gmail.com>\n"
-"Language-Team: Peng Huang <shawn.p.huang@gmail.com>\n"
-"Language: \n"
+"Report-Msgid-Bugs-To: https://github.com/libzhuyin/ibus-libzhuyin/issues/"
+"new\n"
+"POT-Creation-Date: 2023-01-16 14:39+0800\n"
+"PO-Revision-Date: 2022-10-09 01:24+0000\n"
+"Last-Translator: Peng Wu <pwu@redhat.com>\n"
+"Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
+"projects/ibus-libzhuyin/main/zh_CN/>\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.14.1\n"
-#: ../src/ZYZhuyinProperties.cc:39 ../src/ZYZhuyinProperties.cc:92
+#: src/ZYZhuyinProperties.cc:39 src/ZYZhuyinProperties.cc:92
msgid "Chinese"
msgstr "中文"
-#: ../src/ZYZhuyinProperties.cc:40 ../src/ZYZhuyinProperties.cc:93
+#: src/ZYZhuyinProperties.cc:40 src/ZYZhuyinProperties.cc:93
msgid "English"
msgstr "英文"
-#: ../src/ZYZhuyinProperties.cc:45 ../src/ZYZhuyinProperties.cc:104
+#: src/ZYZhuyinProperties.cc:45 src/ZYZhuyinProperties.cc:104
msgid "Switch to English Mode"
msgstr "切换到英文模式"
-#: ../src/ZYZhuyinProperties.cc:46 ../src/ZYZhuyinProperties.cc:105
+#: src/ZYZhuyinProperties.cc:46 src/ZYZhuyinProperties.cc:105
msgid "Switch to Chinese Mode"
msgstr "切换到中文模式"
-#: ../src/ZYZhuyinProperties.cc:50 ../src/ZYZhuyinProperties.cc:114
+#: src/ZYZhuyinProperties.cc:50 src/ZYZhuyinProperties.cc:114
msgid "Full Width"
msgstr "全角"
-#: ../src/ZYZhuyinProperties.cc:51 ../src/ZYZhuyinProperties.cc:115
+#: src/ZYZhuyinProperties.cc:51 src/ZYZhuyinProperties.cc:115
msgid "Half Width"
msgstr "半角"
-#: ../src/ZYZhuyinProperties.cc:56 ../src/ZYZhuyinProperties.cc:120
+#: src/ZYZhuyinProperties.cc:56 src/ZYZhuyinProperties.cc:120
msgid "Switch to Half Width Mode"
msgstr "切换到半角模式"
-#: ../src/ZYZhuyinProperties.cc:57 ../src/ZYZhuyinProperties.cc:121
+#: src/ZYZhuyinProperties.cc:57 src/ZYZhuyinProperties.cc:121
msgid "Switch to Full Width Mode"
msgstr "切换到全角模式"
-#: ../src/ZYZhuyinProperties.cc:61 ../src/ZYZhuyinProperties.cc:130
+#: src/ZYZhuyinProperties.cc:61 src/ZYZhuyinProperties.cc:130
msgid "Traditional Chinese"
msgstr "繁体中文"
-#: ../src/ZYZhuyinProperties.cc:62 ../src/ZYZhuyinProperties.cc:131
+#: src/ZYZhuyinProperties.cc:62 src/ZYZhuyinProperties.cc:131
msgid "Simplified Chinese"
msgstr "简体中文"
-#: ../src/ZYZhuyinProperties.cc:67 ../src/ZYZhuyinProperties.cc:136
+#: src/ZYZhuyinProperties.cc:67 src/ZYZhuyinProperties.cc:136
msgid "Switch to Simplfied Chinese Mode"
msgstr "切换到简体中文模式"
-#: ../src/ZYZhuyinProperties.cc:68 ../src/ZYZhuyinProperties.cc:137
+#: src/ZYZhuyinProperties.cc:68 src/ZYZhuyinProperties.cc:137
msgid "Switch to Traditional Chinese Mode"
msgstr "切换到繁体中文模式"
-#: ../src/ZYZhuyinProperties.cc:71 ../src/ZYZhuyinProperties.cc:73
+#: src/ZYZhuyinProperties.cc:71 src/ZYZhuyinProperties.cc:73
msgid "Preferences"
msgstr "首选项"
-#: ../src/ZYZhuyinProperties.cc:76 ../src/ZYZhuyinProperties.cc:96
+#: src/ZYZhuyinProperties.cc:76 src/ZYZhuyinProperties.cc:96
msgid "中"
msgstr "中"
-#: ../src/ZYZhuyinProperties.cc:78 ../src/ZYZhuyinProperties.cc:98
+#: src/ZYZhuyinProperties.cc:78 src/ZYZhuyinProperties.cc:98
msgid "英"
msgstr "英"
-#: ../src/ZYMain.cc:98
+#: src/ZYMain.cc:98
msgid "Libzhuyin input method"
msgstr "注音输入法"
-#: ../src/ZYMain.cc:108
+#: src/ZYMain.cc:108
msgid "New Zhuyin (debug)"
msgstr "新注音 (调试)"
-#: ../src/ZYMain.cc:109
+#: src/ZYMain.cc:109
msgid "New Zhuyin input method (debug)"
msgstr "新注音输入法(调试)"
-#: ../setup/main.py:262
+#: setup/main.py:281
msgid "Please choose a file"
msgstr "请选择文件"
-#: ../setup/main.py:288
+#: setup/main.py:307
#, python-format
msgid "<big><b>New Zhuyin %s</b></big>"
msgstr "<big><b>IBus 新注音 %s</b></big>"
-#: ../setup/config.py:29
+#: setup/config.py:29
msgid "New Zhuyin"
msgstr "新注音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:1
+#: setup/ibus-libzhuyin-preferences.ui:23
msgid "Standard"
msgstr "标准"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:2
+#: setup/ibus-libzhuyin-preferences.ui:28
msgid "HSU"
msgstr "许氏"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:3
+#: setup/ibus-libzhuyin-preferences.ui:33
msgid "IBM"
msgstr "IBM"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:4
+#: setup/ibus-libzhuyin-preferences.ui:38
msgid "GinYieh"
msgstr "精业"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:5
+#: setup/ibus-libzhuyin-preferences.ui:43
msgid "Eten"
msgstr "倚天"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:6
+#: setup/ibus-libzhuyin-preferences.ui:48
msgid "Eten26"
msgstr "倚天26"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:7
+#: setup/ibus-libzhuyin-preferences.ui:53
msgid "Standard Dvorak"
msgstr "标准 Dvorak"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:8
+#: setup/ibus-libzhuyin-preferences.ui:58
msgid "HSU Dvorak"
msgstr "许氏 Dvorak"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:9
+#: setup/ibus-libzhuyin-preferences.ui:63
msgid "DaChen CP26"
msgstr "大千 26键"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:10
+#: setup/ibus-libzhuyin-preferences.ui:68
msgid "Hanyu Pinyin"
msgstr "汉语拼音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:11
+#: setup/ibus-libzhuyin-preferences.ui:73
msgid "Luoma Pinyin"
msgstr "罗马拼音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:12
+#: setup/ibus-libzhuyin-preferences.ui:78
msgid "Secondary Bopomofo"
msgstr "注音二式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:13
+#: setup/ibus-libzhuyin-preferences.ui:134
msgid "Use Chinese Mode When Start-up"
msgstr "启动后使用中文模式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:14
+#: setup/ibus-libzhuyin-preferences.ui:152
msgid "Use Full Width When Start-up"
msgstr "启动后使用全角模式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:15
+#: setup/ibus-libzhuyin-preferences.ui:170
msgid "Use Traditional Chinese When Start-up"
msgstr "启动后使用繁体中文模式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:16
+#: setup/ibus-libzhuyin-preferences.ui:188
msgid "Always Input Numbers by Input Pad"
msgstr "小键盘始终输入数字"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:17
+#: setup/ibus-libzhuyin-preferences.ui:206
msgid "Use Space Key to Show Candidates"
msgstr "使用空格键显示候选词"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:18
+#: setup/ibus-libzhuyin-preferences.ui:224
msgid "Show Candidates After the Cursor"
msgstr "显示光标后的候选词"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:19
+#: setup/ibus-libzhuyin-preferences.ui:246
msgid "Inputting"
msgstr "输入"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:20
+#: setup/ibus-libzhuyin-preferences.ui:271
msgid "Keyboard Layout"
-msgstr "键盘布局:"
+msgstr "键盘布局"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:21
+#: setup/ibus-libzhuyin-preferences.ui:285
msgid "Candidate Choose Keys"
msgstr "候选词选择键"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:22
+#: setup/ibus-libzhuyin-preferences.ui:319
msgid "Candidates per Page"
msgstr "候选词每页显示个数"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:23
+#: setup/ibus-libzhuyin-preferences.ui:369
+msgid "Require tone information"
+msgstr "输入音调"
+
+#: setup/ibus-libzhuyin-preferences.ui:397
msgid "Keyboard"
msgstr "键盘"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:24
+#: setup/ibus-libzhuyin-preferences.ui:412
msgid "Enable Fuzzy Zhuyin"
msgstr "启动模糊音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:25
+#: setup/ibus-libzhuyin-preferences.ui:430
msgid "l <=> n"
-msgstr ""
+msgstr "l <=> n"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:26
+#: setup/ibus-libzhuyin-preferences.ui:447
msgid "f <=> h"
-msgstr ""
+msgstr "f <=> h"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:27
+#: setup/ibus-libzhuyin-preferences.ui:464
msgid "l <=> r"
-msgstr ""
+msgstr "l <=> r"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:28
+#: setup/ibus-libzhuyin-preferences.ui:481
msgid "g <=> k"
-msgstr ""
+msgstr "g <=> k"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:29
+#: setup/ibus-libzhuyin-preferences.ui:498
msgid "c <=> ch"
-msgstr ""
+msgstr "c <=> ch"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:30
+#: setup/ibus-libzhuyin-preferences.ui:515
msgid "z <=> zh"
-msgstr ""
+msgstr "z <=> zh"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:31
+#: setup/ibus-libzhuyin-preferences.ui:532
msgid "s <=> sh"
-msgstr ""
+msgstr "s <=> sh"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:32
+#: setup/ibus-libzhuyin-preferences.ui:549
msgid "an <=> ang"
-msgstr ""
+msgstr "an <=> ang"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:33
+#: setup/ibus-libzhuyin-preferences.ui:566
msgid "in <=> ing"
-msgstr ""
+msgstr "in <=> ing"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:34
+#: setup/ibus-libzhuyin-preferences.ui:583
msgid "en <=> eng"
-msgstr ""
+msgstr "en <=> eng"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:35
+#: setup/ibus-libzhuyin-preferences.ui:616
msgid "Fuzzy Zhuyin"
msgstr "模糊注音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:36
+#: setup/ibus-libzhuyin-preferences.ui:638
msgid "User Symbols"
msgstr "用户自定义符号"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:37
+#: setup/ibus-libzhuyin-preferences.ui:654
+#: setup/ibus-libzhuyin-preferences.ui:697
msgid "Edit"
msgstr "编辑"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:38
+#: setup/ibus-libzhuyin-preferences.ui:681
msgid "Easy Symbols"
msgstr "自定义快捷符号"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:39
+#: setup/ibus-libzhuyin-preferences.ui:727
+#: setup/ibus-libzhuyin-preferences.ui:844
msgid "User Phrases"
msgstr "使用自定义词组"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:40
+#: setup/ibus-libzhuyin-preferences.ui:737
msgid "Clear"
msgstr "清除"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:41
+#: setup/ibus-libzhuyin-preferences.ui:752
msgid "Import"
msgstr "导入"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:42
+#: setup/ibus-libzhuyin-preferences.ui:780
msgid "Clear All Data"
msgstr "清除所有数据"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:43
+#: setup/ibus-libzhuyin-preferences.ui:811
msgid ""
"<b>Dictionary File Format:</b>\n"
" Each line contains the following:\n"
@@ -279,26 +289,25 @@ msgstr ""
"<b>词典文件格式:</b>\n"
" 每一行包含:\n"
" \"短语 注音\"\n"
-" 例如 \"你好 ㄋㄧˇ ㄏㄠˇ\""
+" 例如 \"你好 ㄋㄧˇ ㄏㄠˇ\"。"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:47
+#: setup/ibus-libzhuyin-preferences.ui:822
msgid "Help"
msgstr "帮助"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:49
-#, no-c-format
+#: setup/ibus-libzhuyin-preferences.ui:883
msgid "<big><b>IBus Zhuyin %s</b></big>"
msgstr "<big><b>IBus 注音 %s</b></big>"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:50
+#: setup/ibus-libzhuyin-preferences.ui:896
msgid "New Zhuyin input method for IBus"
msgstr "IBus 新注音输入法"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:51
+#: setup/ibus-libzhuyin-preferences.ui:908
msgid "<small>Copyright (c) 2013-2014 Peng Wu</small>"
msgstr "<small>版权所有 (c) 2013-2014 吴鹏</small>"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:52
+#: setup/ibus-libzhuyin-preferences.ui:936
msgid ""
"<small>\n"
"<b>Authors:</b>\n"
@@ -320,10 +329,18 @@ msgstr ""
"...\n"
"</small>"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:61
+#: setup/ibus-libzhuyin-preferences.ui:965
msgid "About"
msgstr "关于"
+#: data/ibus-setup-libzhuyin.desktop.in:3
+msgid "IBus LibZhuyin Setup"
+msgstr "IBus 新注音设置工具"
+
+#: data/ibus-setup-libzhuyin.desktop.in:4
+msgid "Set ibus-libzhuyin Preferences"
+msgstr "设置 IBus 新注音首选项"
+
#~ msgid "Full Width Letter"
#~ msgstr "全角字母"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index c142676..170650e 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,276 +6,283 @@
msgid ""
msgstr ""
"Project-Id-Version: ibus-libpinyin 1.2.99\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-04 15:35+0800\n"
+"Report-Msgid-Bugs-To: https://github.com/libzhuyin/ibus-libzhuyin/issues/"
+"new\n"
+"POT-Creation-Date: 2023-01-16 14:39+0800\n"
"PO-Revision-Date: 2015-05-13 16:00+0800\n"
"Last-Translator: Peng Huang <shawn.p.huang@gmail.com>\n"
"Language-Team: Peng Huang <shawn.p.huang@gmail.com>\n"
-"Language: \n"
+"Language: zh_HK\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/ZYZhuyinProperties.cc:39 ../src/ZYZhuyinProperties.cc:92
+#: src/ZYZhuyinProperties.cc:39 src/ZYZhuyinProperties.cc:92
msgid "Chinese"
msgstr "中文"
-#: ../src/ZYZhuyinProperties.cc:40 ../src/ZYZhuyinProperties.cc:93
+#: src/ZYZhuyinProperties.cc:40 src/ZYZhuyinProperties.cc:93
msgid "English"
msgstr "英文"
-#: ../src/ZYZhuyinProperties.cc:45 ../src/ZYZhuyinProperties.cc:104
+#: src/ZYZhuyinProperties.cc:45 src/ZYZhuyinProperties.cc:104
msgid "Switch to English Mode"
msgstr "切換到英文模式"
-#: ../src/ZYZhuyinProperties.cc:46 ../src/ZYZhuyinProperties.cc:105
+#: src/ZYZhuyinProperties.cc:46 src/ZYZhuyinProperties.cc:105
msgid "Switch to Chinese Mode"
msgstr "切換到中文模式"
-#: ../src/ZYZhuyinProperties.cc:50 ../src/ZYZhuyinProperties.cc:114
+#: src/ZYZhuyinProperties.cc:50 src/ZYZhuyinProperties.cc:114
#, fuzzy
msgid "Full Width"
msgstr "全角符號"
-#: ../src/ZYZhuyinProperties.cc:51 ../src/ZYZhuyinProperties.cc:115
+#: src/ZYZhuyinProperties.cc:51 src/ZYZhuyinProperties.cc:115
#, fuzzy
msgid "Half Width"
msgstr "半角符號"
-#: ../src/ZYZhuyinProperties.cc:56 ../src/ZYZhuyinProperties.cc:120
+#: src/ZYZhuyinProperties.cc:56 src/ZYZhuyinProperties.cc:120
#, fuzzy
msgid "Switch to Half Width Mode"
msgstr "切換到半母字母模式"
-#: ../src/ZYZhuyinProperties.cc:57 ../src/ZYZhuyinProperties.cc:121
+#: src/ZYZhuyinProperties.cc:57 src/ZYZhuyinProperties.cc:121
#, fuzzy
msgid "Switch to Full Width Mode"
msgstr "切換到全角字母模式"
-#: ../src/ZYZhuyinProperties.cc:61 ../src/ZYZhuyinProperties.cc:130
+#: src/ZYZhuyinProperties.cc:61 src/ZYZhuyinProperties.cc:130
msgid "Traditional Chinese"
msgstr "繁體中文"
-#: ../src/ZYZhuyinProperties.cc:62 ../src/ZYZhuyinProperties.cc:131
+#: src/ZYZhuyinProperties.cc:62 src/ZYZhuyinProperties.cc:131
msgid "Simplified Chinese"
msgstr "簡體中文"
-#: ../src/ZYZhuyinProperties.cc:67 ../src/ZYZhuyinProperties.cc:136
+#: src/ZYZhuyinProperties.cc:67 src/ZYZhuyinProperties.cc:136
msgid "Switch to Simplfied Chinese Mode"
msgstr "切換到簡體中文模式"
-#: ../src/ZYZhuyinProperties.cc:68 ../src/ZYZhuyinProperties.cc:137
+#: src/ZYZhuyinProperties.cc:68 src/ZYZhuyinProperties.cc:137
msgid "Switch to Traditional Chinese Mode"
msgstr "切換到繁體中文模式"
-#: ../src/ZYZhuyinProperties.cc:71 ../src/ZYZhuyinProperties.cc:73
+#: src/ZYZhuyinProperties.cc:71 src/ZYZhuyinProperties.cc:73
msgid "Preferences"
msgstr "首選項"
-#: ../src/ZYZhuyinProperties.cc:76 ../src/ZYZhuyinProperties.cc:96
+#: src/ZYZhuyinProperties.cc:76 src/ZYZhuyinProperties.cc:96
msgid "中"
msgstr "中"
-#: ../src/ZYZhuyinProperties.cc:78 ../src/ZYZhuyinProperties.cc:98
+#: src/ZYZhuyinProperties.cc:78 src/ZYZhuyinProperties.cc:98
msgid "英"
msgstr "英"
-#: ../src/ZYMain.cc:98
+#: src/ZYMain.cc:98
msgid "Libzhuyin input method"
msgstr "註音輸入法"
-#: ../src/ZYMain.cc:108
+#: src/ZYMain.cc:108
msgid "New Zhuyin (debug)"
msgstr "新注音 (調試)"
-#: ../src/ZYMain.cc:109
+#: src/ZYMain.cc:109
msgid "New Zhuyin input method (debug)"
msgstr "新注音輸入法(調試)"
-#: ../setup/main.py:262
+#: setup/main.py:281
msgid "Please choose a file"
msgstr "請選擇文件"
-#: ../setup/main.py:288
+#: setup/main.py:307
#, python-format
msgid "<big><b>New Zhuyin %s</b></big>"
msgstr "<big><b>IBus 新注音 %s</b></big>"
-#: ../setup/config.py:29
+#: setup/config.py:29
#, fuzzy
msgid "New Zhuyin"
msgstr "新注音 (調試)"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:1
+#: setup/ibus-libzhuyin-preferences.ui:23
msgid "Standard"
msgstr "標準"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:2
+#: setup/ibus-libzhuyin-preferences.ui:28
msgid "HSU"
msgstr "許氏"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:3
+#: setup/ibus-libzhuyin-preferences.ui:33
msgid "IBM"
msgstr "IBM"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:4
+#: setup/ibus-libzhuyin-preferences.ui:38
msgid "GinYieh"
msgstr "精業"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:5
+#: setup/ibus-libzhuyin-preferences.ui:43
msgid "Eten"
msgstr "倚天"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:6
+#: setup/ibus-libzhuyin-preferences.ui:48
msgid "Eten26"
msgstr "倚天26"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:7
+#: setup/ibus-libzhuyin-preferences.ui:53
msgid "Standard Dvorak"
msgstr "標準 Dvorak"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:8
+#: setup/ibus-libzhuyin-preferences.ui:58
msgid "HSU Dvorak"
msgstr "許氏 Dvorak"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:9
+#: setup/ibus-libzhuyin-preferences.ui:63
msgid "DaChen CP26"
msgstr "大千 26鍵"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:10
+#: setup/ibus-libzhuyin-preferences.ui:68
msgid "Hanyu Pinyin"
msgstr "漢語拼音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:11
+#: setup/ibus-libzhuyin-preferences.ui:73
msgid "Luoma Pinyin"
msgstr "羅馬拼音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:12
+#: setup/ibus-libzhuyin-preferences.ui:78
msgid "Secondary Bopomofo"
msgstr "註音二式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:13
+#: setup/ibus-libzhuyin-preferences.ui:134
msgid "Use Chinese Mode When Start-up"
msgstr "啓動後使用中文模式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:14
+#: setup/ibus-libzhuyin-preferences.ui:152
#, fuzzy
msgid "Use Full Width When Start-up"
msgstr "啓動後使用全角英文模式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:15
+#: setup/ibus-libzhuyin-preferences.ui:170
msgid "Use Traditional Chinese When Start-up"
msgstr "啓動後使用繁體中文模式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:16
+#: setup/ibus-libzhuyin-preferences.ui:188
msgid "Always Input Numbers by Input Pad"
msgstr "小鍵盤始終輸入數字"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:17
+#: setup/ibus-libzhuyin-preferences.ui:206
msgid "Use Space Key to Show Candidates"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:18
+#: setup/ibus-libzhuyin-preferences.ui:224
msgid "Show Candidates After the Cursor"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:19
+#: setup/ibus-libzhuyin-preferences.ui:246
msgid "Inputting"
msgstr "輸入"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:20
+#: setup/ibus-libzhuyin-preferences.ui:271
msgid "Keyboard Layout"
msgstr "鍵盤佈局:"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:21
+#: setup/ibus-libzhuyin-preferences.ui:285
msgid "Candidate Choose Keys"
msgstr "候選詞選擇鍵"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:22
+#: setup/ibus-libzhuyin-preferences.ui:319
msgid "Candidates per Page"
msgstr "候選詞每頁顯示個數"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:23
+#: setup/ibus-libzhuyin-preferences.ui:369
+msgid "Require tone information"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:397
msgid "Keyboard"
msgstr "鍵盤"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:24
+#: setup/ibus-libzhuyin-preferences.ui:412
msgid "Enable Fuzzy Zhuyin"
msgstr "啓動模糊音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:25
+#: setup/ibus-libzhuyin-preferences.ui:430
msgid "l <=> n"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:26
+#: setup/ibus-libzhuyin-preferences.ui:447
msgid "f <=> h"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:27
+#: setup/ibus-libzhuyin-preferences.ui:464
msgid "l <=> r"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:28
+#: setup/ibus-libzhuyin-preferences.ui:481
msgid "g <=> k"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:29
+#: setup/ibus-libzhuyin-preferences.ui:498
msgid "c <=> ch"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:30
+#: setup/ibus-libzhuyin-preferences.ui:515
msgid "z <=> zh"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:31
+#: setup/ibus-libzhuyin-preferences.ui:532
msgid "s <=> sh"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:32
+#: setup/ibus-libzhuyin-preferences.ui:549
msgid "an <=> ang"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:33
+#: setup/ibus-libzhuyin-preferences.ui:566
msgid "in <=> ing"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:34
+#: setup/ibus-libzhuyin-preferences.ui:583
msgid "en <=> eng"
msgstr ""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:35
+#: setup/ibus-libzhuyin-preferences.ui:616
msgid "Fuzzy Zhuyin"
msgstr "模糊註音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:36
+#: setup/ibus-libzhuyin-preferences.ui:638
msgid "User Symbols"
msgstr "用戶自定義符號"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:37
+#: setup/ibus-libzhuyin-preferences.ui:654
+#: setup/ibus-libzhuyin-preferences.ui:697
msgid "Edit"
msgstr "編輯"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:38
+#: setup/ibus-libzhuyin-preferences.ui:681
msgid "Easy Symbols"
msgstr "自定義快捷符號"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:39
+#: setup/ibus-libzhuyin-preferences.ui:727
+#: setup/ibus-libzhuyin-preferences.ui:844
msgid "User Phrases"
msgstr "使用自定義詞組"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:40
+#: setup/ibus-libzhuyin-preferences.ui:737
msgid "Clear"
msgstr "清除"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:41
+#: setup/ibus-libzhuyin-preferences.ui:752
msgid "Import"
msgstr "導入"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:42
+#: setup/ibus-libzhuyin-preferences.ui:780
msgid "Clear All Data"
msgstr "清除所有數據"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:43
+#: setup/ibus-libzhuyin-preferences.ui:811
msgid ""
"<b>Dictionary File Format:</b>\n"
" Each line contains the following:\n"
@@ -287,24 +294,23 @@ msgstr ""
" \"短語 註音\"\n"
" 例如 \"你好 ㄋㄧˇ ㄏㄠˇ\""
-#: ../setup/ibus-libzhuyin-preferences.ui.h:47
+#: setup/ibus-libzhuyin-preferences.ui:822
msgid "Help"
msgstr "幫助"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:49
-#, no-c-format
+#: setup/ibus-libzhuyin-preferences.ui:883
msgid "<big><b>IBus Zhuyin %s</b></big>"
msgstr "<big><b>IBus 註音 %s</b></big>"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:50
+#: setup/ibus-libzhuyin-preferences.ui:896
msgid "New Zhuyin input method for IBus"
msgstr "IBus 新注音輸入法"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:51
+#: setup/ibus-libzhuyin-preferences.ui:908
msgid "<small>Copyright (c) 2013-2014 Peng Wu</small>"
msgstr "<small>版權所有 (c) 2013-2014 吳鵬</small>"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:52
+#: setup/ibus-libzhuyin-preferences.ui:936
msgid ""
"<small>\n"
"<b>Authors:</b>\n"
@@ -326,10 +332,18 @@ msgstr ""
"...\n"
"</small>"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:61
+#: setup/ibus-libzhuyin-preferences.ui:965
msgid "About"
msgstr "關於"
+#: data/ibus-setup-libzhuyin.desktop.in:3
+msgid "IBus LibZhuyin Setup"
+msgstr ""
+
+#: data/ibus-setup-libzhuyin.desktop.in:4
+msgid "Set ibus-libzhuyin Preferences"
+msgstr ""
+
#~ msgid "Full Width Letter"
#~ msgstr "全角字母"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f1525e1..19bf6ae 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,8 +6,9 @@
msgid ""
msgstr ""
"Project-Id-Version: ibus-libpinyin 1.2.99\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-04 15:35+0800\n"
+"Report-Msgid-Bugs-To: https://github.com/libzhuyin/ibus-libzhuyin/issues/"
+"new\n"
+"POT-Creation-Date: 2023-01-16 14:39+0800\n"
"PO-Revision-Date: 2018-01-04 15:28+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Peng Huang <shawn.p.huang@gmail.com>\n"
@@ -17,260 +18,266 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.4\n"
-#: ../src/ZYZhuyinProperties.cc:39 ../src/ZYZhuyinProperties.cc:92
+#: src/ZYZhuyinProperties.cc:39 src/ZYZhuyinProperties.cc:92
msgid "Chinese"
msgstr "中文"
-#: ../src/ZYZhuyinProperties.cc:40 ../src/ZYZhuyinProperties.cc:93
+#: src/ZYZhuyinProperties.cc:40 src/ZYZhuyinProperties.cc:93
msgid "English"
msgstr "英文"
-#: ../src/ZYZhuyinProperties.cc:45 ../src/ZYZhuyinProperties.cc:104
+#: src/ZYZhuyinProperties.cc:45 src/ZYZhuyinProperties.cc:104
msgid "Switch to English Mode"
msgstr "切換到英文模式"
-#: ../src/ZYZhuyinProperties.cc:46 ../src/ZYZhuyinProperties.cc:105
+#: src/ZYZhuyinProperties.cc:46 src/ZYZhuyinProperties.cc:105
msgid "Switch to Chinese Mode"
msgstr "切換到中文模式"
-#: ../src/ZYZhuyinProperties.cc:50 ../src/ZYZhuyinProperties.cc:114
+#: src/ZYZhuyinProperties.cc:50 src/ZYZhuyinProperties.cc:114
msgid "Full Width"
msgstr "全形"
-#: ../src/ZYZhuyinProperties.cc:51 ../src/ZYZhuyinProperties.cc:115
+#: src/ZYZhuyinProperties.cc:51 src/ZYZhuyinProperties.cc:115
msgid "Half Width"
msgstr "半形"
-#: ../src/ZYZhuyinProperties.cc:56 ../src/ZYZhuyinProperties.cc:120
+#: src/ZYZhuyinProperties.cc:56 src/ZYZhuyinProperties.cc:120
msgid "Switch to Half Width Mode"
msgstr "切換到半形模式"
-#: ../src/ZYZhuyinProperties.cc:57 ../src/ZYZhuyinProperties.cc:121
+#: src/ZYZhuyinProperties.cc:57 src/ZYZhuyinProperties.cc:121
msgid "Switch to Full Width Mode"
msgstr "切換到全形模式"
-#: ../src/ZYZhuyinProperties.cc:61 ../src/ZYZhuyinProperties.cc:130
+#: src/ZYZhuyinProperties.cc:61 src/ZYZhuyinProperties.cc:130
msgid "Traditional Chinese"
msgstr "繁體中文"
-#: ../src/ZYZhuyinProperties.cc:62 ../src/ZYZhuyinProperties.cc:131
+#: src/ZYZhuyinProperties.cc:62 src/ZYZhuyinProperties.cc:131
msgid "Simplified Chinese"
msgstr "簡體中文"
-#: ../src/ZYZhuyinProperties.cc:67 ../src/ZYZhuyinProperties.cc:136
+#: src/ZYZhuyinProperties.cc:67 src/ZYZhuyinProperties.cc:136
msgid "Switch to Simplfied Chinese Mode"
msgstr "切換到簡體中文模式"
-#: ../src/ZYZhuyinProperties.cc:68 ../src/ZYZhuyinProperties.cc:137
+#: src/ZYZhuyinProperties.cc:68 src/ZYZhuyinProperties.cc:137
msgid "Switch to Traditional Chinese Mode"
msgstr "切換到繁體中文模式"
-#: ../src/ZYZhuyinProperties.cc:71 ../src/ZYZhuyinProperties.cc:73
+#: src/ZYZhuyinProperties.cc:71 src/ZYZhuyinProperties.cc:73
msgid "Preferences"
msgstr "偏好設定"
-#: ../src/ZYZhuyinProperties.cc:76 ../src/ZYZhuyinProperties.cc:96
+#: src/ZYZhuyinProperties.cc:76 src/ZYZhuyinProperties.cc:96
msgid "中"
msgstr "中"
-#: ../src/ZYZhuyinProperties.cc:78 ../src/ZYZhuyinProperties.cc:98
+#: src/ZYZhuyinProperties.cc:78 src/ZYZhuyinProperties.cc:98
msgid "英"
msgstr "英"
-#: ../src/ZYMain.cc:98
+#: src/ZYMain.cc:98
msgid "Libzhuyin input method"
msgstr "注音輸入法"
-#: ../src/ZYMain.cc:108
+#: src/ZYMain.cc:108
msgid "New Zhuyin (debug)"
msgstr "新注音 (除錯)"
-#: ../src/ZYMain.cc:109
+#: src/ZYMain.cc:109
msgid "New Zhuyin input method (debug)"
msgstr "新注音輸入法 (除錯)"
-#: ../setup/main.py:262
+#: setup/main.py:281
msgid "Please choose a file"
msgstr "請選擇檔案"
-#: ../setup/main.py:288
+#: setup/main.py:307
#, python-format
msgid "<big><b>New Zhuyin %s</b></big>"
msgstr "<big><b>IBus 新注音 %s</b></big>"
-#: ../setup/config.py:29
+#: setup/config.py:29
msgid "New Zhuyin"
msgstr "新注音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:1
+#: setup/ibus-libzhuyin-preferences.ui:23
msgid "Standard"
msgstr "標準"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:2
+#: setup/ibus-libzhuyin-preferences.ui:28
msgid "HSU"
msgstr "許氏"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:3
+#: setup/ibus-libzhuyin-preferences.ui:33
msgid "IBM"
msgstr "IBM"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:4
+#: setup/ibus-libzhuyin-preferences.ui:38
msgid "GinYieh"
msgstr "精業"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:5
+#: setup/ibus-libzhuyin-preferences.ui:43
msgid "Eten"
msgstr "倚天"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:6
+#: setup/ibus-libzhuyin-preferences.ui:48
msgid "Eten26"
msgstr "倚天26"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:7
+#: setup/ibus-libzhuyin-preferences.ui:53
msgid "Standard Dvorak"
msgstr "標準 Dvorak"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:8
+#: setup/ibus-libzhuyin-preferences.ui:58
msgid "HSU Dvorak"
msgstr "許氏 Dvorak"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:9
+#: setup/ibus-libzhuyin-preferences.ui:63
msgid "DaChen CP26"
msgstr "大千26鍵"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:10
+#: setup/ibus-libzhuyin-preferences.ui:68
msgid "Hanyu Pinyin"
msgstr "漢語拼音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:11
+#: setup/ibus-libzhuyin-preferences.ui:73
msgid "Luoma Pinyin"
msgstr "羅馬拼音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:12
+#: setup/ibus-libzhuyin-preferences.ui:78
msgid "Secondary Bopomofo"
msgstr "注音二式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:13
+#: setup/ibus-libzhuyin-preferences.ui:134
msgid "Use Chinese Mode When Start-up"
msgstr "啓動後使用中文模式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:14
+#: setup/ibus-libzhuyin-preferences.ui:152
msgid "Use Full Width When Start-up"
msgstr "啓動後使用全形模式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:15
+#: setup/ibus-libzhuyin-preferences.ui:170
msgid "Use Traditional Chinese When Start-up"
msgstr "啓動後使用繁體中文模式"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:16
+#: setup/ibus-libzhuyin-preferences.ui:188
msgid "Always Input Numbers by Input Pad"
msgstr "小鍵盤始終輸入數字"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:17
+#: setup/ibus-libzhuyin-preferences.ui:206
msgid "Use Space Key to Show Candidates"
msgstr "用空白鍵叫出候選字詞"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:18
+#: setup/ibus-libzhuyin-preferences.ui:224
msgid "Show Candidates After the Cursor"
msgstr "游標後方挑選候選字詞"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:19
+#: setup/ibus-libzhuyin-preferences.ui:246
msgid "Inputting"
msgstr "輸入"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:20
+#: setup/ibus-libzhuyin-preferences.ui:271
msgid "Keyboard Layout"
msgstr "鍵盤配置"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:21
+#: setup/ibus-libzhuyin-preferences.ui:285
msgid "Candidate Choose Keys"
msgstr "候選字詞選擇鍵"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:22
+#: setup/ibus-libzhuyin-preferences.ui:319
msgid "Candidates per Page"
msgstr "候選字詞每頁顯示個數"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:23
+#: setup/ibus-libzhuyin-preferences.ui:369
+msgid "Require tone information"
+msgstr ""
+
+#: setup/ibus-libzhuyin-preferences.ui:397
msgid "Keyboard"
msgstr "鍵盤"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:24
+#: setup/ibus-libzhuyin-preferences.ui:412
msgid "Enable Fuzzy Zhuyin"
msgstr "啓動模糊音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:25
+#: setup/ibus-libzhuyin-preferences.ui:430
msgid "l <=> n"
msgstr "ㄌ <=> ㄋ"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:26
+#: setup/ibus-libzhuyin-preferences.ui:447
msgid "f <=> h"
msgstr "ㄈ <=> ㄏ"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:27
+#: setup/ibus-libzhuyin-preferences.ui:464
msgid "l <=> r"
msgstr "ㄌ <=> ㄖ"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:28
+#: setup/ibus-libzhuyin-preferences.ui:481
msgid "g <=> k"
msgstr "ㄍ <=> ㄎ"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:29
+#: setup/ibus-libzhuyin-preferences.ui:498
msgid "c <=> ch"
msgstr "ㄘ <=> ㄔ"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:30
+#: setup/ibus-libzhuyin-preferences.ui:515
msgid "z <=> zh"
msgstr "ㄗ <=> ㄓ"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:31
+#: setup/ibus-libzhuyin-preferences.ui:532
msgid "s <=> sh"
msgstr "ㄙ <=> ㄕ"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:32
+#: setup/ibus-libzhuyin-preferences.ui:549
msgid "an <=> ang"
msgstr "ㄢ <=> ㄤ"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:33
+#: setup/ibus-libzhuyin-preferences.ui:566
msgid "in <=> ing"
msgstr "ㄣ <=> ㄥ"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:34
+#: setup/ibus-libzhuyin-preferences.ui:583
msgid "en <=> eng"
msgstr "ㄧㄣ <=> ㄧㄥ"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:35
+#: setup/ibus-libzhuyin-preferences.ui:616
msgid "Fuzzy Zhuyin"
msgstr "模糊注音"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:36
+#: setup/ibus-libzhuyin-preferences.ui:638
msgid "User Symbols"
msgstr "用戶自定義符號"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:37
+#: setup/ibus-libzhuyin-preferences.ui:654
+#: setup/ibus-libzhuyin-preferences.ui:697
msgid "Edit"
msgstr "編輯"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:38
+#: setup/ibus-libzhuyin-preferences.ui:681
msgid "Easy Symbols"
msgstr "自定義快捷符號"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:39
+#: setup/ibus-libzhuyin-preferences.ui:727
+#: setup/ibus-libzhuyin-preferences.ui:844
msgid "User Phrases"
msgstr "使用自定義詞組"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:40
+#: setup/ibus-libzhuyin-preferences.ui:737
msgid "Clear"
msgstr "清除"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:41
+#: setup/ibus-libzhuyin-preferences.ui:752
msgid "Import"
msgstr "匯入"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:42
+#: setup/ibus-libzhuyin-preferences.ui:780
msgid "Clear All Data"
msgstr "清除所有資料"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:43
+#: setup/ibus-libzhuyin-preferences.ui:811
msgid ""
"<b>Dictionary File Format:</b>\n"
" Each line contains the following:\n"
@@ -282,24 +289,23 @@ msgstr ""
" 「短語 注音」\n"
" 例如「你好 ㄋㄧˇ ㄏㄠˇ」"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:47
+#: setup/ibus-libzhuyin-preferences.ui:822
msgid "Help"
msgstr "幫助"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:49
-#, no-c-format
+#: setup/ibus-libzhuyin-preferences.ui:883
msgid "<big><b>IBus Zhuyin %s</b></big>"
msgstr "<big><b>IBus 注音 %s</b></big>"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:50
+#: setup/ibus-libzhuyin-preferences.ui:896
msgid "New Zhuyin input method for IBus"
msgstr "IBus 新注音輸入法"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:51
+#: setup/ibus-libzhuyin-preferences.ui:908
msgid "<small>Copyright (c) 2013-2014 Peng Wu</small>"
msgstr "<small>著作權所有 (c) 2013-2014 吳鵬</small>"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:52
+#: setup/ibus-libzhuyin-preferences.ui:936
msgid ""
"<small>\n"
"<b>Authors:</b>\n"
@@ -321,10 +327,18 @@ msgstr ""
"...\n"
"</small>"
-#: ../setup/ibus-libzhuyin-preferences.ui.h:61
+#: setup/ibus-libzhuyin-preferences.ui:965
msgid "About"
msgstr "關於"
+#: data/ibus-setup-libzhuyin.desktop.in:3
+msgid "IBus LibZhuyin Setup"
+msgstr ""
+
+#: data/ibus-setup-libzhuyin.desktop.in:4
+msgid "Set ibus-libzhuyin Preferences"
+msgstr ""
+
#~ msgid "Full Width Letter"
#~ msgstr "全形字母"
diff --git a/setup/main.py b/setup/main.py
index b3ebaba..211de10 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -57,8 +57,13 @@ try:
except AttributeError:
pass
-gettext.bindtextdomain(DOMAINNAME, localedir)
-gettext.bind_textdomain_codeset(DOMAINNAME, 'UTF-8')
+# Python's gettext module doesn't provide all methods in
+# new Python version
+try:
+ gettext.bindtextdomain(DOMAINNAME, localedir)
+ gettext.bind_textdomain_codeset(DOMAINNAME, 'UTF-8')
+except AttributeError:
+ pass
gettext.install(DOMAINNAME, localedir)
diff --git a/src/ZYEditor.cc b/src/ZYEditor.cc
index 08bb2ac..23a609b 100644
--- a/src/ZYEditor.cc
+++ b/src/ZYEditor.cc
@@ -37,6 +37,9 @@ Editor::~Editor (void)
gboolean
Editor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
modifiers &= (IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
IBUS_SUPER_MASK |
diff --git a/src/ZYEnhancedText.cc b/src/ZYEnhancedText.cc
index c9cb6fb..8cb7f95 100644
--- a/src/ZYEnhancedText.cc
+++ b/src/ZYEnhancedText.cc
@@ -337,8 +337,8 @@ erase_input_sequence(String & enhanced_text, size_t offset, size_t length)
case SYMBOL_SECTION:
{
String type, lookup, choice;
- assert (get_symbol_section (enhanced_text, pos, end_pos,
- type, lookup, choice));
+ get_symbol_section (enhanced_text, pos, end_pos,
+ type, lookup, choice);
}
break;
}
diff --git a/src/ZYFallbackEditor.cc b/src/ZYFallbackEditor.cc
index 026e9cd..576e5dd 100644
--- a/src/ZYFallbackEditor.cc
+++ b/src/ZYFallbackEditor.cc
@@ -63,6 +63,9 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
gboolean retval = FALSE;
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
modifiers &= (IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
IBUS_SUPER_MASK |
diff --git a/src/ZYLibZhuyin.cc b/src/ZYLibZhuyin.cc
index 9fa46cb..11149b9 100644
--- a/src/ZYLibZhuyin.cc
+++ b/src/ZYLibZhuyin.cc
@@ -197,6 +197,9 @@ LibZhuyinBackEnd::importZhuyinDictionary (const char * filename)
gboolean
LibZhuyinBackEnd::clearZhuyinUserData (const char * target)
{
+ if (NULL == m_zhuyin_context)
+ return FALSE;
+
if (0 == strcmp ("all", target))
zhuyin_mask_out (m_zhuyin_context, 0x0, 0x0);
else if (0 == strcmp ("user", target))
diff --git a/src/ZYUtil.h b/src/ZYUtil.h
index 8c91811..6db65bd 100644
--- a/src/ZYUtil.h
+++ b/src/ZYUtil.h
@@ -28,6 +28,7 @@
#include <cstdlib>
#include <string>
+#include <assert.h>
#ifdef __GXX_EXPERIMENTAL_CXX0X__
# include <memory>
@@ -46,6 +47,12 @@ namespace std {
#endif
+#if defined(NDEBUG) || defined(G_DISABLE_ASSERT)
+#define check_result(expr) expr
+#else
+#define check_result(expr) assert(expr)
+#endif
+
#include <ibus.h>
namespace ZY {
diff --git a/src/ZYZBopomofoSymbolSection.cc b/src/ZYZBopomofoSymbolSection.cc
index 1628973..f714dfc 100644
--- a/src/ZYZBopomofoSymbolSection.cc
+++ b/src/ZYZBopomofoSymbolSection.cc
@@ -49,7 +49,7 @@ BopomofoSymbolSection::initCandidates (zhuyin_instance_t * instance,
/* cache the choices. */
gchar ** symbols = NULL;
- assert (zhuyin_in_chewing_keyboard (instance, key, &symbols));
+ check_result (zhuyin_in_chewing_keyboard (instance, key, &symbols));
size_t num = g_strv_length (symbols);
assert (num > 0);
for (size_t i = 0; i < num; ++i) {
diff --git a/src/ZYZEnhancedEditor.cc b/src/ZYZEnhancedEditor.cc
index 524c6a0..e6809d7 100644
--- a/src/ZYZEnhancedEditor.cc
+++ b/src/ZYZEnhancedEditor.cc
@@ -50,7 +50,7 @@ EnhancedEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
#if 0
if (isPhonetic (keyval)) {
/* zhuyin or pinyin key */
- assert (insert_phonetic (m_text, m_cursor++, keyval));
+ check_result (insert_phonetic (m_text, m_cursor++, keyval));
update ();
return TRUE;
} else {
diff --git a/src/ZYZPhoneticEditor.cc b/src/ZYZPhoneticEditor.cc
index 4a15f36..93bb4c2 100644
--- a/src/ZYZPhoneticEditor.cc
+++ b/src/ZYZPhoneticEditor.cc
@@ -155,7 +155,7 @@ PhoneticEditor::processSpace (guint keyval, guint keycode,
assert (is_special_symbol (' '));
if (m_props.modeFullWidth ()) {
String symbol;
- convert_special_symbol (keyval, symbol);
+ check_result (convert_special_symbol (keyval, symbol));
commit (symbol);
} else {
String symbol = ' ';
@@ -961,7 +961,7 @@ PhoneticEditor::insertSymbol (guint keyval, guint keycode, guint modifiers)
(keyval == IBUS_bracketleft ||
keyval == IBUS_bracketright ||
keyval == IBUS_apostrophe))
- assert (convert_special_symbol (keyval, choice));
+ check_result (convert_special_symbol (keyval, choice));
String lookup;
int ch = find_lookup_key (choice);
@@ -976,7 +976,7 @@ PhoneticEditor::insertSymbol (guint keyval, guint keycode, guint modifiers)
if (m_props.modeFullWidth () ||
(modifiers & IBUS_SHIFT_MASK)) {
String choice;
- assert (convert_full_width_symbol (keyval, choice));
+ check_result (convert_full_width_symbol (keyval, choice));
String lookup;
int ch = find_lookup_key (choice);
diff --git a/src/ZYZPinyinEditor.cc b/src/ZYZPinyinEditor.cc
index 3574391..173cc81 100644
--- a/src/ZYZPinyinEditor.cc
+++ b/src/ZYZPinyinEditor.cc
@@ -244,6 +244,9 @@ PinyinEditor::processSpace (guint keyval, guint keycode, guint modifiers)
gboolean
PinyinEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
modifiers &= (IBUS_SHIFT_MASK |
IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
diff --git a/src/ZYZZhuyinEditor.cc b/src/ZYZZhuyinEditor.cc
index ea75809..062c3e2 100644
--- a/src/ZYZZhuyinEditor.cc
+++ b/src/ZYZZhuyinEditor.cc
@@ -154,7 +154,7 @@ ZhuyinEditor::updatePreeditText (void)
char sym = section[i];
gchar ** symbols = NULL;
/* append bopomofo symbol except for DaChen26. */
- assert (zhuyin_in_chewing_keyboard (m_instance, sym, &symbols));
+ check_result (zhuyin_in_chewing_keyboard (m_instance, sym, &symbols));
assert (NULL != symbols[0]);
m_preedit_text += symbols[0];
g_strfreev (symbols);
@@ -286,6 +286,9 @@ ZhuyinEditor::processSpace (guint keyval, guint keycode, guint modifiers)
gboolean
ZhuyinEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
modifiers &= (IBUS_SHIFT_MASK |
IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
diff --git a/src/ZYZZhuyinEngine.cc b/src/ZYZZhuyinEngine.cc
index afd26d4..e61a9ff 100644
--- a/src/ZYZZhuyinEngine.cc
+++ b/src/ZYZZhuyinEngine.cc
@@ -115,7 +115,7 @@ ZhuyinEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers)
/* after mode switch, reset all states. */
reset ();
- return TRUE;
+ return FALSE;
}
if (m_input_mode == MODE_INIT &&
@@ -124,7 +124,7 @@ ZhuyinEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers)
* we will let client applications to handle release key event */
return FALSE;
} else {
- return TRUE;
+ return FALSE;
}
}