po/ca.po | 9 5 + 4 - 0 !
1 file changed, 5 insertions(+), 4 deletions(-)

 [trans] update translation

gui/shortcutwidget.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [kkc] fix the check for the keymap conflict was inverted

thanks to AWASHIRO Ikuya for the report.

gui/addshortcutdialog.cpp | 2 1 + 1 - 0 !
gui/shortcutmodel.cpp | 5 3 + 2 - 0 !
src/fcitx-kkc.desc | 5 3 + 2 - 0 !
src/kkc.c | 3 2 + 1 - 0 !
4 files changed, 9 insertions(+), 6 deletions(-)

 [kkc] add support for direct input mode (#5)

Direct Input Mode is not the same as Latin Mode in libkkc. And Direct Input is
normally used as the Japanese Kana-kanji conversion instead of Latin. For
example, anthy's "Latin" equals libkkc's "Direct Input", the Zenkaku_Hankaku
key is mapped to switch "set-input-mode-{direct,hiragana}" in libkkc.

src/kkc.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [kkc] use underscore for label.

gui/shortcutmodel.cpp | 14 6 + 8 - 0 !
1 file changed, 6 insertions(+), 8 deletions(-)

 if insertion is failed, do not change the model.

CMakeLists.txt | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix ftbfs with cmake 4