Update po files and adjust ui

4 files changed, 629 insertions, 398 deletions

diff --git a/po/ru.po b/po/ru.po
index 1eedfb1..98cf57e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-19 13:31+0800\n"
+"POT-Creation-Date: 2010-05-25 13:26+0800\n"
 "PO-Revision-Date: 2009-10-14 09:44+0300\n"
 "Last-Translator: Alexey Kotlyarov <koterpillar@gmail.com>\n"
 "Language-Team: Russian\n"
@@ -17,263 +17,320 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../src/Main.cc:59
+#: ../src/Main.cc:79
 msgid "Pinyin input method"
 msgstr "Метод ввода пиньинь"
 
-#: ../src/Main.cc:68
+#: ../src/Main.cc:88
 #, fuzzy
 msgid "Pinyin (debug)"
 msgstr "Пиньинь"
 
-#: ../src/Main.cc:69
+#: ../src/Main.cc:89
 #, fuzzy
 msgid "Pinyin input method (debug)"
 msgstr "Метод ввода пиньинь"
 
-#: ../src/Main.cc:78
+#: ../src/Main.cc:98
 msgid "Bopomofo (debug)"
 msgstr ""
 
-#: ../src/Main.cc:79
+#: ../src/Main.cc:99
 #, fuzzy
 msgid "Bopomofo input method (debug)"
 msgstr "Метод ввода пиньинь"
 
-#: ../src/PinyinProperties.cc:19 ../setup/ibus-pinyin-preferences.ui.h:12
+#: ../src/PinyinProperties.cc:40 ../setup/ibus-pinyin-preferences.ui.h:23
 msgid "Chinese"
 msgstr "Китайский"
 
-#: ../src/PinyinProperties.cc:26
+#: ../src/PinyinProperties.cc:47
 msgid "Full/Half width"
 msgstr "Полная/половинная ширина"
 
-#: ../src/PinyinProperties.cc:33
+#: ../src/PinyinProperties.cc:54
 msgid "Full/Half width punctuation"
 msgstr "Знаки препинания полной/половинной ширины"
 
-#: ../src/PinyinProperties.cc:40
+#: ../src/PinyinProperties.cc:61
 msgid "Simplfied/Traditional Chinese"
 msgstr "Упрощенные/традиционные иероглифы"
 
-#: ../src/PinyinProperties.cc:43 ../src/PinyinProperties.cc:45
-#: ../setup/ibus-pinyin-preferences.ui.h:36
+#: ../src/PinyinProperties.cc:64 ../src/PinyinProperties.cc:66
 msgid "Pinyin preferences"
 msgstr "Настройки пиньиня"
 
-#: ../setup/main.py:253 ../setup/ibus-pinyin-preferences.ui.h:7
+#: ../setup/main.py:359 ../setup/ibus-pinyin-preferences.ui.h:9
 #, no-c-format, python-format
 msgid "<big><b>IBus Pinyin %s</b></big>"
 msgstr "<big><b>IBus Пиньинь %s</b></big>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:1
 #, fuzzy
-msgid "<b>Dictionary option</b>"
-msgstr "<b>Другие</b>"
+msgid "<b>Bopomofo mode</b>"
+msgstr "<b>Пиньинь</b>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:2
-msgid "<b>Initial state</b>"
-msgstr "<b>Начальное состояние</b>"
+#, fuzzy
+msgid "<b>Correct pinyin</b>"
+msgstr "Исправления"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:3
-msgid "<b>Others</b>"
+#, fuzzy
+msgid "<b>Dictionary option</b>"
 msgstr "<b>Другие</b>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:4
+msgid "<b>Initial state</b>"
+msgstr "<b>Начальное состояние</b>"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:5
+#, fuzzy
+msgid "<b>Input Custom</b>"
+msgstr "<b>Начальное состояние</b>"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:6
 #, fuzzy
 msgid "<b>Pinyin mode</b>"
 msgstr "<b>Пиньинь</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:5
+#: ../setup/ibus-pinyin-preferences.ui.h:7
 #, fuzzy
 msgid "<b>UI</b>"
 msgstr "<b>Другие</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:8
+#: ../setup/ibus-pinyin-preferences.ui.h:10
+msgid ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Huang\n"
+"By Void\n"
+"\n"
+"<b>Contributers:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:18
 msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
 msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:9
+#: ../setup/ibus-pinyin-preferences.ui.h:19
 msgid "ABC"
 msgstr "ABC"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:10
+#: ../setup/ibus-pinyin-preferences.ui.h:20
 msgid "About"
 msgstr "О программе"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:11
+#: ../setup/ibus-pinyin-preferences.ui.h:21
 msgid "Auto commit"
 msgstr "Автоматически подтверждать фразу"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:13
+#: ../setup/ibus-pinyin-preferences.ui.h:22
+#, fuzzy
+msgid "Bopomofo mode"
+msgstr "Метод ввода пиньинь"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:24
 msgid "Chinese:"
 msgstr "Иероглифы:"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:14
-msgid "Correct pinyin"
-msgstr "Исправления"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:15
+#: ../setup/ibus-pinyin-preferences.ui.h:25
 msgid "Dictionary"
 msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:16
+#: ../setup/ibus-pinyin-preferences.ui.h:26
 msgid "Double pinyin"
 msgstr "Двойной пиньинь"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:17
+#: ../setup/ibus-pinyin-preferences.ui.h:27
 msgid "Edit custom phrases"
 msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:18
-msgid "Enable fuzzy pinyin."
-msgstr "Включить нечеткий пиньинь."
-
-#: ../setup/ibus-pinyin-preferences.ui.h:19
-msgid "Enable incomplete pinyin (like zh g)."
-msgstr "Включить неполный пиньинь (например, zh g)."
+#: ../setup/ibus-pinyin-preferences.ui.h:28
+#, fuzzy
+msgid "Enable correct pinyin"
+msgstr "Исправления"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:20
-msgid "Enable pinyin correcting."
-msgstr "Включить исправление пиньиня."
+#: ../setup/ibus-pinyin-preferences.ui.h:29
+#, fuzzy
+msgid "Enable fuzzy syllable"
+msgstr "Включить нечеткий пиньинь."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:21
+#: ../setup/ibus-pinyin-preferences.ui.h:30
 msgid "English"
 msgstr "Английский"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:22
+#: ../setup/ibus-pinyin-preferences.ui.h:31
+msgid "Eten"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:32
 msgid "Full"
 msgstr "Полная"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:23
+#: ../setup/ibus-pinyin-preferences.ui.h:33
 msgid "Full pinyin"
 msgstr "Полный пиньинь"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:24
-msgid "Fuzzy pinyin"
-msgstr "Нечеткий пиньинь"
+#: ../setup/ibus-pinyin-preferences.ui.h:34
+msgid "Fuzzy syllable"
+msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:25
+#: ../setup/ibus-pinyin-preferences.ui.h:35
+msgid "General"
+msgstr "Общие"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:36
+msgid "GinYieh"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:37
 msgid "Half"
 msgstr "Половинная"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:26
+#: ../setup/ibus-pinyin-preferences.ui.h:38
 msgid "Half/full width:"
 msgstr "Полная/половинная ширина:"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:27
+#: ../setup/ibus-pinyin-preferences.ui.h:39
 msgid "Horizontal"
 msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:28
+#: ../setup/ibus-pinyin-preferences.ui.h:40
+msgid "IBM"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:41
+#, fuzzy
+msgid "Incomplete Bopomofo"
+msgstr "Неполный пиньинь"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:42
 msgid "Incomplete pinyin"
 msgstr "Неполный пиньинь"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:29
+#: ../setup/ibus-pinyin-preferences.ui.h:43
+msgid "Keyboard Mappming:"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:44
 msgid "Language:"
 msgstr "Язык:"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:30
+#: ../setup/ibus-pinyin-preferences.ui.h:45
 msgid "MSPY"
 msgstr "MSPY"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:31
+#: ../setup/ibus-pinyin-preferences.ui.h:46
 msgid "Number of candidates:"
 msgstr "Число кандидатов"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:32
+#: ../setup/ibus-pinyin-preferences.ui.h:47
 msgid "Orientation of candidates:"
 msgstr "Число кандидатов"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:33
+#: ../setup/ibus-pinyin-preferences.ui.h:48
 msgid "PYJJ"
 msgstr "PYJJ"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:34
+#: ../setup/ibus-pinyin-preferences.ui.h:49
 msgid "Pinyin input method for IBus"
 msgstr "Метод ввода пиньинь для IBus"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:35
+#: ../setup/ibus-pinyin-preferences.ui.h:50
 #, fuzzy
 msgid "Pinyin mode"
 msgstr "<b>Пиньинь</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:37
+#: ../setup/ibus-pinyin-preferences.ui.h:51
+#, fuzzy
+msgid "Preferences"
+msgstr "Настройки пиньиня"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:52
 msgid "Punctuations:"
 msgstr "Знаки препинания:"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:38
-msgid "Schema:"
-msgstr "Схема:"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:39
-msgid "Select double pinyin schema."
-msgstr "Выбор схемы двойного пиньиня."
-
-#: ../setup/ibus-pinyin-preferences.ui.h:40
-msgid "Setup the initial state of pinyin input method."
-msgstr "Настройка начального состояния метода ввода."
-
-#: ../setup/ibus-pinyin-preferences.ui.h:41
-msgid "Show candidates in traditional Chinese"
-msgstr "Показывать кандидаты традиционными иероглифами."
-
-#: ../setup/ibus-pinyin-preferences.ui.h:42
+#: ../setup/ibus-pinyin-preferences.ui.h:53
 msgid "Show raw input of Double Pinyin"
 msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:43
+#: ../setup/ibus-pinyin-preferences.ui.h:54
 msgid "Simplified"
 msgstr "Упрощенные"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:44
+#: ../setup/ibus-pinyin-preferences.ui.h:55
+msgid "Standard"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:56
 msgid "Traditional"
 msgstr "Традиционные"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:45
-msgid "UI"
-msgstr ""
-
-#: ../setup/ibus-pinyin-preferences.ui.h:46
+#: ../setup/ibus-pinyin-preferences.ui.h:57
 msgid "Use custom phrases"
 msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:47
-msgid "Use double pinyin."
-msgstr "Использовать двойной пиньинь (шуанпинь)."
-
-#: ../setup/ibus-pinyin-preferences.ui.h:48
-msgid "Use full pinyin."
-msgstr "Использовать полный пиньинь."
-
-#: ../setup/ibus-pinyin-preferences.ui.h:49
+#: ../setup/ibus-pinyin-preferences.ui.h:58
 msgid "Vertical"
 msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:50
+#: ../setup/ibus-pinyin-preferences.ui.h:59
 msgid "ZGPY"
 msgstr "ZGPY"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:51
+#: ../setup/ibus-pinyin-preferences.ui.h:60
 msgid "ZRM"
 msgstr "ZRM"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:52
+#: ../setup/ibus-pinyin-preferences.ui.h:61
 msgid "[,] [.] flip page"
 msgstr "Использовать клавиши [,] [.] для переключения страниц"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:53
+#: ../setup/ibus-pinyin-preferences.ui.h:62
 msgid "[-] [=] flip page"
 msgstr "Использовать клавиши [-] [=] для переключения страниц"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:54
+#: ../setup/ibus-pinyin-preferences.ui.h:63
 msgid "[Shift] select candidate"
 msgstr "Использовать [Shift] для выбора кандидатов"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:55
+#: ../setup/ibus-pinyin-preferences.ui.h:64
 msgid "http://ibus.googlecode.com"
 msgstr "http://ibus.googlecode.com"
 
+#~ msgid "<b>Others</b>"
+#~ msgstr "<b>Другие</b>"
+
+#~ msgid "Enable incomplete pinyin (like zh g)."
+#~ msgstr "Включить неполный пиньинь (например, zh g)."
+
+#~ msgid "Enable pinyin correcting."
+#~ msgstr "Включить исправление пиньиня."
+
+#~ msgid "Fuzzy pinyin"
+#~ msgstr "Нечеткий пиньинь"
+
+#~ msgid "Schema:"
+#~ msgstr "Схема:"
+
+#~ msgid "Select double pinyin schema."
+#~ msgstr "Выбор схемы двойного пиньиня."
+
+#~ msgid "Setup the initial state of pinyin input method."
+#~ msgstr "Настройка начального состояния метода ввода."
+
+#~ msgid "Show candidates in traditional Chinese"
+#~ msgstr "Показывать кандидаты традиционными иероглифами."
+
+#~ msgid "Use double pinyin."
+#~ msgstr "Использовать двойной пиньинь (шуанпинь)."
+
+#~ msgid "Use full pinyin."
+#~ msgstr "Использовать полный пиньинь."
+
 #, fuzzy
 #~ msgid ""
 #~ "<small>Copyright &#xA9; 2009\n"
@@ -311,9 +368,6 @@ msgstr "http://ibus.googlecode.com"
 #~ "Использовать клавиши \"влево\" и \"вправо\" для выбора второго и третьего "
 #~ "кандидатов"
 
-#~ msgid "General"
-#~ msgstr "Общие"
-
 #~ msgid "+-*/=%"
 #~ msgstr "+-*/=%"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5de3fec..fb20d1f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus-pinyin 1.2.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-19 13:31+0800\n"
+"POT-Creation-Date: 2010-05-25 13:26+0800\n"
 "PO-Revision-Date: 2009-09-20 16:05+8\n"
 "Last-Translator: Peng Huang <shawn.p.huang@gmail.com>\n"
 "Language-Team: Peng Huang <shawn.p.huang@gmail.com>\n"
@@ -15,256 +15,316 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/Main.cc:59
+#: ../src/Main.cc:79
 msgid "Pinyin input method"
 msgstr "拼音输入法"
 
-#: ../src/Main.cc:68
+#: ../src/Main.cc:88
 msgid "Pinyin (debug)"
 msgstr "拼音（调试）"
 
-#: ../src/Main.cc:69
+#: ../src/Main.cc:89
 msgid "Pinyin input method (debug)"
 msgstr "拼音输入法（调试）"
 
-#: ../src/Main.cc:78
+#: ../src/Main.cc:98
 msgid "Bopomofo (debug)"
 msgstr "注音（调试）"
 
-#: ../src/Main.cc:79
+#: ../src/Main.cc:99
 msgid "Bopomofo input method (debug)"
 msgstr "注音输入法（调试）"
 
-#: ../src/PinyinProperties.cc:19 ../setup/ibus-pinyin-preferences.ui.h:12
+#: ../src/PinyinProperties.cc:40 ../setup/ibus-pinyin-preferences.ui.h:23
 msgid "Chinese"
 msgstr "中文"
 
-#: ../src/PinyinProperties.cc:26
+#: ../src/PinyinProperties.cc:47
 msgid "Full/Half width"
 msgstr "全角/半角"
 
-#: ../src/PinyinProperties.cc:33
+#: ../src/PinyinProperties.cc:54
 msgid "Full/Half width punctuation"
 msgstr "半角符号"
 
-#: ../src/PinyinProperties.cc:40
+#: ../src/PinyinProperties.cc:61
 msgid "Simplfied/Traditional Chinese"
 msgstr "简体/繁体中文"
 
-#: ../src/PinyinProperties.cc:43 ../src/PinyinProperties.cc:45
-#: ../setup/ibus-pinyin-preferences.ui.h:36
+#: ../src/PinyinProperties.cc:64 ../src/PinyinProperties.cc:66
 msgid "Pinyin preferences"
 msgstr "拼音首选项"
 
-#: ../setup/main.py:253 ../setup/ibus-pinyin-preferences.ui.h:7
+#: ../setup/main.py:359 ../setup/ibus-pinyin-preferences.ui.h:9
 #, no-c-format, python-format
 msgid "<big><b>IBus Pinyin %s</b></big>"
 msgstr "<big><b>IBus 拼音 %s</b></big>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:1
+msgid "<b>Bopomofo mode</b>"
+msgstr "注音模式"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:2
+msgid "<b>Correct pinyin</b>"
+msgstr "<b>拼音纠错</b>"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:3
 msgid "<b>Dictionary option</b>"
 msgstr "<b>词典选项</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:2
+#: ../setup/ibus-pinyin-preferences.ui.h:4
 msgid "<b>Initial state</b>"
 msgstr "<b>初始状态</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:3
-msgid "<b>Others</b>"
-msgstr "<b>其他</b>"
+#: ../setup/ibus-pinyin-preferences.ui.h:5
+msgid "<b>Input Custom</b>"
+msgstr "<b>输入</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:4
+#: ../setup/ibus-pinyin-preferences.ui.h:6
 msgid "<b>Pinyin mode</b>"
 msgstr "<b>拼音模式</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:5
+#: ../setup/ibus-pinyin-preferences.ui.h:7
 msgid "<b>UI</b>"
 msgstr "<b>外观</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:8
+#: ../setup/ibus-pinyin-preferences.ui.h:10
+msgid ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Huang\n"
+"By Void\n"
+"\n"
+"<b>Contributers:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
+msgstr ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Huang\n"
+"By Void\n"
+"\n"
+"<b>Contributers:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:18
 msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
 msgstr "<small>版权所有 (c) 2009-2010 黄鹏</small>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:9
+#: ../setup/ibus-pinyin-preferences.ui.h:19
 msgid "ABC"
 msgstr "智能ABC"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:10
+#: ../setup/ibus-pinyin-preferences.ui.h:20
 msgid "About"
 msgstr "关于"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:11
+#: ../setup/ibus-pinyin-preferences.ui.h:21
 msgid "Auto commit"
 msgstr "自动上词"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:13
+#: ../setup/ibus-pinyin-preferences.ui.h:22
+msgid "Bopomofo mode"
+msgstr "注音模式"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:24
 msgid "Chinese:"
 msgstr "中文："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:14
-msgid "Correct pinyin"
-msgstr "拼音纠错"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:15
+#: ../setup/ibus-pinyin-preferences.ui.h:25
 msgid "Dictionary"
 msgstr "词典"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:16
+#: ../setup/ibus-pinyin-preferences.ui.h:26
 msgid "Double pinyin"
 msgstr "双拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:17
+#: ../setup/ibus-pinyin-preferences.ui.h:27
 msgid "Edit custom phrases"
 msgstr "编辑自定义词组"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:18
-msgid "Enable fuzzy pinyin."
-msgstr "启动模糊拼音。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:19
-msgid "Enable incomplete pinyin (like zh g)."
-msgstr "支持不完全拼音（例如：zh g）。"
+#: ../setup/ibus-pinyin-preferences.ui.h:28
+msgid "Enable correct pinyin"
+msgstr "启动拼音纠错"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:20
-msgid "Enable pinyin correcting."
-msgstr "启动拼音纠错。"
+#: ../setup/ibus-pinyin-preferences.ui.h:29
+msgid "Enable fuzzy syllable"
+msgstr "启动模糊读音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:21
+#: ../setup/ibus-pinyin-preferences.ui.h:30
 msgid "English"
 msgstr "英文"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:22
+#: ../setup/ibus-pinyin-preferences.ui.h:31
+msgid "Eten"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:32
 msgid "Full"
 msgstr "全角"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:23
+#: ../setup/ibus-pinyin-preferences.ui.h:33
 msgid "Full pinyin"
 msgstr "全拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:24
-msgid "Fuzzy pinyin"
-msgstr "模糊拼音"
+#: ../setup/ibus-pinyin-preferences.ui.h:34
+msgid "Fuzzy syllable"
+msgstr "模糊读音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:25
+#: ../setup/ibus-pinyin-preferences.ui.h:35
+msgid "General"
+msgstr "常规"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:36
+msgid "GinYieh"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:37
 msgid "Half"
 msgstr "半角"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:26
+#: ../setup/ibus-pinyin-preferences.ui.h:38
 msgid "Half/full width:"
 msgstr "全角/半角："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:27
+#: ../setup/ibus-pinyin-preferences.ui.h:39
 msgid "Horizontal"
 msgstr "水平"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:28
+#: ../setup/ibus-pinyin-preferences.ui.h:40
+msgid "IBM"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:41
+msgid "Incomplete Bopomofo"
+msgstr "简拼"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:42
 msgid "Incomplete pinyin"
 msgstr "简拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:29
+#: ../setup/ibus-pinyin-preferences.ui.h:43
+msgid "Keyboard Mappming:"
+msgstr "键盘映射："
+
+#: ../setup/ibus-pinyin-preferences.ui.h:44
 msgid "Language:"
 msgstr "语言："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:30
+#: ../setup/ibus-pinyin-preferences.ui.h:45
 msgid "MSPY"
 msgstr "微软拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:31
+#: ../setup/ibus-pinyin-preferences.ui.h:46
 msgid "Number of candidates:"
 msgstr "每页显示候选词数："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:32
+#: ../setup/ibus-pinyin-preferences.ui.h:47
 msgid "Orientation of candidates:"
 msgstr "候选词排列方向："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:33
+#: ../setup/ibus-pinyin-preferences.ui.h:48
 msgid "PYJJ"
 msgstr "拼音加加"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:34
+#: ../setup/ibus-pinyin-preferences.ui.h:49
 msgid "Pinyin input method for IBus"
 msgstr "IBus 拼音输入法"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:35
+#: ../setup/ibus-pinyin-preferences.ui.h:50
 msgid "Pinyin mode"
 msgstr "拼音模式"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:37
+#: ../setup/ibus-pinyin-preferences.ui.h:51
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:52
 msgid "Punctuations:"
 msgstr "标点符号："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:38
-msgid "Schema:"
-msgstr "双拼方案："
-
-#: ../setup/ibus-pinyin-preferences.ui.h:39
-msgid "Select double pinyin schema."
-msgstr "选择双拼模式。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:40
-msgid "Setup the initial state of pinyin input method."
-msgstr "设置拼音输入法初始状态。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:41
-msgid "Show candidates in traditional Chinese"
-msgstr "显示繁体候选词"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:42
+#: ../setup/ibus-pinyin-preferences.ui.h:53
 msgid "Show raw input of Double Pinyin"
 msgstr "显示双拼原始输入"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:43
+#: ../setup/ibus-pinyin-preferences.ui.h:54
 msgid "Simplified"
 msgstr "简体"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:44
+#: ../setup/ibus-pinyin-preferences.ui.h:55
+msgid "Standard"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:56
 msgid "Traditional"
 msgstr "繁体"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:45
-msgid "UI"
-msgstr "外观"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:46
+#: ../setup/ibus-pinyin-preferences.ui.h:57
 msgid "Use custom phrases"
 msgstr "使用自定义词组"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:47
-msgid "Use double pinyin."
-msgstr "使用双拼。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:48
-msgid "Use full pinyin."
-msgstr "使用全拼。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:49
+#: ../setup/ibus-pinyin-preferences.ui.h:58
 msgid "Vertical"
 msgstr "竖直"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:50
+#: ../setup/ibus-pinyin-preferences.ui.h:59
 msgid "ZGPY"
 msgstr "紫光拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:51
+#: ../setup/ibus-pinyin-preferences.ui.h:60
 msgid "ZRM"
 msgstr "自然码"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:52
+#: ../setup/ibus-pinyin-preferences.ui.h:61
 msgid "[,] [.] flip page"
 msgstr "[,][.]键翻页"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:53
+#: ../setup/ibus-pinyin-preferences.ui.h:62
 msgid "[-] [=] flip page"
 msgstr "[-][=]键翻页"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:54
+#: ../setup/ibus-pinyin-preferences.ui.h:63
 msgid "[Shift] select candidate"
 msgstr "[Shift]键选词"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:55
+#: ../setup/ibus-pinyin-preferences.ui.h:64
 msgid "http://ibus.googlecode.com"
 msgstr "http://ibus.googlecode.com"
 
+#~ msgid "<b>Others</b>"
+#~ msgstr "<b>其他</b>"
+
+#~ msgid "Enable incomplete pinyin (like zh g)."
+#~ msgstr "支持不完全拼音（例如：zh g）。"
+
+#~ msgid "Enable pinyin correcting."
+#~ msgstr "启动拼音纠错。"
+
+#~ msgid "Fuzzy pinyin"
+#~ msgstr "模糊拼音"
+
+#~ msgid "Schema:"
+#~ msgstr "双拼方案："
+
+#~ msgid "Select double pinyin schema."
+#~ msgstr "选择双拼模式。"
+
+#~ msgid "Setup the initial state of pinyin input method."
+#~ msgstr "设置拼音输入法初始状态。"
+
+#~ msgid "Show candidates in traditional Chinese"
+#~ msgstr "显示繁体候选词"
+
+#~ msgid "UI"
+#~ msgstr "外观"
+
+#~ msgid "Use double pinyin."
+#~ msgstr "使用双拼。"
+
+#~ msgid "Use full pinyin."
+#~ msgstr "使用全拼。"
+
 #, fuzzy
 #~ msgid ""
 #~ "<small>Copyright &#xA9; 2009\n"
@@ -293,9 +353,6 @@ msgstr "http://ibus.googlecode.com"
 #~ "Use left and right shift keys to select the second and thrid candidates."
 #~ msgstr "使用左右[shift]键选择第二个和第三个候选词。"
 
-#~ msgid "General"
-#~ msgstr "常规"
-
 #~ msgid "+-*/=%"
 #~ msgstr "+-*/=%"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index dc767e3..3dc5a52 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus-pinyin 1.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-19 13:31+0800\n"
+"POT-Creation-Date: 2010-05-25 13:26+0800\n"
 "PO-Revision-Date: 2009-09-20 16:05+8\n"
 "Last-Translator: BYVoid <byvoid1@gmail.com>\n"
 "Language-Team: BYVoid <byvoid1@gmail.com>\n"
@@ -10,256 +10,316 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/Main.cc:59
+#: ../src/Main.cc:79
 msgid "Pinyin input method"
 msgstr "拼音輸入法"
 
-#: ../src/Main.cc:68
+#: ../src/Main.cc:88
 msgid "Pinyin (debug)"
 msgstr "拼音（調試）"
 
-#: ../src/Main.cc:69
+#: ../src/Main.cc:89
 msgid "Pinyin input method (debug)"
 msgstr "拼音輸入法（調試）"
 
-#: ../src/Main.cc:78
+#: ../src/Main.cc:98
 msgid "Bopomofo (debug)"
 msgstr "注音（調試）"
 
-#: ../src/Main.cc:79
+#: ../src/Main.cc:99
 msgid "Bopomofo input method (debug)"
 msgstr "注音輸入法（調試）"
 
-#: ../src/PinyinProperties.cc:19 ../setup/ibus-pinyin-preferences.ui.h:12
+#: ../src/PinyinProperties.cc:40 ../setup/ibus-pinyin-preferences.ui.h:23
 msgid "Chinese"
 msgstr "中文"
 
-#: ../src/PinyinProperties.cc:26
+#: ../src/PinyinProperties.cc:47
 msgid "Full/Half width"
 msgstr "全角/半角"
 
-#: ../src/PinyinProperties.cc:33
+#: ../src/PinyinProperties.cc:54
 msgid "Full/Half width punctuation"
 msgstr "半角符號"
 
-#: ../src/PinyinProperties.cc:40
+#: ../src/PinyinProperties.cc:61
 msgid "Simplfied/Traditional Chinese"
 msgstr "簡體/繁體中文"
 
-#: ../src/PinyinProperties.cc:43 ../src/PinyinProperties.cc:45
-#: ../setup/ibus-pinyin-preferences.ui.h:36
+#: ../src/PinyinProperties.cc:64 ../src/PinyinProperties.cc:66
 msgid "Pinyin preferences"
 msgstr "拼音偏好設定"
 
-#: ../setup/main.py:253 ../setup/ibus-pinyin-preferences.ui.h:7
+#: ../setup/main.py:359 ../setup/ibus-pinyin-preferences.ui.h:9
 #, no-c-format, python-format
 msgid "<big><b>IBus Pinyin %s</b></big>"
 msgstr "<big><b>IBus 拼音 %s</b></big>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:1
+#, fuzzy
+msgid "<b>Bopomofo mode</b>"
+msgstr "注音（調試）"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:2
+#, fuzzy
+msgid "<b>Correct pinyin</b>"
+msgstr "拼音糾錯"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:3
 msgid "<b>Dictionary option</b>"
 msgstr "<b>詞典選項</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:2
+#: ../setup/ibus-pinyin-preferences.ui.h:4
 msgid "<b>Initial state</b>"
 msgstr "<b>初始狀態</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:3
-msgid "<b>Others</b>"
-msgstr "<b>其他</b>"
+#: ../setup/ibus-pinyin-preferences.ui.h:5
+#, fuzzy
+msgid "<b>Input Custom</b>"
+msgstr "<b>初始狀態</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:4
+#: ../setup/ibus-pinyin-preferences.ui.h:6
 msgid "<b>Pinyin mode</b>"
 msgstr "<b>拼音模式</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:5
+#: ../setup/ibus-pinyin-preferences.ui.h:7
 msgid "<b>UI</b>"
 msgstr "<b>外觀</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:8
+#: ../setup/ibus-pinyin-preferences.ui.h:10
+msgid ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Huang\n"
+"By Void\n"
+"\n"
+"<b>Contributers:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:18
 msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
 msgstr "<small>版權所有 (c) 2009-2010 黃鵬</small>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:9
+#: ../setup/ibus-pinyin-preferences.ui.h:19
 msgid "ABC"
 msgstr "智能ABC"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:10
+#: ../setup/ibus-pinyin-preferences.ui.h:20
 msgid "About"
 msgstr "關於"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:11
+#: ../setup/ibus-pinyin-preferences.ui.h:21
 msgid "Auto commit"
 msgstr "自動上詞"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:13
+#: ../setup/ibus-pinyin-preferences.ui.h:22
+#, fuzzy
+msgid "Bopomofo mode"
+msgstr "注音（調試）"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:24
 msgid "Chinese:"
 msgstr "中文："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:14
-msgid "Correct pinyin"
-msgstr "拼音糾錯"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:15
+#: ../setup/ibus-pinyin-preferences.ui.h:25
 msgid "Dictionary"
 msgstr "詞典"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:16
+#: ../setup/ibus-pinyin-preferences.ui.h:26
 msgid "Double pinyin"
 msgstr "雙拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:17
+#: ../setup/ibus-pinyin-preferences.ui.h:27
 msgid "Edit custom phrases"
 msgstr "編輯自定義詞組"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:18
-msgid "Enable fuzzy pinyin."
-msgstr "啓動模糊拼音。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:19
-msgid "Enable incomplete pinyin (like zh g)."
-msgstr "支持不完全拼音（例如：zh g）。"
+#: ../setup/ibus-pinyin-preferences.ui.h:28
+#, fuzzy
+msgid "Enable correct pinyin"
+msgstr "拼音糾錯"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:20
-msgid "Enable pinyin correcting."
-msgstr "啓動拼音糾錯。"
+#: ../setup/ibus-pinyin-preferences.ui.h:29
+#, fuzzy
+msgid "Enable fuzzy syllable"
+msgstr "啓動模糊拼音。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:21
+#: ../setup/ibus-pinyin-preferences.ui.h:30
 msgid "English"
 msgstr "英文"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:22
+#: ../setup/ibus-pinyin-preferences.ui.h:31
+msgid "Eten"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:32
 msgid "Full"
 msgstr "全角"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:23
+#: ../setup/ibus-pinyin-preferences.ui.h:33
 msgid "Full pinyin"
 msgstr "全拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:24
-msgid "Fuzzy pinyin"
-msgstr "模糊拼音"
+#: ../setup/ibus-pinyin-preferences.ui.h:34
+msgid "Fuzzy syllable"
+msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:25
+#: ../setup/ibus-pinyin-preferences.ui.h:35
+msgid "General"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:36
+msgid "GinYieh"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:37
 msgid "Half"
 msgstr "半角"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:26
+#: ../setup/ibus-pinyin-preferences.ui.h:38
 msgid "Half/full width:"
 msgstr "全角/半角："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:27
+#: ../setup/ibus-pinyin-preferences.ui.h:39
 msgid "Horizontal"
 msgstr "水平"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:28
+#: ../setup/ibus-pinyin-preferences.ui.h:40
+msgid "IBM"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:41
+#, fuzzy
+msgid "Incomplete Bopomofo"
+msgstr "簡拼"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:42
 msgid "Incomplete pinyin"
 msgstr "簡拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:29
+#: ../setup/ibus-pinyin-preferences.ui.h:43
+msgid "Keyboard Mappming:"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:44
 msgid "Language:"
 msgstr "語言："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:30
+#: ../setup/ibus-pinyin-preferences.ui.h:45
 msgid "MSPY"
 msgstr "微軟拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:31
+#: ../setup/ibus-pinyin-preferences.ui.h:46
 msgid "Number of candidates:"
 msgstr "每頁顯示候選詞條目數量："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:32
+#: ../setup/ibus-pinyin-preferences.ui.h:47
 msgid "Orientation of candidates:"
 msgstr "候選詞排列方向："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:33
+#: ../setup/ibus-pinyin-preferences.ui.h:48
 msgid "PYJJ"
 msgstr "拼音加加"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:34
+#: ../setup/ibus-pinyin-preferences.ui.h:49
 msgid "Pinyin input method for IBus"
 msgstr "IBus 拼音輸入法"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:35
+#: ../setup/ibus-pinyin-preferences.ui.h:50
 msgid "Pinyin mode"
 msgstr "拼音模式"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:37
+#: ../setup/ibus-pinyin-preferences.ui.h:51
+#, fuzzy
+msgid "Preferences"
+msgstr "拼音偏好設定"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:52
 msgid "Punctuations:"
 msgstr "標點符號："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:38
-msgid "Schema:"
-msgstr "雙拼方案："
-
-#: ../setup/ibus-pinyin-preferences.ui.h:39
-msgid "Select double pinyin schema."
-msgstr "選擇雙拼模式。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:40
-msgid "Setup the initial state of pinyin input method."
-msgstr "設置拼音輸入法初始狀態。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:41
-msgid "Show candidates in traditional Chinese"
-msgstr "顯示繁體候選詞"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:42
+#: ../setup/ibus-pinyin-preferences.ui.h:53
 msgid "Show raw input of Double Pinyin"
 msgstr "顯示雙拼原始輸入"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:43
+#: ../setup/ibus-pinyin-preferences.ui.h:54
 msgid "Simplified"
 msgstr "簡體"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:44
+#: ../setup/ibus-pinyin-preferences.ui.h:55
+msgid "Standard"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:56
 msgid "Traditional"
 msgstr "繁體"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:45
-msgid "UI"
-msgstr "外觀"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:46
+#: ../setup/ibus-pinyin-preferences.ui.h:57
 msgid "Use custom phrases"
 msgstr "使用自定義詞組"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:47
-msgid "Use double pinyin."
-msgstr "使用雙拼。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:48
-msgid "Use full pinyin."
-msgstr "使用全拼。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:49
+#: ../setup/ibus-pinyin-preferences.ui.h:58
 msgid "Vertical"
 msgstr "豎直"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:50
+#: ../setup/ibus-pinyin-preferences.ui.h:59
 msgid "ZGPY"
 msgstr "紫光拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:51
+#: ../setup/ibus-pinyin-preferences.ui.h:60
 msgid "ZRM"
 msgstr "自然碼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:52
+#: ../setup/ibus-pinyin-preferences.ui.h:61
 msgid "[,] [.] flip page"
 msgstr "[,][.]鍵翻頁"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:53
+#: ../setup/ibus-pinyin-preferences.ui.h:62
 msgid "[-] [=] flip page"
 msgstr "[-][=]鍵翻頁"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:54
+#: ../setup/ibus-pinyin-preferences.ui.h:63
 msgid "[Shift] select candidate"
 msgstr "[Shift]鍵選詞"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:55
+#: ../setup/ibus-pinyin-preferences.ui.h:64
 msgid "http://ibus.googlecode.com"
 msgstr "http://ibus.googlecode.com"
 
+#~ msgid "<b>Others</b>"
+#~ msgstr "<b>其他</b>"
+
+#~ msgid "Enable incomplete pinyin (like zh g)."
+#~ msgstr "支持不完全拼音（例如：zh g）。"
+
+#~ msgid "Enable pinyin correcting."
+#~ msgstr "啓動拼音糾錯。"
+
+#~ msgid "Fuzzy pinyin"
+#~ msgstr "模糊拼音"
+
+#~ msgid "Schema:"
+#~ msgstr "雙拼方案："
+
+#~ msgid "Select double pinyin schema."
+#~ msgstr "選擇雙拼模式。"
+
+#~ msgid "Setup the initial state of pinyin input method."
+#~ msgstr "設置拼音輸入法初始狀態。"
+
+#~ msgid "Show candidates in traditional Chinese"
+#~ msgstr "顯示繁體候選詞"
+
+#~ msgid "UI"
+#~ msgstr "外觀"
+
+#~ msgid "Use double pinyin."
+#~ msgstr "使用雙拼。"
+
+#~ msgid "Use full pinyin."
+#~ msgstr "使用全拼。"
+
 #, fuzzy
 #~ msgid ""
 #~ "<small>Copyright &#xA9; 2009\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 882ecf1..14c8fd5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus-pinyin 1.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-19 13:31+0800\n"
+"POT-Creation-Date: 2010-05-25 13:26+0800\n"
 "PO-Revision-Date: 2009-09-20 16:05+8\n"
 "Last-Translator: BYVoid <byvoid1@gmail.com>\n"
 "Language-Team: BYVoid <byvoid1@gmail.com>\n"
@@ -10,256 +10,316 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/Main.cc:59
+#: ../src/Main.cc:79
 msgid "Pinyin input method"
 msgstr "拼音輸入法"
 
-#: ../src/Main.cc:68
+#: ../src/Main.cc:88
 msgid "Pinyin (debug)"
 msgstr "拼音（調試）"
 
-#: ../src/Main.cc:69
+#: ../src/Main.cc:89
 msgid "Pinyin input method (debug)"
 msgstr "拼音輸入法（調試）"
 
-#: ../src/Main.cc:78
+#: ../src/Main.cc:98
 msgid "Bopomofo (debug)"
 msgstr "注音（調試）"
 
-#: ../src/Main.cc:79
+#: ../src/Main.cc:99
 msgid "Bopomofo input method (debug)"
 msgstr "注音輸入法（調試）"
 
-#: ../src/PinyinProperties.cc:19 ../setup/ibus-pinyin-preferences.ui.h:12
+#: ../src/PinyinProperties.cc:40 ../setup/ibus-pinyin-preferences.ui.h:23
 msgid "Chinese"
 msgstr "中文"
 
-#: ../src/PinyinProperties.cc:26
+#: ../src/PinyinProperties.cc:47
 msgid "Full/Half width"
 msgstr "全形/半形"
 
-#: ../src/PinyinProperties.cc:33
+#: ../src/PinyinProperties.cc:54
 msgid "Full/Half width punctuation"
 msgstr "半形符號"
 
-#: ../src/PinyinProperties.cc:40
+#: ../src/PinyinProperties.cc:61
 msgid "Simplfied/Traditional Chinese"
 msgstr "簡體/繁體中文"
 
-#: ../src/PinyinProperties.cc:43 ../src/PinyinProperties.cc:45
-#: ../setup/ibus-pinyin-preferences.ui.h:36
+#: ../src/PinyinProperties.cc:64 ../src/PinyinProperties.cc:66
 msgid "Pinyin preferences"
 msgstr "拼音偏好設定"
 
-#: ../setup/main.py:253 ../setup/ibus-pinyin-preferences.ui.h:7
+#: ../setup/main.py:359 ../setup/ibus-pinyin-preferences.ui.h:9
 #, no-c-format, python-format
 msgid "<big><b>IBus Pinyin %s</b></big>"
 msgstr "<big><b>IBus 拼音 %s</b></big>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:1
+#, fuzzy
+msgid "<b>Bopomofo mode</b>"
+msgstr "注音（調試）"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:2
+#, fuzzy
+msgid "<b>Correct pinyin</b>"
+msgstr "拼音糾錯"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:3
 msgid "<b>Dictionary option</b>"
 msgstr "<b>詞典選項</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:2
+#: ../setup/ibus-pinyin-preferences.ui.h:4
 msgid "<b>Initial state</b>"
 msgstr "<b>初始狀態</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:3
-msgid "<b>Others</b>"
-msgstr "<b>其他</b>"
+#: ../setup/ibus-pinyin-preferences.ui.h:5
+#, fuzzy
+msgid "<b>Input Custom</b>"
+msgstr "<b>初始狀態</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:4
+#: ../setup/ibus-pinyin-preferences.ui.h:6
 msgid "<b>Pinyin mode</b>"
 msgstr "<b>拼音模式</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:5
+#: ../setup/ibus-pinyin-preferences.ui.h:7
 msgid "<b>UI</b>"
 msgstr "<b>外觀</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:8
+#: ../setup/ibus-pinyin-preferences.ui.h:10
+msgid ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Huang\n"
+"By Void\n"
+"\n"
+"<b>Contributers:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:18
 msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
 msgstr "<small>版權所有 (c) 2009-2010 黃鵬</small>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:9
+#: ../setup/ibus-pinyin-preferences.ui.h:19
 msgid "ABC"
 msgstr "智能ABC"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:10
+#: ../setup/ibus-pinyin-preferences.ui.h:20
 msgid "About"
 msgstr "關於"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:11
+#: ../setup/ibus-pinyin-preferences.ui.h:21
 msgid "Auto commit"
 msgstr "自動上詞"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:13
+#: ../setup/ibus-pinyin-preferences.ui.h:22
+#, fuzzy
+msgid "Bopomofo mode"
+msgstr "注音（調試）"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:24
 msgid "Chinese:"
 msgstr "中文："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:14
-msgid "Correct pinyin"
-msgstr "拼音糾錯"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:15
+#: ../setup/ibus-pinyin-preferences.ui.h:25
 msgid "Dictionary"
 msgstr "詞典"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:16
+#: ../setup/ibus-pinyin-preferences.ui.h:26
 msgid "Double pinyin"
 msgstr "雙拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:17
+#: ../setup/ibus-pinyin-preferences.ui.h:27
 msgid "Edit custom phrases"
 msgstr "編輯自定義詞組"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:18
-msgid "Enable fuzzy pinyin."
-msgstr "啓動模糊拼音。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:19
-msgid "Enable incomplete pinyin (like zh g)."
-msgstr "支持不完全拼音（例如：zh g）。"
+#: ../setup/ibus-pinyin-preferences.ui.h:28
+#, fuzzy
+msgid "Enable correct pinyin"
+msgstr "拼音糾錯"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:20
-msgid "Enable pinyin correcting."
-msgstr "啓動拼音糾錯。"
+#: ../setup/ibus-pinyin-preferences.ui.h:29
+#, fuzzy
+msgid "Enable fuzzy syllable"
+msgstr "啓動模糊拼音。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:21
+#: ../setup/ibus-pinyin-preferences.ui.h:30
 msgid "English"
 msgstr "英文"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:22
+#: ../setup/ibus-pinyin-preferences.ui.h:31
+msgid "Eten"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:32
 msgid "Full"
 msgstr "全形"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:23
+#: ../setup/ibus-pinyin-preferences.ui.h:33
 msgid "Full pinyin"
 msgstr "全拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:24
-msgid "Fuzzy pinyin"
-msgstr "模糊拼音"
+#: ../setup/ibus-pinyin-preferences.ui.h:34
+msgid "Fuzzy syllable"
+msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:25
+#: ../setup/ibus-pinyin-preferences.ui.h:35
+msgid "General"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:36
+msgid "GinYieh"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:37
 msgid "Half"
 msgstr "半形"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:26
+#: ../setup/ibus-pinyin-preferences.ui.h:38
 msgid "Half/full width:"
 msgstr "全形/半形："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:27
+#: ../setup/ibus-pinyin-preferences.ui.h:39
 msgid "Horizontal"
 msgstr "水平"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:28
+#: ../setup/ibus-pinyin-preferences.ui.h:40
+msgid "IBM"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:41
+#, fuzzy
+msgid "Incomplete Bopomofo"
+msgstr "簡拼"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:42
 msgid "Incomplete pinyin"
 msgstr "簡拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:29
+#: ../setup/ibus-pinyin-preferences.ui.h:43
+msgid "Keyboard Mappming:"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:44
 msgid "Language:"
 msgstr "語言："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:30
+#: ../setup/ibus-pinyin-preferences.ui.h:45
 msgid "MSPY"
 msgstr "微軟拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:31
+#: ../setup/ibus-pinyin-preferences.ui.h:46
 msgid "Number of candidates:"
 msgstr "每頁顯示候選詞條目數量："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:32
+#: ../setup/ibus-pinyin-preferences.ui.h:47
 msgid "Orientation of candidates:"
 msgstr "候選詞排列方向："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:33
+#: ../setup/ibus-pinyin-preferences.ui.h:48
 msgid "PYJJ"
 msgstr "拼音加加"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:34
+#: ../setup/ibus-pinyin-preferences.ui.h:49
 msgid "Pinyin input method for IBus"
 msgstr "IBus 拼音輸入法"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:35
+#: ../setup/ibus-pinyin-preferences.ui.h:50
 msgid "Pinyin mode"
 msgstr "拼音模式"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:37
+#: ../setup/ibus-pinyin-preferences.ui.h:51
+#, fuzzy
+msgid "Preferences"
+msgstr "拼音偏好設定"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:52
 msgid "Punctuations:"
 msgstr "標點符號："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:38
-msgid "Schema:"
-msgstr "雙拼方案："
-
-#: ../setup/ibus-pinyin-preferences.ui.h:39
-msgid "Select double pinyin schema."
-msgstr "選擇雙拼模式。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:40
-msgid "Setup the initial state of pinyin input method."
-msgstr "設置拼音輸入法初始狀態。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:41
-msgid "Show candidates in traditional Chinese"
-msgstr "顯示繁體候選詞"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:42
+#: ../setup/ibus-pinyin-preferences.ui.h:53
 msgid "Show raw input of Double Pinyin"
 msgstr "顯示雙拼原始輸入"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:43
+#: ../setup/ibus-pinyin-preferences.ui.h:54
 msgid "Simplified"
 msgstr "簡體"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:44
+#: ../setup/ibus-pinyin-preferences.ui.h:55
+msgid "Standard"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:56
 msgid "Traditional"
 msgstr "繁體"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:45
-msgid "UI"
-msgstr "外觀"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:46
+#: ../setup/ibus-pinyin-preferences.ui.h:57
 msgid "Use custom phrases"
 msgstr "使用自定義詞組"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:47
-msgid "Use double pinyin."
-msgstr "使用雙拼。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:48
-msgid "Use full pinyin."
-msgstr "使用全拼。"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:49
+#: ../setup/ibus-pinyin-preferences.ui.h:58
 msgid "Vertical"
 msgstr "豎直"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:50
+#: ../setup/ibus-pinyin-preferences.ui.h:59
 msgid "ZGPY"
 msgstr "紫光拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:51
+#: ../setup/ibus-pinyin-preferences.ui.h:60
 msgid "ZRM"
 msgstr "自然碼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:52
+#: ../setup/ibus-pinyin-preferences.ui.h:61
 msgid "[,] [.] flip page"
 msgstr "[,][.]鍵翻頁"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:53
+#: ../setup/ibus-pinyin-preferences.ui.h:62
 msgid "[-] [=] flip page"
 msgstr "[-][=]鍵翻頁"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:54
+#: ../setup/ibus-pinyin-preferences.ui.h:63
 msgid "[Shift] select candidate"
 msgstr "[Shift]鍵選詞"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:55
+#: ../setup/ibus-pinyin-preferences.ui.h:64
 msgid "http://ibus.googlecode.com"
 msgstr "http://ibus.googlecode.com"
 
+#~ msgid "<b>Others</b>"
+#~ msgstr "<b>其他</b>"
+
+#~ msgid "Enable incomplete pinyin (like zh g)."
+#~ msgstr "支持不完全拼音（例如：zh g）。"
+
+#~ msgid "Enable pinyin correcting."
+#~ msgstr "啓動拼音糾錯。"
+
+#~ msgid "Fuzzy pinyin"
+#~ msgstr "模糊拼音"
+
+#~ msgid "Schema:"
+#~ msgstr "雙拼方案："
+
+#~ msgid "Select double pinyin schema."
+#~ msgstr "選擇雙拼模式。"
+
+#~ msgid "Setup the initial state of pinyin input method."
+#~ msgstr "設置拼音輸入法初始狀態。"
+
+#~ msgid "Show candidates in traditional Chinese"
+#~ msgstr "顯示繁體候選詞"
+
+#~ msgid "UI"
+#~ msgstr "外觀"
+
+#~ msgid "Use double pinyin."
+#~ msgstr "使用雙拼。"
+
+#~ msgid "Use full pinyin."
+#~ msgstr "使用全拼。"
+
 #, fuzzy
 #~ msgid ""
 #~ "<small>Copyright &#xA9; 2009\n"