Hello community, here is the log from the commit of package fcitx-skk for openSUSE:Factory checked in at 2015-06-01 09:54:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-skk (Old) and /work/SRC/openSUSE:Factory/.fcitx-skk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-skk" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-skk/fcitx-skk.changes 2014-06-10 14:39:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-skk.new/fcitx-skk.changes 2015-06-01 09:54:46.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 30 16:33:21 UTC 2015 - [email protected] + +- update version 0.1.2 + * candidate selection key config + +------------------------------------------------------------------- Old: ---- fcitx-skk-0.1.1.tar.xz New: ---- fcitx-skk-0.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-skk.spec ++++++ --- /var/tmp/diff_new_pack.1X2lkV/_old 2015-06-01 09:54:47.000000000 +0200 +++ /var/tmp/diff_new_pack.1X2lkV/_new 2015-06-01 09:54:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx-skk # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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: fcitx-skk -Version: 0.1.1 +Version: 0.1.2 Release: 0 Summary: Japanese SKK IME Wrapper for Fcitx License: GPL-3.0+ ++++++ fcitx-skk-0.1.1.tar.xz -> fcitx-skk-0.1.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/README.md new/fcitx-skk-0.1.2/README.md --- old/fcitx-skk-0.1.1/README.md 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/README.md 2014-12-13 08:39:45.000000000 +0100 @@ -2,15 +2,37 @@ fcitx-skk is an input method engine for Fcitx, which uses libskk as its backend. -Requirements: +## Requirements: + - libskk - Qt4 (optional), for rule and dictionary configuration UI. - fcitx 4.2.8 - skk-jisyo -Build dependency: +### For Ubuntu User + +Please install this packages before build this Program. + + - libskk-dev + - libqt4-dev + - fcitx-libs-dev + - skkdic + + $ sudo aptitude install libskk-dev libqt4-dev fcitx-libs-dev skkdic + + +## Build dependency: + - cmake + - C++ Compiler(g++) You can specify the skk dictionary path by -DSKK_DEFAULT_PATH=path_you_want By default it's /usr/share/skk/SKK-JISYO.L + +## Installation + + git clone https://github.com/fcitx/fcitx-skk.git + cd fcitx-skk + cmake . + sudo make install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/de.po new/fcitx-skk-0.1.2/po/de.po --- old/fcitx-skk-0.1.1/po/de.po 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/de.po 2014-12-13 08:39:45.000000000 +0100 @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# mar well <[email protected]>, 2013 +# mar well <[email protected]>, 2013 +# mar well <[email protected]>, 2014 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-10-31 06:03-0400\n" -"PO-Revision-Date: 2013-10-31 05:48+0000\n" -"Last-Translator: mar well <[email protected]>\n" +"POT-Creation-Date: 2014-12-09 12:02+0100\n" +"PO-Revision-Date: 2014-12-09 09:44+0000\n" +"Last-Translator: mar well <[email protected]>\n" "Language-Team: German (http://www.transifex.com/projects/p/fcitx/language/"; "de/)\n" "Language: de\n" @@ -39,6 +40,10 @@ msgid "&Type:" msgstr "&Typ:" +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "ABC (a,b,c,...)" + #: src/fcitx-skk.desc:36 msgid "Candidate List Layout" msgstr "Layout der Kandidatenliste" @@ -51,13 +56,17 @@ msgid "Dictionary and Rule" msgstr "Wörterbücher und Regeln" +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "Ziffer (0,1,2,...)" + #: src/fcitx-skk.desc:19 msgid "Direct input" msgstr "Direkte Eingabe" #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" msgstr "Allgemein" @@ -93,6 +102,10 @@ msgid "Katakana" msgstr "Katakana" +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "Auswahltaste für die Kandidaten" + #: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" msgstr "Latin" @@ -109,6 +122,10 @@ msgid "Punctuation Style" msgstr "Stil der Interpunktion" +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" +msgstr "Mittlere Reihe der QWERTY Tastatur (a,s,d,...)" + #: src/fcitx-skk.desc:31 msgid "Return-key does not insert new line on commit" msgstr "Return-Taste erzeugt keinen Zeilenwechsel" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/fcitx-skk.pot new/fcitx-skk-0.1.2/po/fcitx-skk.pot --- old/fcitx-skk-0.1.1/po/fcitx-skk.pot 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/fcitx-skk.pot 2014-12-13 08:39:45.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-10-21 12:00-0400\n" +"POT-Creation-Date: 2014-12-08 12:40+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -57,31 +57,31 @@ msgid "Dictionary Manager" msgstr "" -#: src/skk.c:93 src/fcitx-skk.desc:16 +#: src/skk.c:95 src/fcitx-skk.desc:16 msgid "Hiragana" msgstr "" -#: src/skk.c:94 src/fcitx-skk.desc:17 +#: src/skk.c:96 src/fcitx-skk.desc:17 msgid "Katakana" msgstr "" -#: src/skk.c:95 src/fcitx-skk.desc:18 +#: src/skk.c:97 src/fcitx-skk.desc:18 msgid "Half width Katakana" msgstr "" -#: src/skk.c:96 src/fcitx-skk.desc:7 +#: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" msgstr "" -#: src/skk.c:97 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 +#: src/skk.c:99 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 msgid "Wide latin" msgstr "" -#: src/skk.c:438 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 +#: src/skk.c:440 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 msgid "Skk" msgstr "" -#: src/skk.c:464 +#: src/skk.c:466 msgid "Input Mode" msgstr "" @@ -95,7 +95,7 @@ #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" msgstr "" @@ -150,3 +150,19 @@ #: src/fcitx-skk.desc:52 msgid "Show Annotation" msgstr "" + +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "" + +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "" + +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "" + +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/ja.po new/fcitx-skk-0.1.2/po/ja.po --- old/fcitx-skk-0.1.1/po/ja.po 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/ja.po 2014-12-13 08:39:45.000000000 +0100 @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# AWASHIRO Ikuya <[email protected]>, 2014 # emasaka <[email protected]>, 2014 -# shirou - しろう, 2013 +# WAKAYAMA Shirou <[email protected]>, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2014-02-04 12:24+0000\n" -"PO-Revision-Date: 2014-02-04 11:28+0000\n" -"Last-Translator: emasaka <[email protected]>\n" +"POT-Creation-Date: 2014-12-08 12:02+0100\n" +"PO-Revision-Date: 2014-12-08 09:49+0000\n" +"Last-Translator: AWASHIRO Ikuya <[email protected]>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/"; "ja/)\n" "Language: ja\n" @@ -22,7 +23,7 @@ #: gui/adddictdialog.cpp:37 msgid "&Host:" -msgstr "ホスト:" +msgstr "ホスト(&H):" #: gui/adddictdialog.cpp:36 msgid "&Path:" @@ -30,15 +31,19 @@ #: gui/adddictdialog.cpp:38 msgid "&Port:" -msgstr "ポート:" +msgstr "ポート(&P):" #: gui/dictwidget.cpp:34 msgid "&Rule:" -msgstr "タイピング方式" +msgstr "タイピング方式(&R):" #: gui/adddictdialog.cpp:35 msgid "&Type:" -msgstr "形式:" +msgstr "形式(&T):" + +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "ABC (a,b,c,...)" #: src/fcitx-skk.desc:36 msgid "Candidate List Layout" @@ -52,13 +57,17 @@ msgid "Dictionary and Rule" msgstr "辞書とタイピング方式" +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "数字キー (0,1,2,...)" + #: src/fcitx-skk.desc:19 msgid "Direct input" msgstr "直接入力" #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" msgstr "全般" @@ -94,6 +103,10 @@ msgid "Katakana" msgstr "カタカナ" +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "候補ウィンドウからの選択キー" + #: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" msgstr "英数" @@ -110,6 +123,10 @@ msgid "Punctuation Style" msgstr "句読点スタイル" +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" +msgstr "Qwertyキーボード中央行 (a,s,d,...)" + #: src/fcitx-skk.desc:31 msgid "Return-key does not insert new line on commit" msgstr "確定時にリターンキーを押しても改行を挿入しない" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/vi.po new/fcitx-skk-0.1.2/po/vi.po --- old/fcitx-skk-0.1.1/po/vi.po 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/vi.po 2014-12-13 08:39:45.000000000 +0100 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# bizover, 2013 +# Thu Hoai <[email protected]>, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-10-21 12:00-0400\n" -"PO-Revision-Date: 2013-10-18 10:06+0000\n" -"Last-Translator: Xuetian Weng <[email protected]>\n" +"POT-Creation-Date: 2014-12-08 06:02+0100\n" +"PO-Revision-Date: 2013-10-21 16:06+0000\n" +"Last-Translator: csslayer <[email protected]>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/fcitx/"; "language/vi/)\n" "Language: vi\n" @@ -39,6 +39,10 @@ msgid "&Type:" msgstr "" +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "" + #: src/fcitx-skk.desc:36 msgid "Candidate List Layout" msgstr "" @@ -51,13 +55,17 @@ msgid "Dictionary and Rule" msgstr "" +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "" + #: src/fcitx-skk.desc:19 msgid "Direct input" msgstr "" #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" msgstr "" @@ -65,11 +73,11 @@ msgid "Global" msgstr "" -#: src/skk.c:95 src/fcitx-skk.desc:18 +#: src/skk.c:97 src/fcitx-skk.desc:18 msgid "Half width Katakana" msgstr "" -#: src/skk.c:93 src/fcitx-skk.desc:16 +#: src/skk.c:95 src/fcitx-skk.desc:16 msgid "Hiragana" msgstr "" @@ -81,7 +89,7 @@ msgid "Initial Input Mode" msgstr "" -#: src/skk.c:464 +#: src/skk.c:466 msgid "Input Mode" msgstr "" @@ -89,11 +97,15 @@ msgid "Japanese" msgstr "" -#: src/skk.c:94 src/fcitx-skk.desc:17 +#: src/skk.c:96 src/fcitx-skk.desc:17 msgid "Katakana" msgstr "" -#: src/skk.c:96 src/fcitx-skk.desc:7 +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "" + +#: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" msgstr "" @@ -109,6 +121,10 @@ msgid "Punctuation Style" msgstr "" +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" +msgstr "" + #: src/fcitx-skk.desc:31 msgid "Return-key does not insert new line on commit" msgstr "" @@ -125,7 +141,7 @@ msgid "Show Annotation" msgstr "" -#: src/skk.c:438 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 +#: src/skk.c:440 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 msgid "Skk" msgstr "Skk" @@ -145,7 +161,7 @@ msgid "Vertical" msgstr "" -#: src/skk.c:97 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 +#: src/skk.c:99 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 msgid "Wide latin" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/zh_CN.po new/fcitx-skk-0.1.2/po/zh_CN.po --- old/fcitx-skk-0.1.1/po/zh_CN.po 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/zh_CN.po 2014-12-13 08:39:45.000000000 +0100 @@ -4,14 +4,14 @@ # # Translators: # Christopher Meng <[email protected]>, 2013 -# Xuetian Weng <[email protected]>, 2013 +# csslayer <[email protected]>, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-10-27 12:02-0400\n" +"POT-Creation-Date: 2014-12-08 06:02+0100\n" "PO-Revision-Date: 2013-10-27 15:06+0000\n" -"Last-Translator: Xuetian Weng <[email protected]>\n" +"Last-Translator: csslayer <[email protected]>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/fcitx/"; "language/zh_CN/)\n" "Language: zh_CN\n" @@ -40,6 +40,10 @@ msgid "&Type:" msgstr "类型(&T)：" +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "" + #: src/fcitx-skk.desc:36 msgid "Candidate List Layout" msgstr "候选词列表" @@ -52,13 +56,17 @@ msgid "Dictionary and Rule" msgstr "词典和规则" +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "" + #: src/fcitx-skk.desc:19 msgid "Direct input" msgstr "直接输入" #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" msgstr "常规" @@ -94,6 +102,10 @@ msgid "Katakana" msgstr "片假名" +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "" + #: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" msgstr "英文" @@ -110,6 +122,10 @@ msgid "Punctuation Style" msgstr "标点风格" +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" +msgstr "" + #: src/fcitx-skk.desc:31 msgid "Return-key does not insert new line on commit" msgstr "回车提交时不插入新行" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/zh_TW.po new/fcitx-skk-0.1.2/po/zh_TW.po --- old/fcitx-skk-0.1.1/po/zh_TW.po 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/zh_TW.po 2014-12-13 08:39:45.000000000 +0100 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# BrLi <[email protected]>, 2014 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-10-21 12:00-0400\n" -"PO-Revision-Date: 2013-10-21 16:06+0000\n" -"Last-Translator: Xuetian Weng <[email protected]>\n" +"POT-Creation-Date: 2014-12-08 12:40+0900\n" +"PO-Revision-Date: 2014-12-08 05:03+0000\n" +"Last-Translator: csslayer <[email protected]>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/fcitx/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,71 +20,71 @@ #: gui/adddictdialog.cpp:35 msgid "&Type:" -msgstr "" +msgstr "類型(&T)：" #: gui/adddictdialog.cpp:36 msgid "&Path:" -msgstr "" +msgstr "路徑(&P)：" #: gui/adddictdialog.cpp:37 msgid "&Host:" -msgstr "" +msgstr "主機(&H)：" #: gui/adddictdialog.cpp:38 msgid "&Port:" -msgstr "" +msgstr "埠口(&P)：" #: gui/adddictdialog.cpp:39 msgid "System" -msgstr "" +msgstr "系統" #: gui/adddictdialog.cpp:40 msgid "User" -msgstr "" +msgstr "使用者" #: gui/adddictdialog.cpp:41 msgid "Server" -msgstr "" +msgstr "伺服器" #: gui/adddictdialog.cpp:101 gui/adddictdialog.cpp:113 msgid "Select Dictionary File" -msgstr "" +msgstr "選擇字典檔案" #: gui/dictwidget.cpp:34 msgid "&Rule:" -msgstr "" +msgstr "按鍵方案(&R)：" #: gui/dictwidget.cpp:61 msgid "Dictionary Manager" -msgstr "" +msgstr "字典管理員" -#: src/skk.c:93 src/fcitx-skk.desc:16 +#: src/skk.c:95 src/fcitx-skk.desc:16 msgid "Hiragana" -msgstr "" +msgstr "平假名" -#: src/skk.c:94 src/fcitx-skk.desc:17 +#: src/skk.c:96 src/fcitx-skk.desc:17 msgid "Katakana" -msgstr "" +msgstr "片假名" -#: src/skk.c:95 src/fcitx-skk.desc:18 +#: src/skk.c:97 src/fcitx-skk.desc:18 msgid "Half width Katakana" -msgstr "" +msgstr "半形片假名" -#: src/skk.c:96 src/fcitx-skk.desc:7 +#: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" -msgstr "" +msgstr "英文" -#: src/skk.c:97 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 +#: src/skk.c:99 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 msgid "Wide latin" -msgstr "" +msgstr "全形英文" -#: src/skk.c:438 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 +#: src/skk.c:440 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 msgid "Skk" msgstr "Skk" -#: src/skk.c:464 +#: src/skk.c:466 msgid "Input Mode" -msgstr "" +msgstr "輸入模式" #: src/fcitx-skk.conf.in:4 msgid "Skk Input Method For Fcitx" @@ -91,62 +92,78 @@ #: src/fcitx-skk.conf.in:9 msgid "Dictionary and Rule" -msgstr "" +msgstr "字典與規則" #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" -msgstr "" +msgstr "一般" #: src/fcitx-skk.desc:3 msgid "Punctuation Style" -msgstr "" +msgstr "標點風格" #: src/fcitx-skk.desc:6 msgid "Japanese" -msgstr "" +msgstr "日語" #: src/fcitx-skk.desc:9 msgid "Wide latin Japanese" -msgstr "" +msgstr "全形拉丁日語" #: src/fcitx-skk.desc:13 msgid "Initial Input Mode" -msgstr "" +msgstr "初始輸入模式" #: src/fcitx-skk.desc:19 msgid "Direct input" -msgstr "" +msgstr "直接輸入" #: src/fcitx-skk.desc:24 msgid "Page size" -msgstr "" +msgstr "頁面大小" #: src/fcitx-skk.desc:31 msgid "Return-key does not insert new line on commit" -msgstr "" +msgstr "確認送出時 Enter 鍵不輸入新行" #: src/fcitx-skk.desc:36 msgid "Candidate List Layout" -msgstr "" +msgstr "候選詞清單" #: src/fcitx-skk.desc:38 msgid "Global" -msgstr "" +msgstr "全域" #: src/fcitx-skk.desc:39 msgid "Vertical" -msgstr "" +msgstr "縱向" #: src/fcitx-skk.desc:40 msgid "Horizontal" -msgstr "" +msgstr "橫向" #: src/fcitx-skk.desc:45 msgid "Number candidate of Triggers To Show Candidate Window" -msgstr "" +msgstr "觸發顯示候選字視窗的按鍵次數" #: src/fcitx-skk.desc:52 msgid "Show Annotation" +msgstr "顯示注釋" + +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "" + +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "" + +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "" + +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/src/fcitx-skk.desc new/fcitx-skk-0.1.2/src/fcitx-skk.desc --- old/fcitx-skk-0.1.1/src/fcitx-skk.desc 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/src/fcitx-skk.desc 2014-12-13 08:39:45.000000000 +0100 @@ -52,5 +52,15 @@ Description=Show Annotation DefaultValue=True +[General/CandidateChooseKey] +Type=Enum +Description=Keys to Select from Candidate Window +EnumCount=3 +Enum0=Digit (0,1,2,...) +Enum1=ABC (a,b,c,...) +Enum2=Qwerty Center Row (a,s,d,...) +DefaultValue=Digit (0,1,2,...) + + [DescriptionFile] LocaleDomain=fcitx-skk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/src/skk-config.c new/fcitx-skk-0.1.2/src/skk-config.c --- old/fcitx-skk-0.1.1/src/skk-config.c 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/src/skk-config.c 2014-12-13 08:39:45.000000000 +0100 @@ -27,4 +27,5 @@ CONFIG_BINDING_REGISTER("General", "NTriggersToShowCandWin", nTriggersToShowCandWin) CONFIG_BINDING_REGISTER("General", "ShowAnnotation", showAnnotation) CONFIG_BINDING_REGISTER("General", "EggLikeNewLine", eggLikeNewLine) +CONFIG_BINDING_REGISTER("General", "CandidateChooseKey", candidateChooseKey) /* candidate selection keys */ CONFIG_BINDING_END() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/src/skk.c new/fcitx-skk-0.1.2/src/skk.c --- old/fcitx-skk-0.1.1/src/skk.c 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/src/skk.c 2014-12-13 08:39:45.000000000 +0100 @@ -630,7 +630,20 @@ FcitxInputState* input = FcitxInstanceGetInputState(skk->owner); FcitxCandidateWordList* candList = FcitxInputStateGetCandidateList(input); SkkCandidateList* skkCandList = skk_context_get_candidates(skk->context); - FcitxCandidateWordSetChoose(candList, DIGIT_STR_CHOOSE); + switch (skk->config.candidateChooseKey){ + case ChooseABCD: + FcitxCandidateWordSetChoose(candList, ABCD_STR_CHOOSE); + break; + case ChooseASDF: + FcitxCandidateWordSetChoose(candList, ASDF_STR_CHOOSE); + break; + case ChooseDigit: +// FALL THRU + default: + FcitxCandidateWordSetChoose(candList, DIGIT_STR_CHOOSE); + break; + } + FcitxCandidateWordSetPageSize(candList, skk->config.pageSize); FcitxCandidateWordSetLayoutHint(candList, skk->config.candidateLayout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/src/skk.h new/fcitx-skk-0.1.2/src/skk.h --- old/fcitx-skk-0.1.1/src/skk.h 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/src/skk.h 2014-12-13 08:39:45.000000000 +0100 @@ -33,6 +33,15 @@ #define _(x) dgettext("fcitx-skk", x) #define N_(x) (x) +#define ABCD_STR_CHOOSE "abcdefghij" +#define ASDF_STR_CHOOSE "asdfghjkl;" + +typedef enum _FcitxSkkChooseKeyType { + ChooseDigit, + ChooseABCD, + ChooseASDF +} FcitxSkkChooseKeyType; + typedef struct _FcitxSkkConfig { FcitxGenericConfig gconfig; SkkPeriodStyle punctuationStyle; @@ -42,6 +51,7 @@ int pageSize; boolean showAnnotation; boolean eggLikeNewLine; + FcitxSkkChooseKeyType candidateChooseKey; } FcitxSkkConfig; typedef struct {
