update po

5 files changed, 1319 insertions, 821 deletions

diff --git a/po/fr.po b/po/fr.po
index 2c6c9bd..531daf1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-19 21:21+0100\n"
+"POT-Creation-Date: 2012-12-18 12:06+0800\n"
 "PO-Revision-Date: 2012-03-19 22:13+0100\n"
 "Last-Translator: Ma Jiehong <ma.jiehong@gmail.com>\n"
 "Language-Team: French\n"
@@ -18,52 +18,132 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/PYMain.cc:95
-msgid "Pinyin input method"
+#: ../src/PYMain.cc:103
+#, fuzzy
+msgid "Libpinyin input method"
 msgstr "Méthode de saisie Pinyin"
 
-#: ../src/PYMain.cc:104
-msgid "Pinyin (debug)"
+#: ../src/PYMain.cc:113
+#, fuzzy
+msgid "Intelligent Pinyin (debug)"
 msgstr "Pinyin (débug)"
 
-#: ../src/PYMain.cc:105
-msgid "Pinyin input method (debug)"
+#: ../src/PYMain.cc:114
+#, fuzzy
+msgid "Intelligent Pinyin input method (debug)"
 msgstr "Méthode de saisie Pinyin (débug)"
 
-#: ../src/PYMain.cc:114
-msgid "Bopomofo (debug)"
+#: ../src/PYMain.cc:124
+#, fuzzy
+msgid "Intelligent Bopomofo (debug)"
 msgstr "Bopomofo (débug)"
 
-#: ../src/PYMain.cc:115
-msgid "Bopomofo input method (debug)"
+#: ../src/PYMain.cc:125
+#, fuzzy
+msgid "Intelligent Bopomofo input method (debug)"
 msgstr "Méthode de saisie Bopomofo (débug)"
 
-#: ../src/PYPinyinProperties.cc:42 ../setup/ibus-libpinyin-preferences.ui.h:5
+#: ../src/PYPinyinProperties.cc:39 ../src/PYPinyinProperties.cc:99
+#: ../setup/ibus-libpinyin-preferences.ui.h:5
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ../src/PYPinyinProperties.cc:49
-msgid "Full/Half width"
-msgstr "Chasse"
+#: ../src/PYPinyinProperties.cc:40 ../src/PYPinyinProperties.cc:100
+#: ../setup/ibus-libpinyin-preferences.ui.h:6
+msgid "English"
+msgstr "Anglais"
+
+#: ../src/PYPinyinProperties.cc:45 ../src/PYPinyinProperties.cc:105
+msgid "Switch to English Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:46 ../src/PYPinyinProperties.cc:106
+msgid "Switch to Chinese Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:50 ../src/PYPinyinProperties.cc:118
+msgid "Full Width Letter"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:51 ../src/PYPinyinProperties.cc:119
+msgid "Half Width Letter"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:56 ../src/PYPinyinProperties.cc:124
+msgid "Switch to Half Width Letter Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:57 ../src/PYPinyinProperties.cc:125
+msgid "Switch to Full Width Letter Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:61 ../src/PYPinyinProperties.cc:134
+#, fuzzy
+msgid "Full Width Punct"
+msgstr "Chasse de la ponctuation pleine/demie"
 
-#: ../src/PYPinyinProperties.cc:56
-msgid "Full/Half width punctuation"
+#: ../src/PYPinyinProperties.cc:62 ../src/PYPinyinProperties.cc:135
+#, fuzzy
+msgid "Half Width Punct"
 msgstr "Chasse de la ponctuation pleine/demie"
 
-#: ../src/PYPinyinProperties.cc:63
-msgid "Simplfied/Traditional Chinese"
+#: ../src/PYPinyinProperties.cc:67 ../src/PYPinyinProperties.cc:140
+#, fuzzy
+msgid "Switch to Half Width Punctuation Mode"
+msgstr "Chasse de la ponctuation pleine/demie"
+
+#: ../src/PYPinyinProperties.cc:68 ../src/PYPinyinProperties.cc:141
+#, fuzzy
+msgid "Switch to Full Width Punctuation Mode"
+msgstr "Chasse de la ponctuation pleine/demie"
+
+#: ../src/PYPinyinProperties.cc:72 ../src/PYPinyinProperties.cc:150
+#, fuzzy
+msgid "Simplified Chinese"
 msgstr "Chinois simplifié/traditionnel"
 
-#: ../src/PYPinyinProperties.cc:66 ../src/PYPinyinProperties.cc:68
+#: ../src/PYPinyinProperties.cc:73 ../src/PYPinyinProperties.cc:151
+#, fuzzy
+msgid "Traditional Chinese"
+msgstr "Chinois simplifié/traditionnel"
+
+#: ../src/PYPinyinProperties.cc:78 ../src/PYPinyinProperties.cc:156
+#, fuzzy
+msgid "Switch to Traditional Chinese Mode"
+msgstr "Chinois simplifié/traditionnel"
+
+#: ../src/PYPinyinProperties.cc:79 ../src/PYPinyinProperties.cc:157
+msgid "Switch to Simplfied Chinese Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:82 ../src/PYPinyinProperties.cc:84
 #: ../setup/ibus-libpinyin-preferences.ui.h:1
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../setup/main.py:382 ../setup/ibus-libpinyin-preferences.ui.h:50
-#, no-c-format, python-format
-msgid "<big><b>IBus Pinyin %s</b></big>"
+#: ../src/PYEnglishEditor.cc:610
+msgid "Please input the english word."
+msgstr ""
+
+#: ../src/PYStrokeEditor.cc:386
+msgid "Please use \"hspnz\" to input."
+msgstr ""
+
+#: ../setup/main2.py:349 ../setup/ibus-libpinyin-preferences.ui.h:51
+#, fuzzy, no-c-format, python-format
+msgid "<big><b>Intelligent Pinyin %s</b></big>"
 msgstr "<big><b>Ibus Pinyin %s</b></big>"
 
+#: ../setup/dicttreeview.py:37
+#, fuzzy
+msgid "GB Dictionary"
+msgstr "Dictionnaire"
+
+#: ../setup/dicttreeview.py:38
+#, fuzzy
+msgid "GBK Dictionary"
+msgstr "Dictionnaire"
+
 #: ../setup/ibus-libpinyin-preferences.ui.h:2
 msgid "Language:"
 msgstr "Langue :"
@@ -76,10 +156,6 @@ msgstr "Chasse :"
 msgid "Punctuations:"
 msgstr "Chasse de la ponctuation :"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:6
-msgid "English"
-msgstr "Anglais"
-
 #: ../setup/ibus-libpinyin-preferences.ui.h:7
 msgid "Full"
 msgstr "Pleine"
@@ -117,156 +193,164 @@ msgid "<b>UI</b>"
 msgstr "<b>UI<b/>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:16
+msgid "Dynamic adjust the candidates order."
+msgstr ""
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:17
+#, fuzzy
+msgid "<b>Candidates</b>"
+msgstr "<b>État initial</b>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:18
 msgid "General"
 msgstr "Général"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:17
+#: ../setup/ibus-libpinyin-preferences.ui.h:19
 msgid "Full pinyin"
 msgstr "Pinyin complet"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:18
+#: ../setup/ibus-libpinyin-preferences.ui.h:20
 msgid "Double pinyin"
 msgstr "Pinyin double"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:19
+#: ../setup/ibus-libpinyin-preferences.ui.h:21
 msgid "Show raw input of Double Pinyin"
 msgstr "Montrer le pinyin non formaté du pinyin double"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:20
+#: ../setup/ibus-libpinyin-preferences.ui.h:22
 msgid "Incomplete pinyin"
 msgstr "Pinyin incomplet"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:21
+#: ../setup/ibus-libpinyin-preferences.ui.h:23
 msgid "<b>Pinyin mode</b>"
 msgstr "<b>Mode Pinyin</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:22
+#: ../setup/ibus-libpinyin-preferences.ui.h:24
 msgid "[Shift] select candidate"
 msgstr "[Shift] sélectionne le candidat"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:23
+#: ../setup/ibus-libpinyin-preferences.ui.h:25
 msgid "[-] [=] flip page"
 msgstr "[-] [=] change de page"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:24
+#: ../setup/ibus-libpinyin-preferences.ui.h:26
 msgid "[,] [.] flip page"
 msgstr "[,] [.] change de page"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:25
+#: ../setup/ibus-libpinyin-preferences.ui.h:27
 msgid "Auto commit"
 msgstr "Validation automatique"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:26
+#: ../setup/ibus-libpinyin-preferences.ui.h:28
 msgid "<b>Input Custom</b>"
 msgstr "Personalisation"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:27
+#: ../setup/ibus-libpinyin-preferences.ui.h:29
 msgid "Enable correct pinyin"
 msgstr "Activer la correction automatique du pinyin"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:28
+#: ../setup/ibus-libpinyin-preferences.ui.h:30
 msgid "<b>Correct pinyin</b>"
 msgstr "Correction automatique du pinyin"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:29
+#: ../setup/ibus-libpinyin-preferences.ui.h:31
 msgid "Pinyin mode"
 msgstr "Mode Pinyin"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:30
+#: ../setup/ibus-libpinyin-preferences.ui.h:32
 msgid "Incomplete Bopomofo"
 msgstr "Bopomofo incomplet"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:31
+#: ../setup/ibus-libpinyin-preferences.ui.h:33
 msgid "Keyboard Mapping:"
 msgstr "Type de clavier :"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:32
+#: ../setup/ibus-libpinyin-preferences.ui.h:34
 msgid "<b>Bopomofo mode</b>"
 msgstr "<b>Mode Bopomofo</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:33
+#: ../setup/ibus-libpinyin-preferences.ui.h:35
 msgid "Selection Keys:"
 msgstr "Touches de sélection :"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:34
+#: ../setup/ibus-libpinyin-preferences.ui.h:36
 msgid "Enable Guidekey for Candidates Selection"
 msgstr "Activer le guide de sélection des candidats"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:35
+#: ../setup/ibus-libpinyin-preferences.ui.h:37
 msgid "Enable Auxiliary Select Keys F1 .. F10"
 msgstr "Activer les touches auxiliaires (F1…F10)"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:36
+#: ../setup/ibus-libpinyin-preferences.ui.h:38
 msgid "Enable Auxiliary Select Keys Numbers on Keypad"
 msgstr "Activer la sélection auxiliaire au pavé numérique"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:37
+#: ../setup/ibus-libpinyin-preferences.ui.h:39
 msgid "<b>Selection mode</b>"
 msgstr "<b>Mode de sélection</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:38
+#: ../setup/ibus-libpinyin-preferences.ui.h:40
 msgid "Feature of Enter key:"
 msgstr "Action de la toucher Entrer :"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:39
+#: ../setup/ibus-libpinyin-preferences.ui.h:41
 msgid "Commit first candidate"
 msgstr "Valider le premier candidat"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:40
+#: ../setup/ibus-libpinyin-preferences.ui.h:42
 msgid "Commit original text"
 msgstr "Valider le texte brut"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:41
+#: ../setup/ibus-libpinyin-preferences.ui.h:43
 msgid "<b>Other</b>"
 msgstr "Autre"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:42
+#: ../setup/ibus-libpinyin-preferences.ui.h:44
 msgid "Bopomofo mode"
 msgstr "Mode Bopomofo"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:43
+#: ../setup/ibus-libpinyin-preferences.ui.h:45
 msgid "Enable fuzzy syllable"
 msgstr "Activer les syllabes floues"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:44
+#: ../setup/ibus-libpinyin-preferences.ui.h:46
 msgid "Fuzzy syllable"
 msgstr "Syllabes floues"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:45
-msgid "Use custom phrases"
-msgstr "Utiliser des phrases personnalisées"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:46
-msgid "Edit custom phrases"
-msgstr "Éditer les phrases perso…"
-
 #: ../setup/ibus-libpinyin-preferences.ui.h:47
+msgid "Tips: this changes may take effects after ime restarted."
+msgstr ""
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:48
 msgid "<b>Dictionary option</b>"
 msgstr "<b>Dictionnaire</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:48
+#: ../setup/ibus-libpinyin-preferences.ui.h:49
 msgid "Dictionary"
 msgstr "Dictionnaire"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:51
-msgid "Pinyin input method for IBus"
-msgstr "Méthode de saisie Pinyin pour IBus"
-
 #: ../setup/ibus-libpinyin-preferences.ui.h:52
-msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
-msgstr "<small>Copyright (c) 2009-2010 Peng Huang</small>"
+#, fuzzy
+msgid "Intelligent Pinyin input method for IBus"
+msgstr "Méthode de saisie Pinyin pour IBus"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:53
-msgid "http://ibus.googlecode.com"
-msgstr "http://ibus.googlecode.com"
+#, fuzzy
+msgid "<small>Copyright (c) 2011-2012 Peng Wu</small>"
+msgstr "<small>Copyright (c) 2009-2010 Peng Huang</small>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:54
+msgid "https://github.com/libpinyin/ibus-libpinyin"
+msgstr ""
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:55
+#, fuzzy
 msgid ""
 "<small>\n"
 "<b>Authors:</b>\n"
+"Peng Wu\n"
 "Peng Huang\n"
 "BYVoid\n"
-"Peng Wu\n"
 "\n"
 "<b>Contributors:</b>\n"
 "koterpilla, Zerng07\n"
@@ -282,54 +366,66 @@ msgstr ""
 "koterpilla, Zerng07\n"
 "</small>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:63
+#: ../setup/ibus-libpinyin-preferences.ui.h:64
 msgid "About"
 msgstr "À propos"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:64
+#: ../setup/ibus-libpinyin-preferences.ui.h:65
 msgid "Standard"
 msgstr "Standard"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:65
+#: ../setup/ibus-libpinyin-preferences.ui.h:66
 msgid "GinYieh"
 msgstr "GinYieh"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:66
+#: ../setup/ibus-libpinyin-preferences.ui.h:67
 msgid "Eten"
 msgstr "Eten"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:67
+#: ../setup/ibus-libpinyin-preferences.ui.h:68
 msgid "IBM"
 msgstr "IBM"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:68
+#: ../setup/ibus-libpinyin-preferences.ui.h:69
 msgid "MSPY"
 msgstr "MSPY"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:69
+#: ../setup/ibus-libpinyin-preferences.ui.h:70
 msgid "ZRM"
 msgstr "ZRM"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:70
+#: ../setup/ibus-libpinyin-preferences.ui.h:71
 msgid "ABC"
 msgstr "ABC"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:71
+#: ../setup/ibus-libpinyin-preferences.ui.h:72
 msgid "ZGPY"
 msgstr "ZGPY"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:72
+#: ../setup/ibus-libpinyin-preferences.ui.h:73
 msgid "PYJJ"
 msgstr "PYJJ"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:73
+#: ../setup/ibus-libpinyin-preferences.ui.h:74
 msgid "XHE"
 msgstr "XHE"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:74
+#: ../setup/ibus-libpinyin-preferences.ui.h:75
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:75
+#: ../setup/ibus-libpinyin-preferences.ui.h:76
 msgid "Vertical"
 msgstr "Vertical"
+
+#~ msgid "Full/Half width"
+#~ msgstr "Chasse"
+
+#~ msgid "Use custom phrases"
+#~ msgstr "Utiliser des phrases personnalisées"
+
+#~ msgid "Edit custom phrases"
+#~ msgstr "Éditer les phrases perso…"
+
+#~ msgid "http://ibus.googlecode.com"
+#~ msgstr "http://ibus.googlecode.com"
diff --git a/po/ru.po b/po/ru.po
index f681b40..f3ce8af 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,328 +7,427 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 10:38+0800\n"
+"POT-Creation-Date: 2012-12-18 12:06+0800\n"
 "PO-Revision-Date: 2009-10-14 09:44+0300\n"
 "Last-Translator: Alexey Kotlyarov <koterpillar@gmail.com>\n"
 "Language-Team: Russian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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"
+"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/PYMain.cc:90
-msgid "Pinyin input method"
+#: ../src/PYMain.cc:103
+#, fuzzy
+msgid "Libpinyin input method"
 msgstr "Метод ввода пиньинь"
 
-#: ../src/PYMain.cc:99
+#: ../src/PYMain.cc:113
 #, fuzzy
-msgid "Pinyin (debug)"
+msgid "Intelligent Pinyin (debug)"
 msgstr "Пиньинь"
 
-#: ../src/PYMain.cc:100
+#: ../src/PYMain.cc:114
 #, fuzzy
-msgid "Pinyin input method (debug)"
+msgid "Intelligent Pinyin input method (debug)"
 msgstr "Метод ввода пиньинь"
 
-#: ../src/PYMain.cc:109
-msgid "Bopomofo (debug)"
+#: ../src/PYMain.cc:124
+msgid "Intelligent Bopomofo (debug)"
 msgstr ""
 
-#: ../src/PYMain.cc:110
+#: ../src/PYMain.cc:125
 #, fuzzy
-msgid "Bopomofo input method (debug)"
+msgid "Intelligent Bopomofo input method (debug)"
 msgstr "Метод ввода пиньинь"
 
-#: ../src/PYPinyinProperties.cc:42 ../setup/ibus-libpinyin-preferences.ui.h:24
+#: ../src/PYPinyinProperties.cc:39 ../src/PYPinyinProperties.cc:99
+#: ../setup/ibus-libpinyin-preferences.ui.h:5
 msgid "Chinese"
 msgstr "Китайский"
 
-#: ../src/PYPinyinProperties.cc:49
-msgid "Full/Half width"
-msgstr "Полная/половинная ширина"
+#: ../src/PYPinyinProperties.cc:40 ../src/PYPinyinProperties.cc:100
+#: ../setup/ibus-libpinyin-preferences.ui.h:6
+msgid "English"
+msgstr "Английский"
+
+#: ../src/PYPinyinProperties.cc:45 ../src/PYPinyinProperties.cc:105
+msgid "Switch to English Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:46 ../src/PYPinyinProperties.cc:106
+msgid "Switch to Chinese Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:50 ../src/PYPinyinProperties.cc:118
+msgid "Full Width Letter"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:51 ../src/PYPinyinProperties.cc:119
+msgid "Half Width Letter"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:56 ../src/PYPinyinProperties.cc:124
+msgid "Switch to Half Width Letter Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:57 ../src/PYPinyinProperties.cc:125
+msgid "Switch to Full Width Letter Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:61 ../src/PYPinyinProperties.cc:134
+#, fuzzy
+msgid "Full Width Punct"
+msgstr "Знаки препинания полной/половинной ширины"
+
+#: ../src/PYPinyinProperties.cc:62 ../src/PYPinyinProperties.cc:135
+#, fuzzy
+msgid "Half Width Punct"
+msgstr "Знаки препинания половинной ширины:"
 
-#: ../src/PYPinyinProperties.cc:56
-msgid "Full/Half width punctuation"
+#: ../src/PYPinyinProperties.cc:67 ../src/PYPinyinProperties.cc:140
+#, fuzzy
+msgid "Switch to Half Width Punctuation Mode"
+msgstr "Знаки препинания половинной ширины:"
+
+#: ../src/PYPinyinProperties.cc:68 ../src/PYPinyinProperties.cc:141
+#, fuzzy
+msgid "Switch to Full Width Punctuation Mode"
 msgstr "Знаки препинания полной/половинной ширины"
 
-#: ../src/PYPinyinProperties.cc:63
-msgid "Simplfied/Traditional Chinese"
+#: ../src/PYPinyinProperties.cc:72 ../src/PYPinyinProperties.cc:150
+#, fuzzy
+msgid "Simplified Chinese"
 msgstr "Упрощенные/традиционные иероглифы"
 
-#: ../src/PYPinyinProperties.cc:66 ../src/PYPinyinProperties.cc:68
-#: ../setup/ibus-libpinyin-preferences.ui.h:55
+#: ../src/PYPinyinProperties.cc:73 ../src/PYPinyinProperties.cc:151
+#, fuzzy
+msgid "Traditional Chinese"
+msgstr "Упрощенные/традиционные иероглифы"
+
+#: ../src/PYPinyinProperties.cc:78 ../src/PYPinyinProperties.cc:156
+#, fuzzy
+msgid "Switch to Traditional Chinese Mode"
+msgstr "Упрощенные/традиционные иероглифы"
+
+#: ../src/PYPinyinProperties.cc:79 ../src/PYPinyinProperties.cc:157
+msgid "Switch to Simplfied Chinese Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:82 ../src/PYPinyinProperties.cc:84
+#: ../setup/ibus-libpinyin-preferences.ui.h:1
 #, fuzzy
 msgid "Preferences"
 msgstr "Настройки пиньиня"
 
-#: ../setup/main.py:377 ../setup/ibus-libpinyin-preferences.ui.h:10
-#, no-c-format, python-format
-msgid "<big><b>IBus Pinyin %s</b></big>"
+#: ../src/PYEnglishEditor.cc:610
+msgid "Please input the english word."
+msgstr ""
+
+#: ../src/PYStrokeEditor.cc:386
+msgid "Please use \"hspnz\" to input."
+msgstr ""
+
+#: ../setup/main2.py:349 ../setup/ibus-libpinyin-preferences.ui.h:51
+#, fuzzy, no-c-format, python-format
+msgid "<big><b>Intelligent Pinyin %s</b></big>"
 msgstr "<big><b>IBus Пиньинь %s</b></big>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:1
-#, fuzzy
-msgid "<b>Bopomofo mode</b>"
-msgstr "<b>Пиньинь</b>"
+#: ../setup/dicttreeview.py:37
+msgid "GB Dictionary"
+msgstr ""
+
+#: ../setup/dicttreeview.py:38
+msgid "GBK Dictionary"
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:2
-#, fuzzy
-msgid "<b>Correct pinyin</b>"
-msgstr "Исправления"
+msgid "Language:"
+msgstr "Язык:"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:3
-#, fuzzy
-msgid "<b>Dictionary option</b>"
-msgstr "<b>Другие</b>"
+msgid "Half/full width:"
+msgstr "Полная/половинная ширина:"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:4
-msgid "<b>Initial state</b>"
-msgstr "<b>Начальное состояние</b>"
+msgid "Punctuations:"
+msgstr "Знаки препинания:"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:5
-#, fuzzy
-msgid "<b>Input Custom</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:7
+msgid "Full"
+msgstr "Полная"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:8
+msgid "Half"
+msgstr "Половинная"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:9
+msgid "Chinese:"
+msgstr "Иероглифы:"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:10
+msgid "Simplified"
+msgstr "Упрощенные"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:11
+msgid "Traditional"
+msgstr "Традиционные"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:12
+msgid "<b>Initial state</b>"
 msgstr "<b>Начальное состояние</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:6
-#, fuzzy
-msgid "<b>Pinyin mode</b>"
-msgstr "<b>Пиньинь</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:13
+msgid "Orientation of candidates:"
+msgstr "Число кандидатов"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:7
-#, fuzzy
-msgid "<b>Selection mode</b>"
-msgstr "<b>Пиньинь</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:14
+msgid "Number of candidates:"
+msgstr "Число кандидатов"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:8
+#: ../setup/ibus-libpinyin-preferences.ui.h:15
 #, fuzzy
 msgid "<b>UI</b>"
 msgstr "<b>Другие</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:11
-msgid ""
-"<small>\n"
-"<b>Authors:</b>\n"
-"Peng Huang\n"
-"BYVoid\n"
-"\n"
-"<b>Contributors:</b>\n"
-"koterpilla, Zerng07\n"
-"</small>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:16
+msgid "Dynamic adjust the candidates order."
 msgstr ""
 
+#: ../setup/ibus-libpinyin-preferences.ui.h:17
+#, fuzzy
+msgid "<b>Candidates</b>"
+msgstr "<b>Другие</b>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:18
+msgid "General"
+msgstr "Общие"
+
 #: ../setup/ibus-libpinyin-preferences.ui.h:19
-msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
-msgstr ""
+msgid "Full pinyin"
+msgstr "Полный пиньинь"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:20
-msgid "ABC"
-msgstr "ABC"
+msgid "Double pinyin"
+msgstr "Двойной пиньинь"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:21
-msgid "About"
-msgstr "О программе"
+msgid "Show raw input of Double Pinyin"
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:22
-msgid "Auto commit"
-msgstr "Автоматически подтверждать фразу"
+msgid "Incomplete pinyin"
+msgstr "Неполный пиньинь"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:23
 #, fuzzy
-msgid "Bopomofo mode"
-msgstr "Метод ввода пиньинь"
+msgid "<b>Pinyin mode</b>"
+msgstr "<b>Пиньинь</b>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:24
+msgid "[Shift] select candidate"
+msgstr "Использовать [Shift] для выбора кандидатов"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:25
-msgid "Chinese:"
-msgstr "Иероглифы:"
+msgid "[-] [=] flip page"
+msgstr "Использовать клавиши [-] [=] для переключения страниц"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:26
-msgid "Dictionary"
-msgstr ""
+msgid "[,] [.] flip page"
+msgstr "Использовать клавиши [,] [.] для переключения страниц"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:27
-msgid "Double pinyin"
-msgstr "Двойной пиньинь"
+msgid "Auto commit"
+msgstr "Автоматически подтверждать фразу"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:28
-msgid "Edit custom phrases"
-msgstr ""
+#, fuzzy
+msgid "<b>Input Custom</b>"
+msgstr "<b>Начальное состояние</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:29
-msgid "Enable Auxiliary Select Keys F1 .. F10"
-msgstr ""
+#, fuzzy
+msgid "Enable correct pinyin"
+msgstr "Исправления"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:30
-msgid "Enable Auxiliary Select Keys Numbers on Keypad"
-msgstr ""
+#, fuzzy
+msgid "<b>Correct pinyin</b>"
+msgstr "Исправления"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:31
-msgid "Enable Guidekey for Candidates Selection"
-msgstr ""
+#, fuzzy
+msgid "Pinyin mode"
+msgstr "<b>Пиньинь</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:32
 #, fuzzy
-msgid "Enable correct pinyin"
-msgstr "Исправления"
+msgid "Incomplete Bopomofo"
+msgstr "Неполный пиньинь"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:33
-#, fuzzy
-msgid "Enable fuzzy syllable"
-msgstr "Включить нечеткий пиньинь."
+msgid "Keyboard Mapping:"
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:34
-msgid "English"
-msgstr "Английский"
+#, fuzzy
+msgid "<b>Bopomofo mode</b>"
+msgstr "<b>Пиньинь</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:35
-msgid "Eten"
+msgid "Selection Keys:"
 msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:36
-msgid "Full"
-msgstr "Полная"
+msgid "Enable Guidekey for Candidates Selection"
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:37
-msgid "Full pinyin"
-msgstr "Полный пиньинь"
+msgid "Enable Auxiliary Select Keys F1 .. F10"
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:38
-msgid "Fuzzy syllable"
+msgid "Enable Auxiliary Select Keys Numbers on Keypad"
 msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:39
-msgid "General"
-msgstr "Общие"
+#, fuzzy
+msgid "<b>Selection mode</b>"
+msgstr "<b>Пиньинь</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:40
-msgid "GinYieh"
+msgid "Feature of Enter key:"
 msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:41
-msgid "Half"
-msgstr "Половинная"
+#, fuzzy
+msgid "Commit first candidate"
+msgstr "Использовать [Shift] для выбора кандидатов"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:42
-msgid "Half/full width:"
-msgstr "Полная/половинная ширина:"
+msgid "Commit original text"
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:43
-msgid "Horizontal"
-msgstr ""
+#, fuzzy
+msgid "<b>Other</b>"
+msgstr "<b>Другие</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:44
-msgid "IBM"
-msgstr ""
+#, fuzzy
+msgid "Bopomofo mode"
+msgstr "Метод ввода пиньинь"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:45
 #, fuzzy
-msgid "Incomplete Bopomofo"
-msgstr "Неполный пиньинь"
+msgid "Enable fuzzy syllable"
+msgstr "Включить нечеткий пиньинь."
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:46
-msgid "Incomplete pinyin"
-msgstr "Неполный пиньинь"
+msgid "Fuzzy syllable"
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:47
-msgid "Keyboard Mapping:"
+msgid "Tips: this changes may take effects after ime restarted."
 msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:48
-msgid "Language:"
-msgstr "Язык:"
+#, fuzzy
+msgid "<b>Dictionary option</b>"
+msgstr "<b>Другие</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:49
-msgid "MSPY"
-msgstr "MSPY"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:50
-msgid "Number of candidates:"
-msgstr "Число кандидатов"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:51
-msgid "Orientation of candidates:"
-msgstr "Число кандидатов"
+msgid "Dictionary"
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:52
-msgid "PYJJ"
-msgstr "PYJJ"
+#, fuzzy
+msgid "Intelligent Pinyin input method for IBus"
+msgstr "Метод ввода пиньинь для IBus"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:53
-msgid "Pinyin input method for IBus"
-msgstr "Метод ввода пиньинь для IBus"
+msgid "<small>Copyright (c) 2011-2012 Peng Wu</small>"
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:54
-#, fuzzy
-msgid "Pinyin mode"
-msgstr "<b>Пиньинь</b>"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:56
-msgid "Punctuations:"
-msgstr "Знаки препинания:"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:57
-msgid "Selection Keys:"
+msgid "https://github.com/libpinyin/ibus-libpinyin"
 msgstr ""
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:58
-msgid "Show raw input of Double Pinyin"
+#: ../setup/ibus-libpinyin-preferences.ui.h:55
+msgid ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Wu\n"
+"Peng Huang\n"
+"BYVoid\n"
+"\n"
+"<b>Contributors:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
 msgstr ""
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:59
-msgid "Simplified"
-msgstr "Упрощенные"
+#: ../setup/ibus-libpinyin-preferences.ui.h:64
+msgid "About"
+msgstr "О программе"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:60
+#: ../setup/ibus-libpinyin-preferences.ui.h:65
 msgid "Standard"
 msgstr ""
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:61
-msgid "Traditional"
-msgstr "Традиционные"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:62
-msgid "Use custom phrases"
+#: ../setup/ibus-libpinyin-preferences.ui.h:66
+msgid "GinYieh"
 msgstr ""
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:63
-msgid "Vertical"
+#: ../setup/ibus-libpinyin-preferences.ui.h:67
+msgid "Eten"
 msgstr ""
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:64
-msgid "XHE"
+#: ../setup/ibus-libpinyin-preferences.ui.h:68
+msgid "IBM"
 msgstr ""
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:65
-msgid "ZGPY"
-msgstr "ZGPY"
+#: ../setup/ibus-libpinyin-preferences.ui.h:69
+msgid "MSPY"
+msgstr "MSPY"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:66
+#: ../setup/ibus-libpinyin-preferences.ui.h:70
 msgid "ZRM"
 msgstr "ZRM"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:67
-msgid "[,] [.] flip page"
-msgstr "Использовать клавиши [,] [.] для переключения страниц"
+#: ../setup/ibus-libpinyin-preferences.ui.h:71
+msgid "ABC"
+msgstr "ABC"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:68
-msgid "[-] [=] flip page"
-msgstr "Использовать клавиши [-] [=] для переключения страниц"
+#: ../setup/ibus-libpinyin-preferences.ui.h:72
+msgid "ZGPY"
+msgstr "ZGPY"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:69
-msgid "[Shift] select candidate"
-msgstr "Использовать [Shift] для выбора кандидатов"
+#: ../setup/ibus-libpinyin-preferences.ui.h:73
+msgid "PYJJ"
+msgstr "PYJJ"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:70
-msgid "http://ibus.googlecode.com"
-msgstr "http://ibus.googlecode.com"
+#: ../setup/ibus-libpinyin-preferences.ui.h:74
+msgid "XHE"
+msgstr ""
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:75
+msgid "Horizontal"
+msgstr ""
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:76
+msgid "Vertical"
+msgstr ""
+
+#~ msgid "Full/Half width"
+#~ msgstr "Полная/половинная ширина"
+
+#~ msgid "http://ibus.googlecode.com"
+#~ msgstr "http://ibus.googlecode.com"
 
 #~ msgid "Pinyin preferences"
 #~ msgstr "Настройки пиньиня"
 
-#~ msgid "<b>Others</b>"
-#~ msgstr "<b>Другие</b>"
-
 #~ msgid "Enable incomplete pinyin (like zh g)."
 #~ msgstr "Включить неполный пиньинь (например, zh g)."
 
@@ -395,6 +494,3 @@ 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 061ddf3..92f3ac6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,320 +7,422 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus-libpinyin 1.2.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 10:38+0800\n"
+"POT-Creation-Date: 2012-12-18 12:06+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/PYMain.cc:90
-msgid "Pinyin input method"
+#: ../src/PYMain.cc:103
+#, fuzzy
+msgid "Libpinyin input method"
 msgstr "拼音输入法"
 
-#: ../src/PYMain.cc:99
-msgid "Pinyin (debug)"
+#: ../src/PYMain.cc:113
+#, fuzzy
+msgid "Intelligent Pinyin (debug)"
 msgstr "拼音（调试）"
 
-#: ../src/PYMain.cc:100
-msgid "Pinyin input method (debug)"
+#: ../src/PYMain.cc:114
+#, fuzzy
+msgid "Intelligent Pinyin input method (debug)"
 msgstr "拼音输入法（调试）"
 
-#: ../src/PYMain.cc:109
-msgid "Bopomofo (debug)"
+#: ../src/PYMain.cc:124
+#, fuzzy
+msgid "Intelligent Bopomofo (debug)"
 msgstr "注音（调试）"
 
-#: ../src/PYMain.cc:110
-msgid "Bopomofo input method (debug)"
+#: ../src/PYMain.cc:125
+#, fuzzy
+msgid "Intelligent Bopomofo input method (debug)"
 msgstr "注音输入法（调试）"
 
-#: ../src/PYPinyinProperties.cc:42 ../setup/ibus-libpinyin-preferences.ui.h:24
+#: ../src/PYPinyinProperties.cc:39 ../src/PYPinyinProperties.cc:99
+#: ../setup/ibus-libpinyin-preferences.ui.h:5
 msgid "Chinese"
 msgstr "中文"
 
-#: ../src/PYPinyinProperties.cc:49
-msgid "Full/Half width"
-msgstr "全角/半角"
+#: ../src/PYPinyinProperties.cc:40 ../src/PYPinyinProperties.cc:100
+#: ../setup/ibus-libpinyin-preferences.ui.h:6
+msgid "English"
+msgstr "英文"
+
+#: ../src/PYPinyinProperties.cc:45 ../src/PYPinyinProperties.cc:105
+msgid "Switch to English Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:46 ../src/PYPinyinProperties.cc:106
+msgid "Switch to Chinese Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:50 ../src/PYPinyinProperties.cc:118
+msgid "Full Width Letter"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:51 ../src/PYPinyinProperties.cc:119
+msgid "Half Width Letter"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:56 ../src/PYPinyinProperties.cc:124
+msgid "Switch to Half Width Letter Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:57 ../src/PYPinyinProperties.cc:125
+msgid "Switch to Full Width Letter Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:61 ../src/PYPinyinProperties.cc:134
+#, fuzzy
+msgid "Full Width Punct"
+msgstr "半角符号"
+
+#: ../src/PYPinyinProperties.cc:62 ../src/PYPinyinProperties.cc:135
+#, fuzzy
+msgid "Half Width Punct"
+msgstr "半角符号"
+
+#: ../src/PYPinyinProperties.cc:67 ../src/PYPinyinProperties.cc:140
+#, fuzzy
+msgid "Switch to Half Width Punctuation Mode"
+msgstr "半角符号"
 
-#: ../src/PYPinyinProperties.cc:56
-msgid "Full/Half width punctuation"
+#: ../src/PYPinyinProperties.cc:68 ../src/PYPinyinProperties.cc:141
+#, fuzzy
+msgid "Switch to Full Width Punctuation Mode"
 msgstr "半角符号"
 
-#: ../src/PYPinyinProperties.cc:63
-msgid "Simplfied/Traditional Chinese"
+#: ../src/PYPinyinProperties.cc:72 ../src/PYPinyinProperties.cc:150
+#, fuzzy
+msgid "Simplified Chinese"
 msgstr "简体/繁体中文"
 
-#: ../src/PYPinyinProperties.cc:66 ../src/PYPinyinProperties.cc:68
-#: ../setup/ibus-libpinyin-preferences.ui.h:55
+#: ../src/PYPinyinProperties.cc:73 ../src/PYPinyinProperties.cc:151
+#, fuzzy
+msgid "Traditional Chinese"
+msgstr "简体/繁体中文"
+
+#: ../src/PYPinyinProperties.cc:78 ../src/PYPinyinProperties.cc:156
+#, fuzzy
+msgid "Switch to Traditional Chinese Mode"
+msgstr "简体/繁体中文"
+
+#: ../src/PYPinyinProperties.cc:79 ../src/PYPinyinProperties.cc:157
+msgid "Switch to Simplfied Chinese Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:82 ../src/PYPinyinProperties.cc:84
+#: ../setup/ibus-libpinyin-preferences.ui.h:1
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../setup/main.py:377 ../setup/ibus-libpinyin-preferences.ui.h:10
-#, no-c-format, python-format
-msgid "<big><b>IBus Pinyin %s</b></big>"
+#: ../src/PYEnglishEditor.cc:610
+msgid "Please input the english word."
+msgstr ""
+
+#: ../src/PYStrokeEditor.cc:386
+msgid "Please use \"hspnz\" to input."
+msgstr ""
+
+#: ../setup/main2.py:349 ../setup/ibus-libpinyin-preferences.ui.h:51
+#, fuzzy, no-c-format, python-format
+msgid "<big><b>Intelligent Pinyin %s</b></big>"
 msgstr "<big><b>IBus 拼音 %s</b></big>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:1
-msgid "<b>Bopomofo mode</b>"
-msgstr "<b>注音模式</b>"
+#: ../setup/dicttreeview.py:37
+#, fuzzy
+msgid "GB Dictionary"
+msgstr "词典"
+
+#: ../setup/dicttreeview.py:38
+#, fuzzy
+msgid "GBK Dictionary"
+msgstr "词典"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:2
-msgid "<b>Correct pinyin</b>"
-msgstr "<b>拼音纠错</b>"
+msgid "Language:"
+msgstr "语言："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:3
-msgid "<b>Dictionary option</b>"
-msgstr "<b>词典选项</b>"
+msgid "Half/full width:"
+msgstr "全角/半角："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:4
+msgid "Punctuations:"
+msgstr "标点符号："
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:7
+msgid "Full"
+msgstr "全角"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:8
+msgid "Half"
+msgstr "半角"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:9
+msgid "Chinese:"
+msgstr "中文："
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:10
+msgid "Simplified"
+msgstr "简体"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:11
+msgid "Traditional"
+msgstr "繁体"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:12
 msgid "<b>Initial state</b>"
 msgstr "<b>初始状态</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:5
-msgid "<b>Input Custom</b>"
-msgstr "<b>输入</b>"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:6
-msgid "<b>Pinyin mode</b>"
-msgstr "<b>拼音模式</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:13
+msgid "Orientation of candidates:"
+msgstr "候选词排列方向："
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:7
-msgid "<b>Selection mode</b>"
-msgstr "<b>选词模式</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:14
+msgid "Number of candidates:"
+msgstr "每页显示候选词数："
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:8
+#: ../setup/ibus-libpinyin-preferences.ui.h:15
 msgid "<b>UI</b>"
 msgstr "<b>外观</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:11
-msgid ""
-"<small>\n"
-"<b>Authors:</b>\n"
-"Peng Huang\n"
-"BYVoid\n"
-"\n"
-"<b>Contributors:</b>\n"
-"koterpilla, Zerng07\n"
-"</small>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:16
+msgid "Dynamic adjust the candidates order."
 msgstr ""
-"<small>\n"
-"<b>作者:</b>\n"
-"Peng Huang\n"
-"BYVoid\n"
-"\n"
-"<b>贡献者:</b>\n"
-"koterpilla, Zerng07\n"
-"</small>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:17
+#, fuzzy
+msgid "<b>Candidates</b>"
+msgstr "<b>初始状态</b>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:18
+msgid "General"
+msgstr "常规"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:19
-msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
-msgstr "<small>版权所有 (c) 2009-2010 黄鹏</small>"
+msgid "Full pinyin"
+msgstr "全拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:20
-msgid "ABC"
-msgstr "智能ABC"
+msgid "Double pinyin"
+msgstr "双拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:21
-msgid "About"
-msgstr "关于"
+msgid "Show raw input of Double Pinyin"
+msgstr "显示双拼原始输入"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:22
-msgid "Auto commit"
-msgstr "自动上词"
+msgid "Incomplete pinyin"
+msgstr "简拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:23
-msgid "Bopomofo mode"
-msgstr "注音模式"
+msgid "<b>Pinyin mode</b>"
+msgstr "<b>拼音模式</b>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:24
+msgid "[Shift] select candidate"
+msgstr "[Shift]键选词"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:25
-msgid "Chinese:"
-msgstr "中文："
+msgid "[-] [=] flip page"
+msgstr "[-][=]键翻页"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:26
-msgid "Dictionary"
-msgstr "词典"
+msgid "[,] [.] flip page"
+msgstr "[,][.]键翻页"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:27
-msgid "Double pinyin"
-msgstr "双拼"
+msgid "Auto commit"
+msgstr "自动上词"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:28
-msgid "Edit custom phrases"
-msgstr "编辑自定义词组"
+msgid "<b>Input Custom</b>"
+msgstr "<b>输入</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:29
-msgid "Enable Auxiliary Select Keys F1 .. F10"
-msgstr "启用辅助选词键F1 .. F10"
+msgid "Enable correct pinyin"
+msgstr "启动拼音纠错"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:30
-msgid "Enable Auxiliary Select Keys Numbers on Keypad"
-msgstr "启用数字键盘辅助选词键"
+msgid "<b>Correct pinyin</b>"
+msgstr "<b>拼音纠错</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:31
-msgid "Enable Guidekey for Candidates Selection"
-msgstr "启用选词引导键"
+msgid "Pinyin mode"
+msgstr "拼音模式"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:32
-msgid "Enable correct pinyin"
-msgstr "启动拼音纠错"
+msgid "Incomplete Bopomofo"
+msgstr "简拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:33
-msgid "Enable fuzzy syllable"
-msgstr "启动模糊音"
+msgid "Keyboard Mapping:"
+msgstr "键盘映射："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:34
-msgid "English"
-msgstr "英文"
+msgid "<b>Bopomofo mode</b>"
+msgstr "<b>注音模式</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:35
-msgid "Eten"
-msgstr "倚天"
+msgid "Selection Keys:"
+msgstr "选词键："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:36
-msgid "Full"
-msgstr "全角"
+msgid "Enable Guidekey for Candidates Selection"
+msgstr "启用选词引导键"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:37
-msgid "Full pinyin"
-msgstr "全拼"
+msgid "Enable Auxiliary Select Keys F1 .. F10"
+msgstr "启用辅助选词键F1 .. F10"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:38
-msgid "Fuzzy syllable"
-msgstr "模糊音"
+msgid "Enable Auxiliary Select Keys Numbers on Keypad"
+msgstr "启用数字键盘辅助选词键"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:39
-msgid "General"
-msgstr "常规"
+msgid "<b>Selection mode</b>"
+msgstr "<b>选词模式</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:40
-msgid "GinYieh"
-msgstr "精业"
+msgid "Feature of Enter key:"
+msgstr "Enter 键功能："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:41
-msgid "Half"
-msgstr "半角"
+msgid "Commit first candidate"
+msgstr "输出第一个候选词"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:42
-msgid "Half/full width:"
-msgstr "全角/半角："
+msgid "Commit original text"
+msgstr "输出原本的英文字"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:43
-msgid "Horizontal"
-msgstr "水平"
+msgid "<b>Other</b>"
+msgstr "<b>其他</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:44
-msgid "IBM"
-msgstr "IBM"
+msgid "Bopomofo mode"
+msgstr "注音模式"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:45
-msgid "Incomplete Bopomofo"
-msgstr "简拼"
+msgid "Enable fuzzy syllable"
+msgstr "启动模糊音"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:46
-msgid "Incomplete pinyin"
-msgstr "简拼"
+msgid "Fuzzy syllable"
+msgstr "模糊音"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:47
-msgid "Keyboard Mapping:"
-msgstr "键盘映射："
+msgid "Tips: this changes may take effects after ime restarted."
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:48
-msgid "Language:"
-msgstr "语言："
+msgid "<b>Dictionary option</b>"
+msgstr "<b>词典选项</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:49
-msgid "MSPY"
-msgstr "微软拼音"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:50
-msgid "Number of candidates:"
-msgstr "每页显示候选词数："
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:51
-msgid "Orientation of candidates:"
-msgstr "候选词排列方向："
+msgid "Dictionary"
+msgstr "词典"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:52
-msgid "PYJJ"
-msgstr "拼音加加"
+#, fuzzy
+msgid "Intelligent Pinyin input method for IBus"
+msgstr "IBus 拼音输入法"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:53
-msgid "Pinyin input method for IBus"
-msgstr "IBus 拼音输入法"
+#, fuzzy
+msgid "<small>Copyright (c) 2011-2012 Peng Wu</small>"
+msgstr "<small>版权所有 (c) 2009-2010 黄鹏</small>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:54
-msgid "Pinyin mode"
-msgstr "拼音模式"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:56
-msgid "Punctuations:"
-msgstr "标点符号："
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:57
-msgid "Selection Keys:"
-msgstr "选词键："
+msgid "https://github.com/libpinyin/ibus-libpinyin"
+msgstr ""
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:58
-msgid "Show raw input of Double Pinyin"
-msgstr "显示双拼原始输入"
+#: ../setup/ibus-libpinyin-preferences.ui.h:55
+#, fuzzy
+msgid ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Wu\n"
+"Peng Huang\n"
+"BYVoid\n"
+"\n"
+"<b>Contributors:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
+msgstr ""
+"<small>\n"
+"<b>作者:</b>\n"
+"Peng Huang\n"
+"BYVoid\n"
+"\n"
+"<b>贡献者:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:59
-msgid "Simplified"
-msgstr "简体"
+#: ../setup/ibus-libpinyin-preferences.ui.h:64
+msgid "About"
+msgstr "关于"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:60
+#: ../setup/ibus-libpinyin-preferences.ui.h:65
 msgid "Standard"
 msgstr "标准"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:61
-msgid "Traditional"
-msgstr "繁体"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:62
-msgid "Use custom phrases"
-msgstr "使用自定义词组"
+#: ../setup/ibus-libpinyin-preferences.ui.h:66
+msgid "GinYieh"
+msgstr "精业"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:63
-msgid "Vertical"
-msgstr "竖直"
+#: ../setup/ibus-libpinyin-preferences.ui.h:67
+msgid "Eten"
+msgstr "倚天"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:64
-msgid "XHE"
-msgstr "小鹤"
+#: ../setup/ibus-libpinyin-preferences.ui.h:68
+msgid "IBM"
+msgstr "IBM"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:65
-msgid "ZGPY"
-msgstr "紫光拼音"
+#: ../setup/ibus-libpinyin-preferences.ui.h:69
+msgid "MSPY"
+msgstr "微软拼音"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:66
+#: ../setup/ibus-libpinyin-preferences.ui.h:70
 msgid "ZRM"
 msgstr "自然码"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:67
-msgid "[,] [.] flip page"
-msgstr "[,][.]键翻页"
+#: ../setup/ibus-libpinyin-preferences.ui.h:71
+msgid "ABC"
+msgstr "智能ABC"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:68
-msgid "[-] [=] flip page"
-msgstr "[-][=]键翻页"
+#: ../setup/ibus-libpinyin-preferences.ui.h:72
+msgid "ZGPY"
+msgstr "紫光拼音"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:69
-msgid "[Shift] select candidate"
-msgstr "[Shift]键选词"
+#: ../setup/ibus-libpinyin-preferences.ui.h:73
+msgid "PYJJ"
+msgstr "拼音加加"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:70
-msgid "http://ibus.googlecode.com"
-msgstr "http://ibus.googlecode.com"
+#: ../setup/ibus-libpinyin-preferences.ui.h:74
+msgid "XHE"
+msgstr "小鹤"
 
-msgid "Feature of Enter key:"
-msgstr "Enter 键功能："
+#: ../setup/ibus-libpinyin-preferences.ui.h:75
+msgid "Horizontal"
+msgstr "水平"
 
-msgid "<b>Other</b>"
-msgstr "<b>其他</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:76
+msgid "Vertical"
+msgstr "竖直"
 
-msgid "Commit original text"
-msgstr "输出原本的英文字"
+#~ msgid "Full/Half width"
+#~ msgstr "全角/半角"
 
-msgid "Commit first candidate"
-msgstr "输出第一个候选词"
+#~ msgid "Edit custom phrases"
+#~ msgstr "编辑自定义词组"
+
+#~ msgid "Use custom phrases"
+#~ msgstr "使用自定义词组"
+
+#~ msgid "http://ibus.googlecode.com"
+#~ msgstr "http://ibus.googlecode.com"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3b594eb..c48d4b8 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,320 +2,422 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus-libpinyin 1.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 10:38+0800\n"
+"POT-Creation-Date: 2012-12-18 12:06+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/PYMain.cc:90
-msgid "Pinyin input method"
+#: ../src/PYMain.cc:103
+#, fuzzy
+msgid "Libpinyin input method"
 msgstr "拼音輸入法"
 
-#: ../src/PYMain.cc:99
-msgid "Pinyin (debug)"
+#: ../src/PYMain.cc:113
+#, fuzzy
+msgid "Intelligent Pinyin (debug)"
 msgstr "拼音（調試）"
 
-#: ../src/PYMain.cc:100
-msgid "Pinyin input method (debug)"
+#: ../src/PYMain.cc:114
+#, fuzzy
+msgid "Intelligent Pinyin input method (debug)"
 msgstr "拼音輸入法（調試）"
 
-#: ../src/PYMain.cc:109
-msgid "Bopomofo (debug)"
+#: ../src/PYMain.cc:124
+#, fuzzy
+msgid "Intelligent Bopomofo (debug)"
 msgstr "注音（調試）"
 
-#: ../src/PYMain.cc:110
-msgid "Bopomofo input method (debug)"
+#: ../src/PYMain.cc:125
+#, fuzzy
+msgid "Intelligent Bopomofo input method (debug)"
 msgstr "注音輸入法（調試）"
 
-#: ../src/PYPinyinProperties.cc:42 ../setup/ibus-libpinyin-preferences.ui.h:24
+#: ../src/PYPinyinProperties.cc:39 ../src/PYPinyinProperties.cc:99
+#: ../setup/ibus-libpinyin-preferences.ui.h:5
 msgid "Chinese"
 msgstr "中文"
 
-#: ../src/PYPinyinProperties.cc:49
-msgid "Full/Half width"
-msgstr "全形/半形"
+#: ../src/PYPinyinProperties.cc:40 ../src/PYPinyinProperties.cc:100
+#: ../setup/ibus-libpinyin-preferences.ui.h:6
+msgid "English"
+msgstr "英文"
+
+#: ../src/PYPinyinProperties.cc:45 ../src/PYPinyinProperties.cc:105
+msgid "Switch to English Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:46 ../src/PYPinyinProperties.cc:106
+msgid "Switch to Chinese Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:50 ../src/PYPinyinProperties.cc:118
+msgid "Full Width Letter"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:51 ../src/PYPinyinProperties.cc:119
+msgid "Half Width Letter"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:56 ../src/PYPinyinProperties.cc:124
+msgid "Switch to Half Width Letter Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:57 ../src/PYPinyinProperties.cc:125
+msgid "Switch to Full Width Letter Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:61 ../src/PYPinyinProperties.cc:134
+#, fuzzy
+msgid "Full Width Punct"
+msgstr "半形符號"
+
+#: ../src/PYPinyinProperties.cc:62 ../src/PYPinyinProperties.cc:135
+#, fuzzy
+msgid "Half Width Punct"
+msgstr "半形符號"
+
+#: ../src/PYPinyinProperties.cc:67 ../src/PYPinyinProperties.cc:140
+#, fuzzy
+msgid "Switch to Half Width Punctuation Mode"
+msgstr "半形符號"
 
-#: ../src/PYPinyinProperties.cc:56
-msgid "Full/Half width punctuation"
+#: ../src/PYPinyinProperties.cc:68 ../src/PYPinyinProperties.cc:141
+#, fuzzy
+msgid "Switch to Full Width Punctuation Mode"
 msgstr "半形符號"
 
-#: ../src/PYPinyinProperties.cc:63
-msgid "Simplfied/Traditional Chinese"
+#: ../src/PYPinyinProperties.cc:72 ../src/PYPinyinProperties.cc:150
+#, fuzzy
+msgid "Simplified Chinese"
 msgstr "簡體/繁體中文"
 
-#: ../src/PYPinyinProperties.cc:66 ../src/PYPinyinProperties.cc:68
-#: ../setup/ibus-libpinyin-preferences.ui.h:55
+#: ../src/PYPinyinProperties.cc:73 ../src/PYPinyinProperties.cc:151
+#, fuzzy
+msgid "Traditional Chinese"
+msgstr "簡體/繁體中文"
+
+#: ../src/PYPinyinProperties.cc:78 ../src/PYPinyinProperties.cc:156
+#, fuzzy
+msgid "Switch to Traditional Chinese Mode"
+msgstr "簡體/繁體中文"
+
+#: ../src/PYPinyinProperties.cc:79 ../src/PYPinyinProperties.cc:157
+msgid "Switch to Simplfied Chinese Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:82 ../src/PYPinyinProperties.cc:84
+#: ../setup/ibus-libpinyin-preferences.ui.h:1
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../setup/main.py:377 ../setup/ibus-libpinyin-preferences.ui.h:10
-#, no-c-format, python-format
-msgid "<big><b>IBus Pinyin %s</b></big>"
+#: ../src/PYEnglishEditor.cc:610
+msgid "Please input the english word."
+msgstr ""
+
+#: ../src/PYStrokeEditor.cc:386
+msgid "Please use \"hspnz\" to input."
+msgstr ""
+
+#: ../setup/main2.py:349 ../setup/ibus-libpinyin-preferences.ui.h:51
+#, fuzzy, no-c-format, python-format
+msgid "<big><b>Intelligent Pinyin %s</b></big>"
 msgstr "<big><b>IBus 拼音 %s</b></big>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:1
-msgid "<b>Bopomofo mode</b>"
-msgstr "<b>注音模式</b>"
+#: ../setup/dicttreeview.py:37
+#, fuzzy
+msgid "GB Dictionary"
+msgstr "詞典"
+
+#: ../setup/dicttreeview.py:38
+#, fuzzy
+msgid "GBK Dictionary"
+msgstr "詞典"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:2
-msgid "<b>Correct pinyin</b>"
-msgstr "<b>拼音糾錯</b>"
+msgid "Language:"
+msgstr "語言："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:3
-msgid "<b>Dictionary option</b>"
-msgstr "<b>詞典選項</b>"
+msgid "Half/full width:"
+msgstr "全形/半形："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:4
+msgid "Punctuations:"
+msgstr "標點符號："
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:7
+msgid "Full"
+msgstr "全形"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:8
+msgid "Half"
+msgstr "半形"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:9
+msgid "Chinese:"
+msgstr "中文："
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:10
+msgid "Simplified"
+msgstr "簡體"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:11
+msgid "Traditional"
+msgstr "繁體"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:12
 msgid "<b>Initial state</b>"
 msgstr "<b>初始狀態</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:5
-msgid "<b>Input Custom</b>"
-msgstr "<b>輸入配置</b>"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:6
-msgid "<b>Pinyin mode</b>"
-msgstr "<b>拼音模式</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:13
+msgid "Orientation of candidates:"
+msgstr "候選詞排列方向："
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:7
-msgid "<b>Selection mode</b>"
-msgstr "<b>選詞模式</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:14
+msgid "Number of candidates:"
+msgstr "每頁顯示候選詞條目數量："
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:8
+#: ../setup/ibus-libpinyin-preferences.ui.h:15
 msgid "<b>UI</b>"
 msgstr "<b>外觀</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:11
-msgid ""
-"<small>\n"
-"<b>Authors:</b>\n"
-"Peng Huang\n"
-"BYVoid\n"
-"\n"
-"<b>Contributors:</b>\n"
-"koterpilla, Zerng07\n"
-"</small>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:16
+msgid "Dynamic adjust the candidates order."
 msgstr ""
-"<small>\n"
-"<b>作者:</b>\n"
-"Peng Huang\n"
-"BYVoid\n"
-"\n"
-"<b>貢獻者:</b>\n"
-"koterpilla, Zerng07\n"
-"</small>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:17
+#, fuzzy
+msgid "<b>Candidates</b>"
+msgstr "<b>初始狀態</b>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:18
+msgid "General"
+msgstr "常規"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:19
-msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
-msgstr "<small>版權所有 (c) 2009-2010 黃鵬</small>"
+msgid "Full pinyin"
+msgstr "全拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:20
-msgid "ABC"
-msgstr "智能ABC"
+msgid "Double pinyin"
+msgstr "雙拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:21
-msgid "About"
-msgstr "關於"
+msgid "Show raw input of Double Pinyin"
+msgstr "顯示雙拼原始輸入"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:22
-msgid "Auto commit"
-msgstr "自動上詞"
+msgid "Incomplete pinyin"
+msgstr "簡拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:23
-msgid "Bopomofo mode"
-msgstr "注音模式"
+msgid "<b>Pinyin mode</b>"
+msgstr "<b>拼音模式</b>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:24
+msgid "[Shift] select candidate"
+msgstr "[Shift]鍵選詞"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:25
-msgid "Chinese:"
-msgstr "中文："
+msgid "[-] [=] flip page"
+msgstr "[-][=]鍵翻頁"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:26
-msgid "Dictionary"
-msgstr "詞典"
+msgid "[,] [.] flip page"
+msgstr "[,][.]鍵翻頁"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:27
-msgid "Double pinyin"
-msgstr "雙拼"
+msgid "Auto commit"
+msgstr "自動上詞"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:28
-msgid "Edit custom phrases"
-msgstr "編輯自定義詞組"
+msgid "<b>Input Custom</b>"
+msgstr "<b>輸入配置</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:29
-msgid "Enable Auxiliary Select Keys F1 .. F10"
-msgstr "啓用輔助選詞鍵F1 .. F10"
+msgid "Enable correct pinyin"
+msgstr "啓用拼音糾錯"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:30
-msgid "Enable Auxiliary Select Keys Numbers on Keypad"
-msgstr "啓用數字鍵盤輔助選詞鍵"
+msgid "<b>Correct pinyin</b>"
+msgstr "<b>拼音糾錯</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:31
-msgid "Enable Guidekey for Candidates Selection"
-msgstr "啓用選詞引導鍵"
+msgid "Pinyin mode"
+msgstr "拼音模式"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:32
-msgid "Enable correct pinyin"
-msgstr "啓用拼音糾錯"
+msgid "Incomplete Bopomofo"
+msgstr "簡拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:33
-msgid "Enable fuzzy syllable"
-msgstr "啓用模糊音"
+msgid "Keyboard Mapping:"
+msgstr "鍵盤映射："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:34
-msgid "English"
-msgstr "英文"
+msgid "<b>Bopomofo mode</b>"
+msgstr "<b>注音模式</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:35
-msgid "Eten"
-msgstr "倚天"
+msgid "Selection Keys:"
+msgstr "選詞鍵："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:36
-msgid "Full"
-msgstr "全形"
+msgid "Enable Guidekey for Candidates Selection"
+msgstr "啓用選詞引導鍵"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:37
-msgid "Full pinyin"
-msgstr "全拼"
+msgid "Enable Auxiliary Select Keys F1 .. F10"
+msgstr "啓用輔助選詞鍵F1 .. F10"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:38
-msgid "Fuzzy syllable"
-msgstr "模糊音"
+msgid "Enable Auxiliary Select Keys Numbers on Keypad"
+msgstr "啓用數字鍵盤輔助選詞鍵"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:39
-msgid "General"
-msgstr "常規"
+msgid "<b>Selection mode</b>"
+msgstr "<b>選詞模式</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:40
-msgid "GinYieh"
-msgstr "精業"
+msgid "Feature of Enter key:"
+msgstr "Enter 鍵功能："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:41
-msgid "Half"
-msgstr "半形"
+msgid "Commit first candidate"
+msgstr "輸出第一個候選詞"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:42
-msgid "Half/full width:"
-msgstr "全形/半形："
+msgid "Commit original text"
+msgstr "輸出原本的英文字"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:43
-msgid "Horizontal"
-msgstr "水平"
+msgid "<b>Other</b>"
+msgstr "<b>其他</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:44
-msgid "IBM"
-msgstr "IBM"
+msgid "Bopomofo mode"
+msgstr "注音模式"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:45
-msgid "Incomplete Bopomofo"
-msgstr "簡拼"
+msgid "Enable fuzzy syllable"
+msgstr "啓用模糊音"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:46
-msgid "Incomplete pinyin"
-msgstr "簡拼"
+msgid "Fuzzy syllable"
+msgstr "模糊音"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:47
-msgid "Keyboard Mapping:"
-msgstr "鍵盤映射："
+msgid "Tips: this changes may take effects after ime restarted."
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:48
-msgid "Language:"
-msgstr "語言："
+msgid "<b>Dictionary option</b>"
+msgstr "<b>詞典選項</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:49
-msgid "MSPY"
-msgstr "微軟拼音"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:50
-msgid "Number of candidates:"
-msgstr "每頁顯示候選詞條目數量："
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:51
-msgid "Orientation of candidates:"
-msgstr "候選詞排列方向："
+msgid "Dictionary"
+msgstr "詞典"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:52
-msgid "PYJJ"
-msgstr "拼音加加"
+#, fuzzy
+msgid "Intelligent Pinyin input method for IBus"
+msgstr "IBus 拼音輸入法"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:53
-msgid "Pinyin input method for IBus"
-msgstr "IBus 拼音輸入法"
+#, fuzzy
+msgid "<small>Copyright (c) 2011-2012 Peng Wu</small>"
+msgstr "<small>版權所有 (c) 2009-2010 黃鵬</small>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:54
-msgid "Pinyin mode"
-msgstr "拼音模式"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:56
-msgid "Punctuations:"
-msgstr "標點符號："
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:57
-msgid "Selection Keys:"
-msgstr "選詞鍵："
+msgid "https://github.com/libpinyin/ibus-libpinyin"
+msgstr ""
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:58
-msgid "Show raw input of Double Pinyin"
-msgstr "顯示雙拼原始輸入"
+#: ../setup/ibus-libpinyin-preferences.ui.h:55
+#, fuzzy
+msgid ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Wu\n"
+"Peng Huang\n"
+"BYVoid\n"
+"\n"
+"<b>Contributors:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
+msgstr ""
+"<small>\n"
+"<b>作者:</b>\n"
+"Peng Huang\n"
+"BYVoid\n"
+"\n"
+"<b>貢獻者:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:59
-msgid "Simplified"
-msgstr "簡體"
+#: ../setup/ibus-libpinyin-preferences.ui.h:64
+msgid "About"
+msgstr "關於"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:60
+#: ../setup/ibus-libpinyin-preferences.ui.h:65
 msgid "Standard"
 msgstr "標準"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:61
-msgid "Traditional"
-msgstr "繁體"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:62
-msgid "Use custom phrases"
-msgstr "使用自定義詞組"
+#: ../setup/ibus-libpinyin-preferences.ui.h:66
+msgid "GinYieh"
+msgstr "精業"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:63
-msgid "Vertical"
-msgstr "豎直"
+#: ../setup/ibus-libpinyin-preferences.ui.h:67
+msgid "Eten"
+msgstr "倚天"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:64
-msgid "XHE"
-msgstr "小鶴"
+#: ../setup/ibus-libpinyin-preferences.ui.h:68
+msgid "IBM"
+msgstr "IBM"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:65
-msgid "ZGPY"
-msgstr "紫光拼音"
+#: ../setup/ibus-libpinyin-preferences.ui.h:69
+msgid "MSPY"
+msgstr "微軟拼音"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:66
+#: ../setup/ibus-libpinyin-preferences.ui.h:70
 msgid "ZRM"
 msgstr "自然碼"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:67
-msgid "[,] [.] flip page"
-msgstr "[,][.]鍵翻頁"
+#: ../setup/ibus-libpinyin-preferences.ui.h:71
+msgid "ABC"
+msgstr "智能ABC"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:68
-msgid "[-] [=] flip page"
-msgstr "[-][=]鍵翻頁"
+#: ../setup/ibus-libpinyin-preferences.ui.h:72
+msgid "ZGPY"
+msgstr "紫光拼音"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:69
-msgid "[Shift] select candidate"
-msgstr "[Shift]鍵選詞"
+#: ../setup/ibus-libpinyin-preferences.ui.h:73
+msgid "PYJJ"
+msgstr "拼音加加"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:70
-msgid "http://ibus.googlecode.com"
-msgstr "http://ibus.googlecode.com"
+#: ../setup/ibus-libpinyin-preferences.ui.h:74
+msgid "XHE"
+msgstr "小鶴"
 
-msgid "Feature of Enter key:"
-msgstr "Enter 鍵功能："
+#: ../setup/ibus-libpinyin-preferences.ui.h:75
+msgid "Horizontal"
+msgstr "水平"
 
-msgid "<b>Other</b>"
-msgstr "<b>其他</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:76
+msgid "Vertical"
+msgstr "豎直"
 
-msgid "Commit original text"
-msgstr "輸出原本的英文字"
+#~ msgid "Full/Half width"
+#~ msgstr "全形/半形"
 
-msgid "Commit first candidate"
-msgstr "輸出第一個候選詞"
+#~ msgid "Edit custom phrases"
+#~ msgstr "編輯自定義詞組"
+
+#~ msgid "Use custom phrases"
+#~ msgstr "使用自定義詞組"
+
+#~ msgid "http://ibus.googlecode.com"
+#~ msgstr "http://ibus.googlecode.com"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3b594eb..c48d4b8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,320 +2,422 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus-libpinyin 1.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 10:38+0800\n"
+"POT-Creation-Date: 2012-12-18 12:06+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/PYMain.cc:90
-msgid "Pinyin input method"
+#: ../src/PYMain.cc:103
+#, fuzzy
+msgid "Libpinyin input method"
 msgstr "拼音輸入法"
 
-#: ../src/PYMain.cc:99
-msgid "Pinyin (debug)"
+#: ../src/PYMain.cc:113
+#, fuzzy
+msgid "Intelligent Pinyin (debug)"
 msgstr "拼音（調試）"
 
-#: ../src/PYMain.cc:100
-msgid "Pinyin input method (debug)"
+#: ../src/PYMain.cc:114
+#, fuzzy
+msgid "Intelligent Pinyin input method (debug)"
 msgstr "拼音輸入法（調試）"
 
-#: ../src/PYMain.cc:109
-msgid "Bopomofo (debug)"
+#: ../src/PYMain.cc:124
+#, fuzzy
+msgid "Intelligent Bopomofo (debug)"
 msgstr "注音（調試）"
 
-#: ../src/PYMain.cc:110
-msgid "Bopomofo input method (debug)"
+#: ../src/PYMain.cc:125
+#, fuzzy
+msgid "Intelligent Bopomofo input method (debug)"
 msgstr "注音輸入法（調試）"
 
-#: ../src/PYPinyinProperties.cc:42 ../setup/ibus-libpinyin-preferences.ui.h:24
+#: ../src/PYPinyinProperties.cc:39 ../src/PYPinyinProperties.cc:99
+#: ../setup/ibus-libpinyin-preferences.ui.h:5
 msgid "Chinese"
 msgstr "中文"
 
-#: ../src/PYPinyinProperties.cc:49
-msgid "Full/Half width"
-msgstr "全形/半形"
+#: ../src/PYPinyinProperties.cc:40 ../src/PYPinyinProperties.cc:100
+#: ../setup/ibus-libpinyin-preferences.ui.h:6
+msgid "English"
+msgstr "英文"
+
+#: ../src/PYPinyinProperties.cc:45 ../src/PYPinyinProperties.cc:105
+msgid "Switch to English Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:46 ../src/PYPinyinProperties.cc:106
+msgid "Switch to Chinese Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:50 ../src/PYPinyinProperties.cc:118
+msgid "Full Width Letter"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:51 ../src/PYPinyinProperties.cc:119
+msgid "Half Width Letter"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:56 ../src/PYPinyinProperties.cc:124
+msgid "Switch to Half Width Letter Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:57 ../src/PYPinyinProperties.cc:125
+msgid "Switch to Full Width Letter Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:61 ../src/PYPinyinProperties.cc:134
+#, fuzzy
+msgid "Full Width Punct"
+msgstr "半形符號"
+
+#: ../src/PYPinyinProperties.cc:62 ../src/PYPinyinProperties.cc:135
+#, fuzzy
+msgid "Half Width Punct"
+msgstr "半形符號"
+
+#: ../src/PYPinyinProperties.cc:67 ../src/PYPinyinProperties.cc:140
+#, fuzzy
+msgid "Switch to Half Width Punctuation Mode"
+msgstr "半形符號"
 
-#: ../src/PYPinyinProperties.cc:56
-msgid "Full/Half width punctuation"
+#: ../src/PYPinyinProperties.cc:68 ../src/PYPinyinProperties.cc:141
+#, fuzzy
+msgid "Switch to Full Width Punctuation Mode"
 msgstr "半形符號"
 
-#: ../src/PYPinyinProperties.cc:63
-msgid "Simplfied/Traditional Chinese"
+#: ../src/PYPinyinProperties.cc:72 ../src/PYPinyinProperties.cc:150
+#, fuzzy
+msgid "Simplified Chinese"
 msgstr "簡體/繁體中文"
 
-#: ../src/PYPinyinProperties.cc:66 ../src/PYPinyinProperties.cc:68
-#: ../setup/ibus-libpinyin-preferences.ui.h:55
+#: ../src/PYPinyinProperties.cc:73 ../src/PYPinyinProperties.cc:151
+#, fuzzy
+msgid "Traditional Chinese"
+msgstr "簡體/繁體中文"
+
+#: ../src/PYPinyinProperties.cc:78 ../src/PYPinyinProperties.cc:156
+#, fuzzy
+msgid "Switch to Traditional Chinese Mode"
+msgstr "簡體/繁體中文"
+
+#: ../src/PYPinyinProperties.cc:79 ../src/PYPinyinProperties.cc:157
+msgid "Switch to Simplfied Chinese Mode"
+msgstr ""
+
+#: ../src/PYPinyinProperties.cc:82 ../src/PYPinyinProperties.cc:84
+#: ../setup/ibus-libpinyin-preferences.ui.h:1
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../setup/main.py:377 ../setup/ibus-libpinyin-preferences.ui.h:10
-#, no-c-format, python-format
-msgid "<big><b>IBus Pinyin %s</b></big>"
+#: ../src/PYEnglishEditor.cc:610
+msgid "Please input the english word."
+msgstr ""
+
+#: ../src/PYStrokeEditor.cc:386
+msgid "Please use \"hspnz\" to input."
+msgstr ""
+
+#: ../setup/main2.py:349 ../setup/ibus-libpinyin-preferences.ui.h:51
+#, fuzzy, no-c-format, python-format
+msgid "<big><b>Intelligent Pinyin %s</b></big>"
 msgstr "<big><b>IBus 拼音 %s</b></big>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:1
-msgid "<b>Bopomofo mode</b>"
-msgstr "<b>注音模式</b>"
+#: ../setup/dicttreeview.py:37
+#, fuzzy
+msgid "GB Dictionary"
+msgstr "詞典"
+
+#: ../setup/dicttreeview.py:38
+#, fuzzy
+msgid "GBK Dictionary"
+msgstr "詞典"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:2
-msgid "<b>Correct pinyin</b>"
-msgstr "<b>拼音糾錯</b>"
+msgid "Language:"
+msgstr "語言："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:3
-msgid "<b>Dictionary option</b>"
-msgstr "<b>詞典選項</b>"
+msgid "Half/full width:"
+msgstr "全形/半形："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:4
+msgid "Punctuations:"
+msgstr "標點符號："
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:7
+msgid "Full"
+msgstr "全形"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:8
+msgid "Half"
+msgstr "半形"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:9
+msgid "Chinese:"
+msgstr "中文："
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:10
+msgid "Simplified"
+msgstr "簡體"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:11
+msgid "Traditional"
+msgstr "繁體"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:12
 msgid "<b>Initial state</b>"
 msgstr "<b>初始狀態</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:5
-msgid "<b>Input Custom</b>"
-msgstr "<b>輸入配置</b>"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:6
-msgid "<b>Pinyin mode</b>"
-msgstr "<b>拼音模式</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:13
+msgid "Orientation of candidates:"
+msgstr "候選詞排列方向："
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:7
-msgid "<b>Selection mode</b>"
-msgstr "<b>選詞模式</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:14
+msgid "Number of candidates:"
+msgstr "每頁顯示候選詞條目數量："
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:8
+#: ../setup/ibus-libpinyin-preferences.ui.h:15
 msgid "<b>UI</b>"
 msgstr "<b>外觀</b>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:11
-msgid ""
-"<small>\n"
-"<b>Authors:</b>\n"
-"Peng Huang\n"
-"BYVoid\n"
-"\n"
-"<b>Contributors:</b>\n"
-"koterpilla, Zerng07\n"
-"</small>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:16
+msgid "Dynamic adjust the candidates order."
 msgstr ""
-"<small>\n"
-"<b>作者:</b>\n"
-"Peng Huang\n"
-"BYVoid\n"
-"\n"
-"<b>貢獻者:</b>\n"
-"koterpilla, Zerng07\n"
-"</small>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:17
+#, fuzzy
+msgid "<b>Candidates</b>"
+msgstr "<b>初始狀態</b>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:18
+msgid "General"
+msgstr "常規"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:19
-msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
-msgstr "<small>版權所有 (c) 2009-2010 黃鵬</small>"
+msgid "Full pinyin"
+msgstr "全拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:20
-msgid "ABC"
-msgstr "智能ABC"
+msgid "Double pinyin"
+msgstr "雙拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:21
-msgid "About"
-msgstr "關於"
+msgid "Show raw input of Double Pinyin"
+msgstr "顯示雙拼原始輸入"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:22
-msgid "Auto commit"
-msgstr "自動上詞"
+msgid "Incomplete pinyin"
+msgstr "簡拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:23
-msgid "Bopomofo mode"
-msgstr "注音模式"
+msgid "<b>Pinyin mode</b>"
+msgstr "<b>拼音模式</b>"
+
+#: ../setup/ibus-libpinyin-preferences.ui.h:24
+msgid "[Shift] select candidate"
+msgstr "[Shift]鍵選詞"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:25
-msgid "Chinese:"
-msgstr "中文："
+msgid "[-] [=] flip page"
+msgstr "[-][=]鍵翻頁"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:26
-msgid "Dictionary"
-msgstr "詞典"
+msgid "[,] [.] flip page"
+msgstr "[,][.]鍵翻頁"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:27
-msgid "Double pinyin"
-msgstr "雙拼"
+msgid "Auto commit"
+msgstr "自動上詞"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:28
-msgid "Edit custom phrases"
-msgstr "編輯自定義詞組"
+msgid "<b>Input Custom</b>"
+msgstr "<b>輸入配置</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:29
-msgid "Enable Auxiliary Select Keys F1 .. F10"
-msgstr "啓用輔助選詞鍵F1 .. F10"
+msgid "Enable correct pinyin"
+msgstr "啓用拼音糾錯"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:30
-msgid "Enable Auxiliary Select Keys Numbers on Keypad"
-msgstr "啓用數字鍵盤輔助選詞鍵"
+msgid "<b>Correct pinyin</b>"
+msgstr "<b>拼音糾錯</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:31
-msgid "Enable Guidekey for Candidates Selection"
-msgstr "啓用選詞引導鍵"
+msgid "Pinyin mode"
+msgstr "拼音模式"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:32
-msgid "Enable correct pinyin"
-msgstr "啓用拼音糾錯"
+msgid "Incomplete Bopomofo"
+msgstr "簡拼"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:33
-msgid "Enable fuzzy syllable"
-msgstr "啓用模糊音"
+msgid "Keyboard Mapping:"
+msgstr "鍵盤映射："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:34
-msgid "English"
-msgstr "英文"
+msgid "<b>Bopomofo mode</b>"
+msgstr "<b>注音模式</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:35
-msgid "Eten"
-msgstr "倚天"
+msgid "Selection Keys:"
+msgstr "選詞鍵："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:36
-msgid "Full"
-msgstr "全形"
+msgid "Enable Guidekey for Candidates Selection"
+msgstr "啓用選詞引導鍵"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:37
-msgid "Full pinyin"
-msgstr "全拼"
+msgid "Enable Auxiliary Select Keys F1 .. F10"
+msgstr "啓用輔助選詞鍵F1 .. F10"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:38
-msgid "Fuzzy syllable"
-msgstr "模糊音"
+msgid "Enable Auxiliary Select Keys Numbers on Keypad"
+msgstr "啓用數字鍵盤輔助選詞鍵"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:39
-msgid "General"
-msgstr "常規"
+msgid "<b>Selection mode</b>"
+msgstr "<b>選詞模式</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:40
-msgid "GinYieh"
-msgstr "精業"
+msgid "Feature of Enter key:"
+msgstr "Enter 鍵功能："
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:41
-msgid "Half"
-msgstr "半形"
+msgid "Commit first candidate"
+msgstr "輸出第一個候選詞"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:42
-msgid "Half/full width:"
-msgstr "全形/半形："
+msgid "Commit original text"
+msgstr "輸出原本的英文字"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:43
-msgid "Horizontal"
-msgstr "水平"
+msgid "<b>Other</b>"
+msgstr "<b>其他</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:44
-msgid "IBM"
-msgstr "IBM"
+msgid "Bopomofo mode"
+msgstr "注音模式"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:45
-msgid "Incomplete Bopomofo"
-msgstr "簡拼"
+msgid "Enable fuzzy syllable"
+msgstr "啓用模糊音"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:46
-msgid "Incomplete pinyin"
-msgstr "簡拼"
+msgid "Fuzzy syllable"
+msgstr "模糊音"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:47
-msgid "Keyboard Mapping:"
-msgstr "鍵盤映射："
+msgid "Tips: this changes may take effects after ime restarted."
+msgstr ""
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:48
-msgid "Language:"
-msgstr "語言："
+msgid "<b>Dictionary option</b>"
+msgstr "<b>詞典選項</b>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:49
-msgid "MSPY"
-msgstr "微軟拼音"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:50
-msgid "Number of candidates:"
-msgstr "每頁顯示候選詞條目數量："
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:51
-msgid "Orientation of candidates:"
-msgstr "候選詞排列方向："
+msgid "Dictionary"
+msgstr "詞典"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:52
-msgid "PYJJ"
-msgstr "拼音加加"
+#, fuzzy
+msgid "Intelligent Pinyin input method for IBus"
+msgstr "IBus 拼音輸入法"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:53
-msgid "Pinyin input method for IBus"
-msgstr "IBus 拼音輸入法"
+#, fuzzy
+msgid "<small>Copyright (c) 2011-2012 Peng Wu</small>"
+msgstr "<small>版權所有 (c) 2009-2010 黃鵬</small>"
 
 #: ../setup/ibus-libpinyin-preferences.ui.h:54
-msgid "Pinyin mode"
-msgstr "拼音模式"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:56
-msgid "Punctuations:"
-msgstr "標點符號："
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:57
-msgid "Selection Keys:"
-msgstr "選詞鍵："
+msgid "https://github.com/libpinyin/ibus-libpinyin"
+msgstr ""
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:58
-msgid "Show raw input of Double Pinyin"
-msgstr "顯示雙拼原始輸入"
+#: ../setup/ibus-libpinyin-preferences.ui.h:55
+#, fuzzy
+msgid ""
+"<small>\n"
+"<b>Authors:</b>\n"
+"Peng Wu\n"
+"Peng Huang\n"
+"BYVoid\n"
+"\n"
+"<b>Contributors:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
+msgstr ""
+"<small>\n"
+"<b>作者:</b>\n"
+"Peng Huang\n"
+"BYVoid\n"
+"\n"
+"<b>貢獻者:</b>\n"
+"koterpilla, Zerng07\n"
+"</small>"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:59
-msgid "Simplified"
-msgstr "簡體"
+#: ../setup/ibus-libpinyin-preferences.ui.h:64
+msgid "About"
+msgstr "關於"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:60
+#: ../setup/ibus-libpinyin-preferences.ui.h:65
 msgid "Standard"
 msgstr "標準"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:61
-msgid "Traditional"
-msgstr "繁體"
-
-#: ../setup/ibus-libpinyin-preferences.ui.h:62
-msgid "Use custom phrases"
-msgstr "使用自定義詞組"
+#: ../setup/ibus-libpinyin-preferences.ui.h:66
+msgid "GinYieh"
+msgstr "精業"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:63
-msgid "Vertical"
-msgstr "豎直"
+#: ../setup/ibus-libpinyin-preferences.ui.h:67
+msgid "Eten"
+msgstr "倚天"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:64
-msgid "XHE"
-msgstr "小鶴"
+#: ../setup/ibus-libpinyin-preferences.ui.h:68
+msgid "IBM"
+msgstr "IBM"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:65
-msgid "ZGPY"
-msgstr "紫光拼音"
+#: ../setup/ibus-libpinyin-preferences.ui.h:69
+msgid "MSPY"
+msgstr "微軟拼音"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:66
+#: ../setup/ibus-libpinyin-preferences.ui.h:70
 msgid "ZRM"
 msgstr "自然碼"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:67
-msgid "[,] [.] flip page"
-msgstr "[,][.]鍵翻頁"
+#: ../setup/ibus-libpinyin-preferences.ui.h:71
+msgid "ABC"
+msgstr "智能ABC"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:68
-msgid "[-] [=] flip page"
-msgstr "[-][=]鍵翻頁"
+#: ../setup/ibus-libpinyin-preferences.ui.h:72
+msgid "ZGPY"
+msgstr "紫光拼音"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:69
-msgid "[Shift] select candidate"
-msgstr "[Shift]鍵選詞"
+#: ../setup/ibus-libpinyin-preferences.ui.h:73
+msgid "PYJJ"
+msgstr "拼音加加"
 
-#: ../setup/ibus-libpinyin-preferences.ui.h:70
-msgid "http://ibus.googlecode.com"
-msgstr "http://ibus.googlecode.com"
+#: ../setup/ibus-libpinyin-preferences.ui.h:74
+msgid "XHE"
+msgstr "小鶴"
 
-msgid "Feature of Enter key:"
-msgstr "Enter 鍵功能："
+#: ../setup/ibus-libpinyin-preferences.ui.h:75
+msgid "Horizontal"
+msgstr "水平"
 
-msgid "<b>Other</b>"
-msgstr "<b>其他</b>"
+#: ../setup/ibus-libpinyin-preferences.ui.h:76
+msgid "Vertical"
+msgstr "豎直"
 
-msgid "Commit original text"
-msgstr "輸出原本的英文字"
+#~ msgid "Full/Half width"
+#~ msgstr "全形/半形"
 
-msgid "Commit first candidate"
-msgstr "輸出第一個候選詞"
+#~ msgid "Edit custom phrases"
+#~ msgstr "編輯自定義詞組"
+
+#~ msgid "Use custom phrases"
+#~ msgstr "使用自定義詞組"
+
+#~ msgid "http://ibus.googlecode.com"
+#~ msgstr "http://ibus.googlecode.com"