diff --git a/po/de.po b/po/de.po
index 8dcebed..4d03ec1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# mar well <marwell.1980@freenet.de>, 2013
+# mar well <m.wellendorf@gmx.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
-"POT-Creation-Date: 2013-06-03 14:03-0400\n"
-"PO-Revision-Date: 2013-05-22 06:27+0000\n"
-"Last-Translator: mar well <marwell.1980@freenet.de>\n"
+"POT-Creation-Date: 2014-04-30 19:02+0200\n"
+"PO-Revision-Date: 2013-10-18 07:14+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/fcitx/language/"
 "de/)\n"
 "Language: de\n"
@@ -35,6 +35,22 @@
 msgid "&Import"
 msgstr "&Import"
 
+#: src/fcitx-unikey.desc:46
+msgid "Allow type with more freedom"
+msgstr ""
+
+#: src/fcitx-unikey.desc:51
+msgid "Auto restore keys with invalid words"
+msgstr ""
+
+#: src/fcitx-unikey.desc:23
+msgid "BK HCM 2"
+msgstr ""
+
+#: src/fcitx-unikey.desc:24
+msgid "CString"
+msgstr ""
+
 #: src/unikey-ui.cpp:105 src/unikey-ui.cpp:172
 msgid "Choose input method"
 msgstr "Eingabemethode auswählen"
@@ -55,10 +71,34 @@
 msgid "Enable Spell Check"
 msgstr "Rechtschreibprüfung aktivieren"
 
+#: src/fcitx-unikey.desc:36
+msgid "Enable macro"
+msgstr ""
+
+#: src/fcitx-unikey.desc:31
+msgid "Enable spell check"
+msgstr ""
+
+#: src/fcitx-unikey.desc:4
+msgid "Input Method"
+msgstr ""
+
 #: macro-editor/model.cpp:44 src/unikey-ui.cpp:127 src/unikey-ui.cpp:187
 #: src/fcitx-unikey.conf.in:10
 msgid "Macro"
 msgstr "Makro"
+
+#: src/fcitx-unikey.desc:9
+msgid "Microsoft Vietnamese"
+msgstr ""
+
+#: src/fcitx-unikey.desc:25
+msgid "NCR Decimal"
+msgstr ""
+
+#: src/fcitx-unikey.desc:26
+msgid "NCR Hex"
+msgstr ""
 
 #: src/unikey-ui.cpp:187
 msgid "No Macro"
@@ -68,15 +108,42 @@
 msgid "No Spell Check"
 msgstr "Keine Rechtschreibprüfung"
 
-#: src/unikey-ui.cpp:156
+#: src/unikey-ui.cpp:156 src/fcitx-unikey.desc:17
 msgid "Output Charset"
 msgstr "Zeichensatz Ausgabe"
+
+#: src/fcitx-unikey.desc:56
+msgid "Process W at word begin"
+msgstr ""
+
+#: src/fcitx-unikey.desc:11
+msgid "Simple Telex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:12
+msgid "Simple Telex2"
+msgstr ""
 
 #: src/unikey-ui.cpp:119 src/unikey-ui.cpp:182
 msgid "Spell Check"
 msgstr "Rechtschreibprüfung"
 
-#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3
+#: src/fcitx-unikey.desc:20
+msgid "TCVN3"
+msgstr ""
+
+#: src/fcitx-unikey.desc:6
+msgid "Telex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:19
+msgid "Unicode"
+msgstr ""
+
+#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3 src/unikey.conf.in:3
+#: src/fcitx-unikey.desc:1 src/fcitx-unikey.desc:14 src/fcitx-unikey.desc:28
+#: src/fcitx-unikey.desc:33 src/fcitx-unikey.desc:38 src/fcitx-unikey.desc:43
+#: src/fcitx-unikey.desc:48 src/fcitx-unikey.desc:53
 msgid "Unikey"
 msgstr "Unikey"
 
@@ -84,7 +151,7 @@
 msgid "Unikey Input Method"
 msgstr "Unikey Eingabemethode"
 
-#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:71
+#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:76
 msgid "Unikey Macro Editor"
 msgstr "Unikey Macro Editor"
 
@@ -92,6 +159,26 @@
 msgid "Unikey Wrapper For Fcitx"
 msgstr "Unikey Wrapper für Fcitx"
 
+#: src/fcitx-unikey.desc:41
+msgid "Use oà, _uý (instead of òa, úy)"
+msgstr ""
+
+#: src/fcitx-unikey.desc:10
+msgid "UserIM"
+msgstr ""
+
+#: src/fcitx-unikey.desc:8 src/fcitx-unikey.desc:22
+msgid "VIQR"
+msgstr ""
+
+#: src/fcitx-unikey.desc:7
+msgid "VNI"
+msgstr ""
+
+#: src/fcitx-unikey.desc:21
+msgid "VNI Win"
+msgstr ""
+
 #: macro-editor/model.cpp:46
 msgid "Word"
 msgstr "Wort"
diff --git a/po/fcitx-unikey.pot b/po/fcitx-unikey.pot
index 13063be..75879ed 100644
--- a/po/fcitx-unikey.pot
+++ b/po/fcitx-unikey.pot
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
-"POT-Creation-Date: 2013-04-25 00:02-0400\n"
+"POT-Creation-Date: 2014-04-30 19:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,7 +37,7 @@
 msgid "&Export"
 msgstr ""
 
-#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:71
+#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:76
 msgid "Unikey Macro Editor"
 msgstr ""
 
@@ -50,7 +50,10 @@
 msgid "Word"
 msgstr ""
 
-#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3
+#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3 src/unikey.conf.in:3
+#: src/fcitx-unikey.desc:1 src/fcitx-unikey.desc:14 src/fcitx-unikey.desc:28
+#: src/fcitx-unikey.desc:33 src/fcitx-unikey.desc:38 src/fcitx-unikey.desc:43
+#: src/fcitx-unikey.desc:48 src/fcitx-unikey.desc:53
 msgid "Unikey"
 msgstr ""
 
@@ -78,7 +81,7 @@
 msgid "Unikey Input Method"
 msgstr ""
 
-#: src/unikey-ui.cpp:156
+#: src/unikey-ui.cpp:156 src/fcitx-unikey.desc:17
 msgid "Output Charset"
 msgstr ""
 
@@ -93,3 +96,87 @@
 #: src/fcitx-unikey.conf.in:4
 msgid "Unikey Wrapper For Fcitx"
 msgstr ""
+
+#: src/fcitx-unikey.desc:4
+msgid "Input Method"
+msgstr ""
+
+#: src/fcitx-unikey.desc:6
+msgid "Telex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:7
+msgid "VNI"
+msgstr ""
+
+#: src/fcitx-unikey.desc:8 src/fcitx-unikey.desc:22
+msgid "VIQR"
+msgstr ""
+
+#: src/fcitx-unikey.desc:9
+msgid "Microsoft Vietnamese"
+msgstr ""
+
+#: src/fcitx-unikey.desc:10
+msgid "UserIM"
+msgstr ""
+
+#: src/fcitx-unikey.desc:11
+msgid "Simple Telex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:12
+msgid "Simple Telex2"
+msgstr ""
+
+#: src/fcitx-unikey.desc:19
+msgid "Unicode"
+msgstr ""
+
+#: src/fcitx-unikey.desc:20
+msgid "TCVN3"
+msgstr ""
+
+#: src/fcitx-unikey.desc:21
+msgid "VNI Win"
+msgstr ""
+
+#: src/fcitx-unikey.desc:23
+msgid "BK HCM 2"
+msgstr ""
+
+#: src/fcitx-unikey.desc:24
+msgid "CString"
+msgstr ""
+
+#: src/fcitx-unikey.desc:25
+msgid "NCR Decimal"
+msgstr ""
+
+#: src/fcitx-unikey.desc:26
+msgid "NCR Hex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:31
+msgid "Enable spell check"
+msgstr ""
+
+#: src/fcitx-unikey.desc:36
+msgid "Enable macro"
+msgstr ""
+
+#: src/fcitx-unikey.desc:41
+msgid "Use oà, _uý (instead of òa, úy)"
+msgstr ""
+
+#: src/fcitx-unikey.desc:46
+msgid "Allow type with more freedom"
+msgstr ""
+
+#: src/fcitx-unikey.desc:51
+msgid "Auto restore keys with invalid words"
+msgstr ""
+
+#: src/fcitx-unikey.desc:56
+msgid "Process W at word begin"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 68f18c4..538016e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# しろう <>, 2013
+# shirou - しろう <shirou.faw@gmail.com>, 2013
+# shirou - しろう <shirou.faw@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
-"POT-Creation-Date: 2013-04-25 00:02-0400\n"
-"PO-Revision-Date: 2013-04-14 13:05+0000\n"
-"Last-Translator: しろう <>\n"
+"POT-Creation-Date: 2014-04-30 19:02+0200\n"
+"PO-Revision-Date: 2013-10-20 12:42+0000\n"
+"Last-Translator: shirou - しろう <shirou.faw@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/"
 "ja/)\n"
 "Language: ja\n"
@@ -35,6 +36,22 @@
 msgid "&Import"
 msgstr "インポート (&I)"
 
+#: src/fcitx-unikey.desc:46
+msgid "Allow type with more freedom"
+msgstr ""
+
+#: src/fcitx-unikey.desc:51
+msgid "Auto restore keys with invalid words"
+msgstr ""
+
+#: src/fcitx-unikey.desc:23
+msgid "BK HCM 2"
+msgstr ""
+
+#: src/fcitx-unikey.desc:24
+msgid "CString"
+msgstr ""
+
 #: src/unikey-ui.cpp:105 src/unikey-ui.cpp:172
 msgid "Choose input method"
 msgstr "入力メソッドを選択"
@@ -55,10 +72,34 @@
 msgid "Enable Spell Check"
 msgstr "スペルチェックを有効に"
 
+#: src/fcitx-unikey.desc:36
+msgid "Enable macro"
+msgstr "マクロを有効に"
+
+#: src/fcitx-unikey.desc:31
+msgid "Enable spell check"
+msgstr "スペルチェックを有効に"
+
+#: src/fcitx-unikey.desc:4
+msgid "Input Method"
+msgstr "入力メソッド"
+
 #: macro-editor/model.cpp:44 src/unikey-ui.cpp:127 src/unikey-ui.cpp:187
 #: src/fcitx-unikey.conf.in:10
 msgid "Macro"
 msgstr "マクロ"
+
+#: src/fcitx-unikey.desc:9
+msgid "Microsoft Vietnamese"
+msgstr ""
+
+#: src/fcitx-unikey.desc:25
+msgid "NCR Decimal"
+msgstr ""
+
+#: src/fcitx-unikey.desc:26
+msgid "NCR Hex"
+msgstr ""
 
 #: src/unikey-ui.cpp:187
 msgid "No Macro"
@@ -68,15 +109,42 @@
 msgid "No Spell Check"
 msgstr "スペルチェックなし"
 
-#: src/unikey-ui.cpp:156
+#: src/unikey-ui.cpp:156 src/fcitx-unikey.desc:17
 msgid "Output Charset"
 msgstr "出力文字セット"
+
+#: src/fcitx-unikey.desc:56
+msgid "Process W at word begin"
+msgstr ""
+
+#: src/fcitx-unikey.desc:11
+msgid "Simple Telex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:12
+msgid "Simple Telex2"
+msgstr ""
 
 #: src/unikey-ui.cpp:119 src/unikey-ui.cpp:182
 msgid "Spell Check"
 msgstr "スペルチェク"
 
-#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3
+#: src/fcitx-unikey.desc:20
+msgid "TCVN3"
+msgstr ""
+
+#: src/fcitx-unikey.desc:6
+msgid "Telex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:19
+msgid "Unicode"
+msgstr "Unicode"
+
+#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3 src/unikey.conf.in:3
+#: src/fcitx-unikey.desc:1 src/fcitx-unikey.desc:14 src/fcitx-unikey.desc:28
+#: src/fcitx-unikey.desc:33 src/fcitx-unikey.desc:38 src/fcitx-unikey.desc:43
+#: src/fcitx-unikey.desc:48 src/fcitx-unikey.desc:53
 msgid "Unikey"
 msgstr "Unikey"
 
@@ -84,7 +152,7 @@
 msgid "Unikey Input Method"
 msgstr "Unikey 入力メソッド"
 
-#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:71
+#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:76
 msgid "Unikey Macro Editor"
 msgstr "Unikey マクロエディター"
 
@@ -92,6 +160,26 @@
 msgid "Unikey Wrapper For Fcitx"
 msgstr "Fcitx 用 Unikey ラッパー"
 
+#: src/fcitx-unikey.desc:41
+msgid "Use oà, _uý (instead of òa, úy)"
+msgstr "oà, _uý を使う (òa, úyの代替)"
+
+#: src/fcitx-unikey.desc:10
+msgid "UserIM"
+msgstr ""
+
+#: src/fcitx-unikey.desc:8 src/fcitx-unikey.desc:22
+msgid "VIQR"
+msgstr ""
+
+#: src/fcitx-unikey.desc:7
+msgid "VNI"
+msgstr ""
+
+#: src/fcitx-unikey.desc:21
+msgid "VNI Win"
+msgstr ""
+
 #: macro-editor/model.cpp:46
 msgid "Word"
 msgstr "単語"
diff --git a/po/vi.po b/po/vi.po
index 549d3e7..247189b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -3,14 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# ddk.jk <alanbradley.vi@gmail.com>, 2013
+# bizover <contact@bizover.net>, 2013
+# ddk.jk <alanbradley.vi@gmail.com>, 2013
+# ddk.jk <alanbradley.vi@gmail.com>, 2013
 # Lê Quốc Tuấn <mr.lequoctuan@gmail.com>, 2009
 # Xuetian Weng <wengxt@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
-"POT-Creation-Date: 2013-04-25 00:02-0400\n"
-"PO-Revision-Date: 2013-01-18 20:49+0000\n"
+"POT-Creation-Date: 2014-04-30 20:02+0200\n"
+"PO-Revision-Date: 2014-04-30 17:03+0000\n"
 "Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/fcitx/"
 "language/vi/)\n"
@@ -36,6 +40,22 @@
 msgid "&Import"
 msgstr "&Nhập"
 
+#: src/fcitx-unikey.desc:46
+msgid "Allow type with more freedom"
+msgstr "Cho phép gõ tự do"
+
+#: src/fcitx-unikey.desc:51
+msgid "Auto restore keys with invalid words"
+msgstr "Tự động khôi phục phím với từ không hợp lệ"
+
+#: src/fcitx-unikey.desc:23
+msgid "BK HCM 2"
+msgstr "BK HCM 2"
+
+#: src/fcitx-unikey.desc:24
+msgid "CString"
+msgstr "CString"
+
 #: src/unikey-ui.cpp:105 src/unikey-ui.cpp:172
 msgid "Choose input method"
 msgstr "Chọn kiểu gõ"
@@ -50,34 +70,85 @@
 
 #: src/unikey-ui.cpp:128 src/unikey-ui.cpp:188
 msgid "Enable Macro"
-msgstr "Bật gõ tắt"
+msgstr "Bật Macro"
 
 #: src/unikey-ui.cpp:120 src/unikey-ui.cpp:183
 msgid "Enable Spell Check"
 msgstr "Bật kiểm tra chính tả"
 
+#: src/fcitx-unikey.desc:36
+msgid "Enable macro"
+msgstr "Bật macro"
+
+#: src/fcitx-unikey.desc:31
+msgid "Enable spell check"
+msgstr "Cho phép kiểm tra chính tả"
+
+#: src/fcitx-unikey.desc:4
+msgid "Input Method"
+msgstr "Kiểu gõ"
+
 #: macro-editor/model.cpp:44 src/unikey-ui.cpp:127 src/unikey-ui.cpp:187
 #: src/fcitx-unikey.conf.in:10
 msgid "Macro"
-msgstr "gõ tắt"
+msgstr "Macro"
+
+#: src/fcitx-unikey.desc:9
+msgid "Microsoft Vietnamese"
+msgstr ""
+
+#: src/fcitx-unikey.desc:25
+msgid "NCR Decimal"
+msgstr "NCR Decimal"
+
+#: src/fcitx-unikey.desc:26
+msgid "NCR Hex"
+msgstr "NCR Hex"
 
 #: src/unikey-ui.cpp:187
 msgid "No Macro"
-msgstr "Tắt gõ tắt"
+msgstr "Không Macro"
 
 #: src/unikey-ui.cpp:182
 msgid "No Spell Check"
-msgstr "Tắt kiểm tra chính tả"
+msgstr "Không kiểm tra chính tả"
 
-#: src/unikey-ui.cpp:156
+#: src/unikey-ui.cpp:156 src/fcitx-unikey.desc:17
 msgid "Output Charset"
 msgstr "Bảng mã"
 
+#: src/fcitx-unikey.desc:56
+msgid "Process W at word begin"
+msgstr ""
+
+#: src/fcitx-unikey.desc:11
+msgid "Simple Telex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:12
+msgid "Simple Telex2"
+msgstr ""
+
 #: src/unikey-ui.cpp:119 src/unikey-ui.cpp:182
 msgid "Spell Check"
-msgstr "kiểm tra chính tả"
+msgstr "Kiểm tra chính tả"
 
-#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3
+#: src/fcitx-unikey.desc:20
+msgid "TCVN3"
+msgstr "TCVN3"
+
+#: src/fcitx-unikey.desc:6
+msgid "Telex"
+msgstr "Telex"
+
+#: src/fcitx-unikey.desc:19
+msgid "Unicode"
+msgstr "Unicode"
+
+#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3 src/unikey.conf.in:3
+#: src/fcitx-unikey.desc:1 src/fcitx-unikey.desc:14 src/fcitx-unikey.desc:28
+#: src/fcitx-unikey.desc:33 src/fcitx-unikey.desc:38 src/fcitx-unikey.desc:43
+#: src/fcitx-unikey.desc:48 src/fcitx-unikey.desc:53
 msgid "Unikey"
 msgstr "Unikey"
 
@@ -85,13 +156,33 @@
 msgid "Unikey Input Method"
 msgstr "Unikey Kiểu gõ"
 
-#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:71
+#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:76
 msgid "Unikey Macro Editor"
-msgstr ""
+msgstr "Bộ chỉnh macro cho Unikey"
 
 #: src/fcitx-unikey.conf.in:4
 msgid "Unikey Wrapper For Fcitx"
+msgstr "Bộ Unikey dành cho Fcitx"
+
+#: src/fcitx-unikey.desc:41
+msgid "Use oà, _uý (instead of òa, úy)"
+msgstr "Đặt dấu theo dạng oà , uý (thay vì òa, úy)"
+
+#: src/fcitx-unikey.desc:10
+msgid "UserIM"
 msgstr ""
+
+#: src/fcitx-unikey.desc:8 src/fcitx-unikey.desc:22
+msgid "VIQR"
+msgstr "VIQR"
+
+#: src/fcitx-unikey.desc:7
+msgid "VNI"
+msgstr ""
+
+#: src/fcitx-unikey.desc:21
+msgid "VNI Win"
+msgstr "VNI Win"
 
 #: macro-editor/model.cpp:46
 msgid "Word"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bfab2ad..b0d4e20 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,15 +5,17 @@
 # Translators:
 # Christopher Meng <cickumqt@gmail.com>, 2012
 # marguerite su <i@marguerite.su>, 2012
+# Xuetian Weng <wengxt@gmail.com>, 2013-2014
 # Xuetian Weng <wengxt@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
-"POT-Creation-Date: 2013-04-25 00:02-0400\n"
-"PO-Revision-Date: 2013-01-18 20:49+0000\n"
+"POT-Creation-Date: 2014-05-08 07:01+0200\n"
+"PO-Revision-Date: 2014-05-08 04:53+0000\n"
 "Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
-"Language-Team: Chinese (China) <fcitx-dev@googlegroups.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/fcitx/"
+"language/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,6 +38,22 @@
 msgid "&Import"
 msgstr "导入(&I)"
 
+#: src/fcitx-unikey.desc:46
+msgid "Allow type with more freedom"
+msgstr "允许更自由的输入"
+
+#: src/fcitx-unikey.desc:51
+msgid "Auto restore keys with invalid words"
+msgstr "自动恢复无效词的键"
+
+#: src/fcitx-unikey.desc:23
+msgid "BK HCM 2"
+msgstr "BK HCM 2"
+
+#: src/fcitx-unikey.desc:24
+msgid "CString"
+msgstr "CString"
+
 #: src/unikey-ui.cpp:105 src/unikey-ui.cpp:172
 msgid "Choose input method"
 msgstr "选择输入法"
@@ -56,10 +74,34 @@
 msgid "Enable Spell Check"
 msgstr "启用拼写检查"
 
+#: src/fcitx-unikey.desc:36
+msgid "Enable macro"
+msgstr "启用宏"
+
+#: src/fcitx-unikey.desc:31
+msgid "Enable spell check"
+msgstr "启用拼写检查"
+
+#: src/fcitx-unikey.desc:4
+msgid "Input Method"
+msgstr "输入法"
+
 #: macro-editor/model.cpp:44 src/unikey-ui.cpp:127 src/unikey-ui.cpp:187
 #: src/fcitx-unikey.conf.in:10
 msgid "Macro"
 msgstr "宏"
+
+#: src/fcitx-unikey.desc:9
+msgid "Microsoft Vietnamese"
+msgstr ""
+
+#: src/fcitx-unikey.desc:25
+msgid "NCR Decimal"
+msgstr "NCR Decimal"
+
+#: src/fcitx-unikey.desc:26
+msgid "NCR Hex"
+msgstr "NCR Hex"
 
 #: src/unikey-ui.cpp:187
 msgid "No Macro"
@@ -69,15 +111,42 @@
 msgid "No Spell Check"
 msgstr "禁用拼写检查"
 
-#: src/unikey-ui.cpp:156
+#: src/unikey-ui.cpp:156 src/fcitx-unikey.desc:17
 msgid "Output Charset"
 msgstr "输出字符集"
+
+#: src/fcitx-unikey.desc:56
+msgid "Process W at word begin"
+msgstr "在单词开头处理 W"
+
+#: src/fcitx-unikey.desc:11
+msgid "Simple Telex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:12
+msgid "Simple Telex2"
+msgstr ""
 
 #: src/unikey-ui.cpp:119 src/unikey-ui.cpp:182
 msgid "Spell Check"
 msgstr "拼写检查"
 
-#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3
+#: src/fcitx-unikey.desc:20
+msgid "TCVN3"
+msgstr "TCVN3"
+
+#: src/fcitx-unikey.desc:6
+msgid "Telex"
+msgstr "Telex"
+
+#: src/fcitx-unikey.desc:19
+msgid "Unicode"
+msgstr "Unicode"
+
+#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3 src/unikey.conf.in:3
+#: src/fcitx-unikey.desc:1 src/fcitx-unikey.desc:14 src/fcitx-unikey.desc:28
+#: src/fcitx-unikey.desc:33 src/fcitx-unikey.desc:38 src/fcitx-unikey.desc:43
+#: src/fcitx-unikey.desc:48 src/fcitx-unikey.desc:53
 msgid "Unikey"
 msgstr "Unikey"
 
@@ -85,7 +154,7 @@
 msgid "Unikey Input Method"
 msgstr "Unikey 输入法"
 
-#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:71
+#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:76
 msgid "Unikey Macro Editor"
 msgstr "Unikey 宏编辑器"
 
@@ -93,6 +162,26 @@
 msgid "Unikey Wrapper For Fcitx"
 msgstr "Fcitx 的 Unikey 封装"
 
+#: src/fcitx-unikey.desc:41
+msgid "Use oà, _uý (instead of òa, úy)"
+msgstr "使用 oà, _uý (替换òa, úy)"
+
+#: src/fcitx-unikey.desc:10
+msgid "UserIM"
+msgstr ""
+
+#: src/fcitx-unikey.desc:8 src/fcitx-unikey.desc:22
+msgid "VIQR"
+msgstr "VIQR"
+
+#: src/fcitx-unikey.desc:7
+msgid "VNI"
+msgstr "VNI"
+
+#: src/fcitx-unikey.desc:21
+msgid "VNI Win"
+msgstr "VNI Win"
+
 #: macro-editor/model.cpp:46
 msgid "Word"
 msgstr "单词"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index acf93c9..65dd41c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
-"POT-Creation-Date: 2013-04-25 00:02-0400\n"
-"PO-Revision-Date: 2013-01-18 20:49+0000\n"
+"POT-Creation-Date: 2014-04-30 19:02+0200\n"
+"PO-Revision-Date: 2013-10-18 07:14+0000\n"
 "Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/fcitx/"
 "language/zh_TW/)\n"
@@ -35,6 +35,22 @@
 msgid "&Import"
 msgstr "匯入 (&I)"
 
+#: src/fcitx-unikey.desc:46
+msgid "Allow type with more freedom"
+msgstr ""
+
+#: src/fcitx-unikey.desc:51
+msgid "Auto restore keys with invalid words"
+msgstr ""
+
+#: src/fcitx-unikey.desc:23
+msgid "BK HCM 2"
+msgstr ""
+
+#: src/fcitx-unikey.desc:24
+msgid "CString"
+msgstr ""
+
 #: src/unikey-ui.cpp:105 src/unikey-ui.cpp:172
 msgid "Choose input method"
 msgstr "選擇輸入法"
@@ -55,10 +71,34 @@
 msgid "Enable Spell Check"
 msgstr "啟用拼字檢查"
 
+#: src/fcitx-unikey.desc:36
+msgid "Enable macro"
+msgstr ""
+
+#: src/fcitx-unikey.desc:31
+msgid "Enable spell check"
+msgstr ""
+
+#: src/fcitx-unikey.desc:4
+msgid "Input Method"
+msgstr ""
+
 #: macro-editor/model.cpp:44 src/unikey-ui.cpp:127 src/unikey-ui.cpp:187
 #: src/fcitx-unikey.conf.in:10
 msgid "Macro"
 msgstr "巨集"
+
+#: src/fcitx-unikey.desc:9
+msgid "Microsoft Vietnamese"
+msgstr ""
+
+#: src/fcitx-unikey.desc:25
+msgid "NCR Decimal"
+msgstr ""
+
+#: src/fcitx-unikey.desc:26
+msgid "NCR Hex"
+msgstr ""
 
 #: src/unikey-ui.cpp:187
 msgid "No Macro"
@@ -68,15 +108,42 @@
 msgid "No Spell Check"
 msgstr "停用拼寫檢查"
 
-#: src/unikey-ui.cpp:156
+#: src/unikey-ui.cpp:156 src/fcitx-unikey.desc:17
 msgid "Output Charset"
 msgstr "輸出字元集"
+
+#: src/fcitx-unikey.desc:56
+msgid "Process W at word begin"
+msgstr ""
+
+#: src/fcitx-unikey.desc:11
+msgid "Simple Telex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:12
+msgid "Simple Telex2"
+msgstr ""
 
 #: src/unikey-ui.cpp:119 src/unikey-ui.cpp:182
 msgid "Spell Check"
 msgstr "拼字檢查"
 
-#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3
+#: src/fcitx-unikey.desc:20
+msgid "TCVN3"
+msgstr ""
+
+#: src/fcitx-unikey.desc:6
+msgid "Telex"
+msgstr ""
+
+#: src/fcitx-unikey.desc:19
+msgid "Unicode"
+msgstr ""
+
+#: src/unikey-im.cpp:152 src/fcitx-unikey.conf.in:3 src/unikey.conf.in:3
+#: src/fcitx-unikey.desc:1 src/fcitx-unikey.desc:14 src/fcitx-unikey.desc:28
+#: src/fcitx-unikey.desc:33 src/fcitx-unikey.desc:38 src/fcitx-unikey.desc:43
+#: src/fcitx-unikey.desc:48 src/fcitx-unikey.desc:53
 msgid "Unikey"
 msgstr "Unikey"
 
@@ -84,7 +151,7 @@
 msgid "Unikey Input Method"
 msgstr "Unikey 輸入法"
 
-#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:71
+#: macro-editor/editor.cpp:48 macro-editor/editor.cpp:76
 msgid "Unikey Macro Editor"
 msgstr "Unikey 巨集編輯器"
 
@@ -92,6 +159,26 @@
 msgid "Unikey Wrapper For Fcitx"
 msgstr "Fcitx 的 Unikey 封裝"
 
+#: src/fcitx-unikey.desc:41
+msgid "Use oà, _uý (instead of òa, úy)"
+msgstr ""
+
+#: src/fcitx-unikey.desc:10
+msgid "UserIM"
+msgstr ""
+
+#: src/fcitx-unikey.desc:8 src/fcitx-unikey.desc:22
+msgid "VIQR"
+msgstr ""
+
+#: src/fcitx-unikey.desc:7
+msgid "VNI"
+msgstr ""
+
+#: src/fcitx-unikey.desc:21
+msgid "VNI Win"
+msgstr ""
+
 #: macro-editor/model.cpp:46
 msgid "Word"
 msgstr "單字"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe62153..9845d45 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,6 +18,7 @@
 
 fcitx_add_addon_full(unikey
    SOURCES ${fcitx_unikey_sources}
+   DESC
    LINK_LIBS unikey
    IM_CONFIG unikey.conf
    )
diff --git a/src/fcitx-unikey.desc b/src/fcitx-unikey.desc
index 723366a..cb5cf13 100644
--- a/src/fcitx-unikey.desc
+++ b/src/fcitx-unikey.desc
@@ -2,11 +2,14 @@
 Type=Enum
 DefaultValue=Telex
 Description=Input Method
-EnumCount=4
+EnumCount=7
 Enum0=Telex
-Enum1=Vni
-Enum2=STelex
-Enum3=STelex2
+Enum1=VNI
+Enum2=VIQR
+Enum3=Microsoft Vietnamese
+Enum4=UserIM
+Enum5=Simple Telex
+Enum6=Simple Telex2
 
 [Unikey/OutputCharset]
 Type=Enum
diff --git a/src/unikey-ui.cpp b/src/unikey-ui.cpp
index a204701..6f051fd 100644
--- a/src/unikey-ui.cpp
+++ b/src/unikey-ui.cpp
@@ -19,8 +19,8 @@
 
 #include "unikey-im.h"
 
-const char*          Unikey_IMNames[]    = {"Telex", "Vni", "STelex", "STelex2"};
-const UkInputMethod   Unikey_IM[]         = {UkTelex, UkVni, UkSimpleTelex, UkSimpleTelex2};
+const char*          Unikey_IMNames[]    = {"Telex", "VNI", "VIQR", "Microsoft Vietnamese", "UserIM",  "Simple Telex", "Simple Telex2"};
+const UkInputMethod   Unikey_IM[]         = {UkTelex, UkVni, UkViqr, UkMsVi, UkUsrIM, UkSimpleTelex, UkSimpleTelex2};
 const unsigned int    NUM_INPUTMETHOD     = sizeof(Unikey_IM)/sizeof(Unikey_IM[0]);
 
 const char*          Unikey_OCNames[]    = {"Unicode",