Bug#826697: fcitx-skk: diff for NMU version 0.1.2-0.1

Tue, 07 Jun 2016 19:57:47 -0700 

Package: fcitx-skk
Version: 0.1.1-1.1
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for fcitx-skk (versioned as 0.1.2-0.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
-- 
Regards,
        dai

GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E

diff -Nru fcitx-skk-0.1.1/README.md fcitx-skk-0.1.2/README.md
--- fcitx-skk-0.1.1/README.md	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/README.md	2014-12-13 16:39:45.000000000 +0900
@@ -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 -Nru fcitx-skk-0.1.1/debian/changelog fcitx-skk-0.1.2/debian/changelog
--- fcitx-skk-0.1.1/debian/changelog	2016-06-08 10:14:41.000000000 +0900
+++ fcitx-skk-0.1.2/debian/changelog	2016-06-08 11:39:15.000000000 +0900
@@ -1,3 +1,18 @@
+fcitx-skk (0.1.2-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release.
+  * debian/rules: enable hardening.
+  * debian/fcitx-skk.lintian-overrides
+    - new file.
+    - it is caused by /usr/include/fcitx-config/fcitx-config.h (fcitx-libs-dev)
+      see https://bugs.debian.org/826696
+  * debian/control
+    - add Vcs-Git and Vcs-Browser.
+    - bump up Standards-Version 3.9.8.
+
+ -- HIGUCHI Daisuke (VDR dai) <d...@debian.org>  Wed, 08 Jun 2016 11:39:08 +0900
+
 fcitx-skk (0.1.1-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru fcitx-skk-0.1.1/debian/control fcitx-skk-0.1.2/debian/control
--- fcitx-skk-0.1.1/debian/control	2016-06-08 10:06:08.000000000 +0900
+++ fcitx-skk-0.1.2/debian/control	2016-06-08 11:36:08.000000000 +0900
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Yusuke YATSUO <yyat...@debian.or.jp>
 Build-Depends: debhelper (>= 9), cmake, fcitx-libs-dev (>= 1:4.2.8), fcitx-bin (>= 1:4.2.6), libskk-dev, libqt4-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 Homepage: https://github.com/fcitx/fcitx-skk
-#Vcs-Git: git://git.debian.org/collab-maint/fcitx-skk.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/fcitx-skk.git;a=summary
+Vcs-Git: https://anonscm.debian.org/gitweb/?p=collab-maint/fcitx-skk.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/fcitx-skk.git
 
 Package: fcitx-skk
 Architecture: any
diff -Nru fcitx-skk-0.1.1/debian/fcitx-skk.lintian-overrides fcitx-skk-0.1.2/debian/fcitx-skk.lintian-overrides
--- fcitx-skk-0.1.1/debian/fcitx-skk.lintian-overrides	1970-01-01 09:00:00.000000000 +0900
+++ fcitx-skk-0.1.2/debian/fcitx-skk.lintian-overrides	2016-06-08 10:40:12.000000000 +0900
@@ -0,0 +1 @@
+fcitx-skk: spelling-error-in-binary usr/lib/*/fcitx/fcitx-skk.so Erorr Error
diff -Nru fcitx-skk-0.1.1/debian/rules fcitx-skk-0.1.2/debian/rules
--- fcitx-skk-0.1.1/debian/rules	2016-06-08 10:06:05.000000000 +0900
+++ fcitx-skk-0.1.2/debian/rules	2016-06-08 10:22:24.000000000 +0900
@@ -4,6 +4,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 %:
 	dh $@ 
 
diff -Nru fcitx-skk-0.1.1/po/de.po fcitx-skk-0.1.2/po/de.po
--- fcitx-skk-0.1.1/po/de.po	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/po/de.po	2014-12-13 16:39:45.000000000 +0900
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# mar well <marwell.1...@freenet.de>, 2013
+# mar well <m.wellend...@gmx.de>, 2013
+# mar well <m.wellend...@gmx.de>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\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 <marwell.1...@freenet.de>\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 <m.wellend...@gmx.de>\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 -Nru fcitx-skk-0.1.1/po/fcitx-skk.pot fcitx-skk-0.1.2/po/fcitx-skk.pot
--- fcitx-skk-0.1.1/po/fcitx-skk.pot	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/po/fcitx-skk.pot	2014-12-13 16:39:45.000000000 +0900
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\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 <l...@li.org>\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 -Nru fcitx-skk-0.1.1/po/ja.po fcitx-skk-0.1.2/po/ja.po
--- fcitx-skk-0.1.1/po/ja.po	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/po/ja.po	2014-12-13 16:39:45.000000000 +0900
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# AWASHIRO Ikuya <iku...@gmail.com>, 2014
 # emasaka <emas...@gmail.com>, 2014
-# shirou - しろう, 2013
+# WAKAYAMA Shirou <shirou....@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2014-02-04 12:24+0000\n"
-"PO-Revision-Date: 2014-02-04 11:28+0000\n"
-"Last-Translator: emasaka <emas...@gmail.com>\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 <iku...@gmail.com>\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 -Nru fcitx-skk-0.1.1/po/vi.po fcitx-skk-0.1.2/po/vi.po
--- fcitx-skk-0.1.1/po/vi.po	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/po/vi.po	2014-12-13 16:39:45.000000000 +0900
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# bizover, 2013
+# Thu Hoai <cont...@bizover.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\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 <wen...@gmail.com>\n"
+"POT-Creation-Date: 2014-12-08 06:02+0100\n"
+"PO-Revision-Date: 2013-10-21 16:06+0000\n"
+"Last-Translator: csslayer <wen...@gmail.com>\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 -Nru fcitx-skk-0.1.1/po/zh_CN.po fcitx-skk-0.1.2/po/zh_CN.po
--- fcitx-skk-0.1.1/po/zh_CN.po	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/po/zh_CN.po	2014-12-13 16:39:45.000000000 +0900
@@ -4,14 +4,14 @@
 #
 # Translators:
 # Christopher Meng <cicku...@gmail.com>, 2013
-# Xuetian Weng <wen...@gmail.com>, 2013
+# csslayer <wen...@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\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 <wen...@gmail.com>\n"
+"Last-Translator: csslayer <wen...@gmail.com>\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 -Nru fcitx-skk-0.1.1/po/zh_TW.po fcitx-skk-0.1.2/po/zh_TW.po
--- fcitx-skk-0.1.1/po/zh_TW.po	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/po/zh_TW.po	2014-12-13 16:39:45.000000000 +0900
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# BrLi <rainman59...@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\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 <wen...@gmail.com>\n"
+"POT-Creation-Date: 2014-12-08 12:40+0900\n"
+"PO-Revision-Date: 2014-12-08 05:03+0000\n"
+"Last-Translator: csslayer <wen...@gmail.com>\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 -Nru fcitx-skk-0.1.1/src/fcitx-skk.desc fcitx-skk-0.1.2/src/fcitx-skk.desc
--- fcitx-skk-0.1.1/src/fcitx-skk.desc	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/src/fcitx-skk.desc	2014-12-13 16:39:45.000000000 +0900
@@ -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 -Nru fcitx-skk-0.1.1/src/skk-config.c fcitx-skk-0.1.2/src/skk-config.c
--- fcitx-skk-0.1.1/src/skk-config.c	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/src/skk-config.c	2014-12-13 16:39:45.000000000 +0900
@@ -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 -Nru fcitx-skk-0.1.1/src/skk.c fcitx-skk-0.1.2/src/skk.c
--- fcitx-skk-0.1.1/src/skk.c	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/src/skk.c	2014-12-13 16:39:45.000000000 +0900
@@ -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 -Nru fcitx-skk-0.1.1/src/skk.h fcitx-skk-0.1.2/src/skk.h
--- fcitx-skk-0.1.1/src/skk.h	2014-02-04 22:17:26.000000000 +0900
+++ fcitx-skk-0.1.2/src/skk.h	2014-12-13 16:39:45.000000000 +0900
@@ -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 {

Attachment: signature.asc
Description: PGP signature

Reply via email to