From 547f5f2edf23027731a3e9f13f2de60a32224c9f Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Thu, 15 Apr 2010 13:11:40 +0800
Subject: [PATCH] Update the phrases.txt location

---
 po/ru.po                         | 132 +++++++++++++++++++-------------------
 po/zh_CN.po                      | 133 ++++++++++++++++++++-------------------
 setup/ibus-pinyin-preferences.ui | 110 +++++++++-----------------------
 setup/main.py                    |   3 -
 src/SpecialPhraseTable.cc        |   2 +-
 5 files changed, 165 insertions(+), 215 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index ae73f7f..7b68c53 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-04-08 15:06+0800\n"
+"POT-Creation-Date: 2010-04-15 13:51+0800\n"
 "PO-Revision-Date: 2009-10-14 09:44+0300\n"
 "Last-Translator: Alexey Kotlyarov <koterpillar@gmail.com>\n"
 "Language-Team: Russian\n"
@@ -31,7 +31,7 @@ msgstr "Пиньинь"
 msgid "Pinyin input method (debug)"
 msgstr "Метод ввода пиньинь"
 
-#: ../src/PinyinProperties.cc:21 ../setup/ibus-pinyin-preferences.ui.h:12
+#: ../src/PinyinProperties.cc:21 ../setup/ibus-pinyin-preferences.ui.h:10
 msgid "Chinese"
 msgstr "Китайский"
 
@@ -48,168 +48,164 @@ msgid "Simplfied/Traditional Chinese"
 msgstr "Упрощенные/традиционные иероглифы"
 
 #: ../src/PinyinProperties.cc:69 ../src/PinyinProperties.cc:71
-#: ../setup/ibus-pinyin-preferences.ui.h:36
+#: ../setup/ibus-pinyin-preferences.ui.h:34
 msgid "Pinyin preferences"
 msgstr "Настройки пиньиня"
 
-#: ../setup/main.py:39 ../setup/ibus-pinyin-preferences.ui.h:7
+#: ../setup/main.py:39 ../setup/ibus-pinyin-preferences.ui.h:5
 #, 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:2
-#, no-c-format
-msgid "+-*/=%"
-msgstr "+-*/=%"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:3
+#: ../setup/ibus-pinyin-preferences.ui.h:1
 msgid "<b>Initial state</b>"
 msgstr "<b>Начальное состояние</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:4
+#: ../setup/ibus-pinyin-preferences.ui.h:2
 msgid "<b>Others</b>"
 msgstr "<b>Другие</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:5
-msgid "<b>Pinyin</b>"
+#: ../setup/ibus-pinyin-preferences.ui.h:3
+#, fuzzy
+msgid "<b>Pinyin mode</b>"
 msgstr "<b>Пиньинь</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:8
+#: ../setup/ibus-pinyin-preferences.ui.h:6
 msgid ""
 "<small>Copyright &#xA9; 2009 Peng Huang &lt;shawn.p.huang@gmail.com&gt;</"
 "small>"
 msgstr ""
 "<small>Copyright &#xA9; 2009 Хуан Пэн &lt;shawn.p.huang@gmail.com&gt;</small>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:9
+#: ../setup/ibus-pinyin-preferences.ui.h:7
 msgid "ABC"
 msgstr "ABC"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:10
+#: ../setup/ibus-pinyin-preferences.ui.h:8
 msgid "About"
 msgstr "О программе"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:11
+#: ../setup/ibus-pinyin-preferences.ui.h:9
 msgid "Auto commit"
 msgstr "Автоматически подтверждать фразу"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:13
+#: ../setup/ibus-pinyin-preferences.ui.h:11
 msgid "Chinese:"
 msgstr "Иероглифы:"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:14
+#: ../setup/ibus-pinyin-preferences.ui.h:12
 msgid "Correct pinyin"
 msgstr "Исправления"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:15
+#: ../setup/ibus-pinyin-preferences.ui.h:13
+msgid "Dictionary"
+msgstr ""
+
+#: ../setup/ibus-pinyin-preferences.ui.h:14
 msgid "Double pinyin"
 msgstr "Двойной пиньинь"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:16
+#: ../setup/ibus-pinyin-preferences.ui.h:15
 msgid "Enable automatic commit phrase."
 msgstr "Подтверждать набранную фразу при вводе знаков препинания."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:17
+#: ../setup/ibus-pinyin-preferences.ui.h:16
 msgid "Enable fuzzy pinyin."
 msgstr "Включить нечеткий пиньинь."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:18
+#: ../setup/ibus-pinyin-preferences.ui.h:17
 msgid "Enable incomplete pinyin (like zh g)."
 msgstr "Включить неполный пиньинь (например, zh g)."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:19
+#: ../setup/ibus-pinyin-preferences.ui.h:18
 msgid "Enable pinyin correcting."
 msgstr "Включить исправление пиньиня."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:20
+#: ../setup/ibus-pinyin-preferences.ui.h:19
 msgid "English"
 msgstr "Английский"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:21
+#: ../setup/ibus-pinyin-preferences.ui.h:20
 msgid "Full"
 msgstr "Полная"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:22
+#: ../setup/ibus-pinyin-preferences.ui.h:21
 msgid "Full pinyin"
 msgstr "Полный пиньинь"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:23
+#: ../setup/ibus-pinyin-preferences.ui.h:22
 msgid "Fuzzy pinyin"
 msgstr "Нечеткий пиньинь"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:24
+#: ../setup/ibus-pinyin-preferences.ui.h:23
 msgid "General"
 msgstr "Общие"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:25
+#: ../setup/ibus-pinyin-preferences.ui.h:24
 msgid "Half"
 msgstr "Половинная"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:26
-msgid "Half width punctuations:"
-msgstr "Знаки препинания половинной ширины:"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:27
+#: ../setup/ibus-pinyin-preferences.ui.h:25
 msgid "Half/full width:"
 msgstr "Полная/половинная ширина:"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:28
+#: ../setup/ibus-pinyin-preferences.ui.h:26
 msgid "Horizontal"
 msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:29
+#: ../setup/ibus-pinyin-preferences.ui.h:27
 msgid "Incomplete pinyin"
 msgstr "Неполный пиньинь"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:30
+#: ../setup/ibus-pinyin-preferences.ui.h:28
 msgid "Language:"
 msgstr "Язык:"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:31
+#: ../setup/ibus-pinyin-preferences.ui.h:29
 msgid "MSPY"
 msgstr "MSPY"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:32
+#: ../setup/ibus-pinyin-preferences.ui.h:30
 msgid "Number of candidates:"
 msgstr "Число кандидатов"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:33
+#: ../setup/ibus-pinyin-preferences.ui.h:31
 msgid "Orientation of candidates:"
 msgstr "Число кандидатов"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:34
+#: ../setup/ibus-pinyin-preferences.ui.h:32
 msgid "PYJJ"
 msgstr "PYJJ"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:35
+#: ../setup/ibus-pinyin-preferences.ui.h:33
 msgid "Pinyin input method for IBus"
 msgstr "Метод ввода пиньинь для IBus"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:37
+#: ../setup/ibus-pinyin-preferences.ui.h:35
 msgid "Punctuations:"
 msgstr "Знаки препинания:"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:38
+#: ../setup/ibus-pinyin-preferences.ui.h:36
 msgid "Schema:"
 msgstr "Схема:"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:39
+#: ../setup/ibus-pinyin-preferences.ui.h:37
 msgid "Select double pinyin schema."
 msgstr "Выбор схемы двойного пиньиня."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:40
+#: ../setup/ibus-pinyin-preferences.ui.h:38
 msgid "Setup the initial state of pinyin input method."
 msgstr "Настройка начального состояния метода ввода."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:41
+#: ../setup/ibus-pinyin-preferences.ui.h:39
 msgid "Setup the number of candidates show in one page of lookup table."
 msgstr "Число кандидатов на одной странице таблицы поиска."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:42
+#: ../setup/ibus-pinyin-preferences.ui.h:40
 msgid "Show candidates in traditional Chinese"
 msgstr "Показывать кандидаты традиционными иероглифами."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:43
+#: ../setup/ibus-pinyin-preferences.ui.h:41
 #, fuzzy
 msgid ""
 "Show candidates in traditional Chinese, if the input method is in "
@@ -218,67 +214,73 @@ msgstr ""
 "Показывать кандидаты традиционными иероглифами, если включен ввод "
 "традиционных иероглифов."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:44
+#: ../setup/ibus-pinyin-preferences.ui.h:42
 msgid "Show raw input of Double Pinyin"
 msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:45
+#: ../setup/ibus-pinyin-preferences.ui.h:43
 msgid "Simplified"
 msgstr "Упрощенные"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:46
+#: ../setup/ibus-pinyin-preferences.ui.h:44
 msgid "Traditional"
 msgstr "Традиционные"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:47
+#: ../setup/ibus-pinyin-preferences.ui.h:45
 msgid "Use [,] [.] key to page up/down the lookup table."
 msgstr ""
 "Использовать клавиши [,] [.] для перемещения вверх-вниз по таблице поиска."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:48
+#: ../setup/ibus-pinyin-preferences.ui.h:46
 msgid "Use [-] [=] key to page up/down the lookup table."
 msgstr ""
 "Использовать клавиши [-] [=] для перемещения вверх-вниз по таблице поиска."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:49
+#: ../setup/ibus-pinyin-preferences.ui.h:47
 msgid "Use double pinyin."
 msgstr "Использовать двойной пиньинь (шуанпинь)."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:50
+#: ../setup/ibus-pinyin-preferences.ui.h:48
 msgid "Use full pinyin."
 msgstr "Использовать полный пиньинь."
 
-#: ../setup/ibus-pinyin-preferences.ui.h:51
+#: ../setup/ibus-pinyin-preferences.ui.h:49
 msgid ""
 "Use left and right shift keys to select the second and thrid candidates."
 msgstr ""
 "Использовать клавиши \"влево\" и \"вправо\" для выбора второго и третьего "
 "кандидатов"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:52
+#: ../setup/ibus-pinyin-preferences.ui.h:50
 msgid "Vertical"
 msgstr ""
 
-#: ../setup/ibus-pinyin-preferences.ui.h:53
+#: ../setup/ibus-pinyin-preferences.ui.h:51
 msgid "ZGPY"
 msgstr "ZGPY"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:54
+#: ../setup/ibus-pinyin-preferences.ui.h:52
 msgid "ZRM"
 msgstr "ZRM"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:55
+#: ../setup/ibus-pinyin-preferences.ui.h:53
 msgid "[,] [.] flip page"
 msgstr "Использовать клавиши [,] [.] для переключения страниц"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:56
+#: ../setup/ibus-pinyin-preferences.ui.h:54
 msgid "[-] [=] flip page"
 msgstr "Использовать клавиши [-] [=] для переключения страниц"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:57
+#: ../setup/ibus-pinyin-preferences.ui.h:55
 msgid "[Shift] select candidate"
 msgstr "Использовать [Shift] для выбора кандидатов"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:58
+#: ../setup/ibus-pinyin-preferences.ui.h:56
 msgid "http://ibus.googlecode.com"
 msgstr "http://ibus.googlecode.com"
+
+#~ msgid "+-*/=%"
+#~ msgstr "+-*/=%"
+
+#~ msgid "Half width punctuations:"
+#~ msgstr "Знаки препинания половинной ширины:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 24446cf..7d2a992 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-04-08 15:06+0800\n"
+"POT-Creation-Date: 2010-04-15 13:51+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"
@@ -27,7 +27,7 @@ msgstr "拼音（调试）"
 msgid "Pinyin input method (debug)"
 msgstr "拼音输入法（调试）"
 
-#: ../src/PinyinProperties.cc:21 ../setup/ibus-pinyin-preferences.ui.h:12
+#: ../src/PinyinProperties.cc:21 ../setup/ibus-pinyin-preferences.ui.h:10
 msgid "Chinese"
 msgstr "中文"
 
@@ -44,229 +44,230 @@ msgid "Simplfied/Traditional Chinese"
 msgstr "简体/繁体中文"
 
 #: ../src/PinyinProperties.cc:69 ../src/PinyinProperties.cc:71
-#: ../setup/ibus-pinyin-preferences.ui.h:36
+#: ../setup/ibus-pinyin-preferences.ui.h:34
 msgid "Pinyin preferences"
 msgstr "拼音首选项"
 
-#: ../setup/main.py:39 ../setup/ibus-pinyin-preferences.ui.h:7
+#: ../setup/main.py:39 ../setup/ibus-pinyin-preferences.ui.h:5
 #, 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:2
-#, no-c-format
-msgid "+-*/=%"
-msgstr "+-*/=%"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:3
+#: ../setup/ibus-pinyin-preferences.ui.h:1
 msgid "<b>Initial state</b>"
 msgstr "<b>初始状态</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:4
+#: ../setup/ibus-pinyin-preferences.ui.h:2
 msgid "<b>Others</b>"
 msgstr "<b>其他</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:5
-msgid "<b>Pinyin</b>"
-msgstr "<b>拼音</b>"
+#: ../setup/ibus-pinyin-preferences.ui.h:3
+msgid "<b>Pinyin mode</b>"
+msgstr "<b>拼音模式</b>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:8
+#: ../setup/ibus-pinyin-preferences.ui.h:6
 msgid ""
 "<small>Copyright &#xA9; 2009 Peng Huang &lt;shawn.p.huang@gmail.com&gt;</"
 "small>"
 msgstr "<small>版权所有 © 2009 黄鹏 &lt;shawn.p.huang@gmail.com&gt;</small>"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:9
+#: ../setup/ibus-pinyin-preferences.ui.h:7
 msgid "ABC"
 msgstr "智能ABC"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:10
+#: ../setup/ibus-pinyin-preferences.ui.h:8
 msgid "About"
 msgstr "关于"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:11
+#: ../setup/ibus-pinyin-preferences.ui.h:9
 msgid "Auto commit"
 msgstr "自动上词"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:13
+#: ../setup/ibus-pinyin-preferences.ui.h:11
 msgid "Chinese:"
 msgstr "中文："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:14
+#: ../setup/ibus-pinyin-preferences.ui.h:12
 msgid "Correct pinyin"
 msgstr "拼音纠错"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:15
+#: ../setup/ibus-pinyin-preferences.ui.h:13
+msgid "Dictionary"
+msgstr "词典"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:14
 msgid "Double pinyin"
 msgstr "双拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:16
+#: ../setup/ibus-pinyin-preferences.ui.h:15
 msgid "Enable automatic commit phrase."
 msgstr "启动自动上词。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:17
+#: ../setup/ibus-pinyin-preferences.ui.h:16
 msgid "Enable fuzzy pinyin."
 msgstr "启动模糊拼音。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:18
+#: ../setup/ibus-pinyin-preferences.ui.h:17
 msgid "Enable incomplete pinyin (like zh g)."
 msgstr "支持不完全拼音（例如：zh g）。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:19
+#: ../setup/ibus-pinyin-preferences.ui.h:18
 msgid "Enable pinyin correcting."
 msgstr "启动拼音纠错。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:20
+#: ../setup/ibus-pinyin-preferences.ui.h:19
 msgid "English"
 msgstr "英文"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:21
+#: ../setup/ibus-pinyin-preferences.ui.h:20
 msgid "Full"
 msgstr "全角"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:22
+#: ../setup/ibus-pinyin-preferences.ui.h:21
 msgid "Full pinyin"
 msgstr "全拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:23
+#: ../setup/ibus-pinyin-preferences.ui.h:22
 msgid "Fuzzy pinyin"
 msgstr "模糊拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:24
+#: ../setup/ibus-pinyin-preferences.ui.h:23
 msgid "General"
 msgstr "常规"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:25
+#: ../setup/ibus-pinyin-preferences.ui.h:24
 msgid "Half"
 msgstr "半角"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:26
-msgid "Half width punctuations:"
-msgstr "半角符号："
-
-#: ../setup/ibus-pinyin-preferences.ui.h:27
+#: ../setup/ibus-pinyin-preferences.ui.h:25
 msgid "Half/full width:"
 msgstr "全角/半角："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:28
+#: ../setup/ibus-pinyin-preferences.ui.h:26
 msgid "Horizontal"
 msgstr "æ°´å¹³"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:29
+#: ../setup/ibus-pinyin-preferences.ui.h:27
 msgid "Incomplete pinyin"
 msgstr "简拼"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:30
+#: ../setup/ibus-pinyin-preferences.ui.h:28
 msgid "Language:"
 msgstr "语言："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:31
+#: ../setup/ibus-pinyin-preferences.ui.h:29
 msgid "MSPY"
 msgstr "微软拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:32
+#: ../setup/ibus-pinyin-preferences.ui.h:30
 msgid "Number of candidates:"
 msgstr "每页显示候选词数："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:33
+#: ../setup/ibus-pinyin-preferences.ui.h:31
 msgid "Orientation of candidates:"
 msgstr "候选词排列方向："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:34
+#: ../setup/ibus-pinyin-preferences.ui.h:32
 msgid "PYJJ"
 msgstr "拼音加加"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:35
+#: ../setup/ibus-pinyin-preferences.ui.h:33
 msgid "Pinyin input method for IBus"
 msgstr "IBus 拼音输入法"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:37
+#: ../setup/ibus-pinyin-preferences.ui.h:35
 msgid "Punctuations:"
 msgstr "标点符号："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:38
+#: ../setup/ibus-pinyin-preferences.ui.h:36
 msgid "Schema:"
 msgstr "双拼方案："
 
-#: ../setup/ibus-pinyin-preferences.ui.h:39
+#: ../setup/ibus-pinyin-preferences.ui.h:37
 msgid "Select double pinyin schema."
 msgstr "选择双拼模式。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:40
+#: ../setup/ibus-pinyin-preferences.ui.h:38
 msgid "Setup the initial state of pinyin input method."
 msgstr "设置拼音输入法初始状态。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:41
+#: ../setup/ibus-pinyin-preferences.ui.h:39
 msgid "Setup the number of candidates show in one page of lookup table."
 msgstr "设置每页显示后先词数量。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:42
+#: ../setup/ibus-pinyin-preferences.ui.h:40
 msgid "Show candidates in traditional Chinese"
 msgstr "显示繁体候选词"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:43
+#: ../setup/ibus-pinyin-preferences.ui.h:41
 msgid ""
 "Show candidates in traditional Chinese, if the input method is in "
 "traditional Chinese inputing mode."
 msgstr "当输入法处于繁体模式时，使用繁体候选词。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:44
+#: ../setup/ibus-pinyin-preferences.ui.h:42
 msgid "Show raw input of Double Pinyin"
 msgstr "显示双拼原始输入"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:45
+#: ../setup/ibus-pinyin-preferences.ui.h:43
 msgid "Simplified"
 msgstr "简体"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:46
+#: ../setup/ibus-pinyin-preferences.ui.h:44
 msgid "Traditional"
 msgstr "繁体"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:47
+#: ../setup/ibus-pinyin-preferences.ui.h:45
 msgid "Use [,] [.] key to page up/down the lookup table."
 msgstr "按[,][.]键翻页。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:48
+#: ../setup/ibus-pinyin-preferences.ui.h:46
 msgid "Use [-] [=] key to page up/down the lookup table."
 msgstr "使用[-][=]键翻页。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:49
+#: ../setup/ibus-pinyin-preferences.ui.h:47
 msgid "Use double pinyin."
 msgstr "使用双拼。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:50
+#: ../setup/ibus-pinyin-preferences.ui.h:48
 msgid "Use full pinyin."
 msgstr "使用全拼。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:51
+#: ../setup/ibus-pinyin-preferences.ui.h:49
 msgid ""
 "Use left and right shift keys to select the second and thrid candidates."
 msgstr "使用左右[shift]键选择第二个和第三个候选词。"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:52
+#: ../setup/ibus-pinyin-preferences.ui.h:50
 msgid "Vertical"
 msgstr "竖直"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:53
+#: ../setup/ibus-pinyin-preferences.ui.h:51
 msgid "ZGPY"
 msgstr "紫光拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:54
+#: ../setup/ibus-pinyin-preferences.ui.h:52
 msgid "ZRM"
 msgstr "自然码"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:55
+#: ../setup/ibus-pinyin-preferences.ui.h:53
 msgid "[,] [.] flip page"
 msgstr "[,][.]键翻页"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:56
+#: ../setup/ibus-pinyin-preferences.ui.h:54
 msgid "[-] [=] flip page"
 msgstr "[-][=]键翻页"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:57
+#: ../setup/ibus-pinyin-preferences.ui.h:55
 msgid "[Shift] select candidate"
 msgstr "[Shift]键选词"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:58
+#: ../setup/ibus-pinyin-preferences.ui.h:56
 msgid "http://ibus.googlecode.com"
 msgstr "http://ibus.googlecode.com"
+
+#~ msgid "+-*/=%"
+#~ msgstr "+-*/=%"
+
+#~ msgid "Half width punctuations:"
+#~ msgstr "半角符号："
diff --git a/setup/ibus-pinyin-preferences.ui b/setup/ibus-pinyin-preferences.ui
index 71b5a03..b5a2dc1 100644
--- a/setup/ibus-pinyin-preferences.ui
+++ b/setup/ibus-pinyin-preferences.ui
@@ -151,7 +151,7 @@
                         <child type="label">
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Pinyin&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Pinyin mode&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
@@ -1161,6 +1161,34 @@
               </packing>
             </child>
             <child>
+              <object class="GtkVBox" id="vbox5">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label12">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Dictionary</property>
+              </object>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkAlignment" id="alignment9">
                 <property name="visible">True</property>
                 <property name="yscale">0.30000001192092896</property>
@@ -1247,89 +1275,11 @@
                 </child>
               </object>
               <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label12">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">About</property>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="vbox5">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkHBox" id="hbox2">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" id="label17">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Half width punctuations:</property>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="HalfWidthPuncts">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">&#x25CF;</property>
-                        <property name="text" translatable="yes">+-*/=%</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
                 <property name="position">4</property>
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label19">
+              <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">About</property>
               </object>
diff --git a/setup/main.py b/setup/main.py
index ac18d66..fed0c83 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -117,7 +117,6 @@ class PreferencesDialog:
         self.__comma_period_page = self.__builder.get_object("CommaPeriodPage")
         self.__auto_commit = self.__builder.get_object("AutoCommit")
         self.__trad_candidate = self.__builder.get_object("TradCandidate")
-        self.__half_width_puncts = self.__builder.get_object("HalfWidthPuncts")
 
         # read values
         self.__lookup_table_orientation.set_active(self.__get_value("LookupTableOrientation", 0))
@@ -127,7 +126,6 @@ class PreferencesDialog:
         self.__comma_period_page.set_active(self.__get_value("CommaPeriodPage", True))
         self.__auto_commit.set_active(self.__get_value("AutoCommit", False))
         self.__trad_candidate.set_active(self.__get_value("TradCandidate", False))
-        self.__half_width_puncts.set_text(self.__get_value("HalfWidthPuncts", "+-*/=%"))
 
         # connect signals
         def __lookup_table_page_size_changed_cb(adjustment):
@@ -148,7 +146,6 @@ class PreferencesDialog:
         def __entry_activate_cb(widget, name):
             text = widget.get_text()
             self.__set_value(name, text)
-        self.__half_width_puncts.connect("activate", __entry_activate_cb, "HalfWidthPuncts")
 
     def __init_correct_pinyin(self):
         # auto correct
diff --git a/src/SpecialPhraseTable.cc b/src/SpecialPhraseTable.cc
index 28ade93..c4dc71e 100644
--- a/src/SpecialPhraseTable.cc
+++ b/src/SpecialPhraseTable.cc
@@ -23,7 +23,7 @@ private:
 SpecialPhraseTable::SpecialPhraseTable (void)
 {
     gchar * path = g_build_filename (g_get_user_config_dir (),
-                        "ibus", "ibus-pinyin", "phrases.txt", NULL);
+                        "ibus", "pinyin", "phrases.txt", NULL);
 
     load ("phrases.txt") ||
     load (path) ||
-- 
2.7.4