diff --git a/.gitignore b/.gitignore
index 2d6dd88..9cdab48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ ibus-table-1.3.0.20100621.tar.gz
 /ibus-table-1.3.9.20110827.tar.gz
 /ibus-table-1.4.99.20120907.tar.gz
 /ibus-table-1.4.99.20121113.tar.gz
+/ibus-table-1.4.99.20130103.tar.gz
diff --git a/0001-Fix-marking-of-translatable-strings-for-gettext.patch b/0001-Fix-marking-of-translatable-strings-for-gettext.patch
deleted file mode 100644
index e1a82eb..0000000
--- a/0001-Fix-marking-of-translatable-strings-for-gettext.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From ab19e1a63f73040bd7f423923b0e886d8c87bd54 Mon Sep 17 00:00:00 2001
-From: Mike FABIAN <mfabian@redhat.com>
-Date: Tue, 13 Nov 2012 07:59:07 +0100
-Subject: [PATCH 1/5] Fix marking of translatable strings for gettext
-
-was broken in:
-
-commit 6d2ab577c41c9b07a84c049137c8184bb67f5e30
-Author: Caius 'kaio' Chance <me@kaio.net>
-Date:   Fri Oct 5 10:40:47 2012 +1000
-
-    Refactor _refresh_properties() function.
----
- engine/table.py | 42 +++++++++++++++++++++---------------------
- 1 file changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/engine/table.py b/engine/table.py
-index a7354bc..7ea8403 100644
---- a/engine/table.py
-+++ b/engine/table.py
-@@ -1052,57 +1052,57 @@ class tabengine (ibus.EngineBase):
-         # taken and modified from PinYin.py :)
-         if self._mode == 1: # refresh mode
-             if self._status == u'CN':
--                self._set_property(self._status_property, 'chinese.svg', 'Chinese Mode', 'Switch to English mode')
-+                self._set_property(self._status_property, 'chinese.svg', _('Chinese Mode'), _('Switch to English mode'))
-             else:
--                self._set_property(self._status_property, 'ibus-table.svg', self._status, 'Switch to English mode')
-+                self._set_property(self._status_property, 'ibus-table.svg', self._status, _('Switch to English mode'))
-         else:
--            self._set_property(self._status_property, 'english.svg', 'English Mode', 'Switch to Table mode')
-+            self._set_property(self._status_property, 'english.svg', _('English Mode'), _('Switch to Table mode'))
- 
-         if self._full_width_letter[self._mode]:
--            self._set_property(self._letter_property, 'full-letter.svg', 'Full Letter', 'Switch to half-width letter')
-+            self._set_property(self._letter_property, 'full-letter.svg', _('Full Letter'), _('Switch to half-width letter'))
-         else:
--            self._set_property(self._letter_property, 'half-letter.svg', 'Half Letter', 'Switch to full-width letter')
-+            self._set_property(self._letter_property, 'half-letter.svg', _('Half Letter'), _('Switch to full-width letter'))
- 
-         if self._full_width_punct[self._mode]:
--            self._set_property(self._punct_property, 'full-punct.svg', 'Full-width Punctuation', 'Switch to half-width punctuation')
-+            self._set_property(self._punct_property, 'full-punct.svg', _('Full-width Punctuation'), _('Switch to half-width punctuation'))
-         else:
--            self._set_property(self._punct_property, 'half-punct.svg', 'Half-width Punctuation', 'Switch to full-width punctuation')
-+            self._set_property(self._punct_property, 'half-punct.svg', _('Half-width Punctuation'), _('Switch to full-width punctuation'))
- 
-         if self._editor._py_mode:
--            self._set_property(self._py_property, 'py-mode.svg', 'PinYin Mode', 'Switch to Table mode')
-+            self._set_property(self._py_property, 'py-mode.svg', _('PinYin Mode'), _('Switch to Table mode'))
-         else:
--            self._set_property(self._py_property, 'tab-mode.svg', 'Table Mode', 'Switch to PinYin mode')
-+            self._set_property(self._py_property, 'tab-mode.svg', _('Table Mode'), _('Switch to PinYin mode'))
- 
-         if self._editor._onechar:
--            self._set_property(self._onechar_property, 'onechar.svg', 'Single Char Mode', 'Switch to phrase mode')
-+            self._set_property(self._onechar_property, 'onechar.svg', _('Single Char Mode'), _('Switch to phrase mode'))
-         else:
--            self._set_property(self._onechar_property, 'phrase.svg', 'Phrase Mode', 'Switch to single char mode')
-+            self._set_property(self._onechar_property, 'phrase.svg', _('Phrase Mode'), _('Switch to single char mode'))
- 
-         if self._auto_commit:
--            self._set_property(self._auto_commit_property, 'acommit.svg', 'Direct Commit Mode', 'Switch to normal commit mode, which use space to commit') 
-+            self._set_property(self._auto_commit_property, 'acommit.svg', _('Direct Commit Mode'), _('Switch to normal commit mode, which use space to commit')) 
-         else:
--            self._set_property(self._auto_commit_property, 'ncommit.svg', 'Normal Commit Mode', 'Switch to direct commit mode')
-+            self._set_property(self._auto_commit_property, 'ncommit.svg', _('Normal Commit Mode'), _('Switch to direct commit mode'))
- 
-         # the chinese_mode:
-         if self.db._is_chinese:
-             if self._editor._chinese_mode == 0:
--                self._set_property(self._cmode_property, 'sc-mode.svg', 'Simplified Chinese Mode', 'Switch to Traditional Chinese mode')
-+                self._set_property(self._cmode_property, 'sc-mode.svg', _('Simplified Chinese Mode'), _('Switch to Traditional Chinese mode'))
-             elif self._editor._chinese_mode == 1:
--                self._set_property(self._cmode_property, 'tc-mode.svg', 'Traditional Chinese Mode', 'Switch to Simplify Chinese first Big Charset Mode')
-+                self._set_property(self._cmode_property, 'tc-mode.svg', _('Traditional Chinese Mode'), _('Switch to Simplify Chinese first Big Charset Mode'))
-             elif self._editor._chinese_mode == 2:
--                self._set_property(self._cmode_property, 'scb-mode.svg', 'Simplified Chinese First Big Charset Mode', 'Switch to Traditional Chinese first Big Charset Mode')
-+                self._set_property(self._cmode_property, 'scb-mode.svg', _('Simplified Chinese First Big Charset Mode'), _('Switch to Traditional Chinese first Big Charset Mode'))
-             elif self._editor._chinese_mode == 3:
--                self._set_property(self._cmode_property, 'tcb-mode.svg', 'Traditional Chinese First Big Charset Mode', 'Switch to Big Charset Mode')
-+                self._set_property(self._cmode_property, 'tcb-mode.svg', _('Traditional Chinese First Big Charset Mode'), _('Switch to Big Charset Mode'))
-             elif self._editor._chinese_mode == 4:
--                self._set_property(self._cmode_property, 'cb-mode.svg', 'Big Chinese Mode', 'Switch to Simplified Chinese Mode')
-+                self._set_property(self._cmode_property, 'cb-mode.svg', _('Big Chinese Mode'), _('Switch to Simplified Chinese Mode'))
- 
-         # use buildin method to update properties :)
-         map (self.update_property, self.properties)
- 
-     def _set_property (self, property, icon, label, tooltip):
--        property.set_icon ( u'%s%s' % (self._icon_dir, icon ) ) 
--        property.set_label ( _( unicode(label) ) )
--        property.set_tooltip ( _( unicode(tooltip) ) )
-+        property.set_icon ( u'%s%s' % (self._icon_dir, icon ) )
-+        property.set_label ( unicode(label) )
-+        property.set_tooltip ( unicode(tooltip) )
- 
-     def _change_mode (self):
-         '''Shift input mode, TAB -> EN -> TAB
--- 
-1.7.11.7
-
diff --git a/0002-update-zh_-.po-files.patch b/0002-update-zh_-.po-files.patch
deleted file mode 100644
index fddac4f..0000000
--- a/0002-update-zh_-.po-files.patch
+++ /dev/null
@@ -1,643 +0,0 @@
-From 8099bc679dfb78f874d77a4188e34d572edae3b6 Mon Sep 17 00:00:00 2001
-From: Mike FABIAN <mfabian@redhat.com>
-Date: Tue, 13 Nov 2012 08:32:24 +0100
-Subject: [PATCH 2/5] update zh_??.po files
-
----
- po/zh_CN.po | 120 +++++++++++++++++++++++++++--------------------------------
- po/zh_HK.po |  71 +++++++++++++++++------------------
- po/zh_TW.po | 121 +++++++++++++++++++++++++++---------------------------------
- 3 files changed, 145 insertions(+), 167 deletions(-)
-
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index b8a6382..e3ec5a0 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -7,8 +7,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: 0.1.20080819\n"
- "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
--"POT-Creation-Date: 2012-10-03 17:05+1000\n"
--"PO-Revision-Date: 2008-08-19 15:08+0800\n"
-+"POT-Creation-Date: 2012-11-13 08:58+0100\n"
-+"PO-Revision-Date: 2012-11-13 08:18+0100\n"
- "Last-Translator: Yu Yuwei <acevery@gmail.com>\n"
- "Language-Team: Yu Yuwei <acevery@gmail.com>\n"
- "Language: \n"
-@@ -16,148 +16,136 @@ msgstr ""
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: engine/table.py:1026
-+#: engine/table.py:1055
- msgid "Chinese Mode"
--msgstr ""
-+msgstr "中文模式"
- 
--#: engine/table.py:1030
-+#: engine/table.py:1055 engine/table.py:1057
- msgid "Switch to English mode"
- msgstr "切换到英文模式"
- 
--#: engine/table.py:1033
--#, fuzzy
-+#: engine/table.py:1059
- msgid "English Mode"
--msgstr "切换到英文模式"
-+msgstr "英文模式"
- 
--#: engine/table.py:1034 engine/table.py:1057
-+#: engine/table.py:1059 engine/table.py:1072
- msgid "Switch to Table mode"
- msgstr "切换到形码模式"
- 
--#: engine/table.py:1038
-+#: engine/table.py:1062
- msgid "Full Letter"
--msgstr ""
-+msgstr "全角字符"
- 
--#: engine/table.py:1039
-+#: engine/table.py:1062
- msgid "Switch to half-width letter"
- msgstr "切换到半角字符"
- 
--#: engine/table.py:1042
-+#: engine/table.py:1064
- msgid "Half Letter"
--msgstr ""
-+msgstr "半角字符"
- 
--#: engine/table.py:1043
-+#: engine/table.py:1064
- msgid "Switch to full-width letter"
- msgstr "切换到全角字符"
- 
--#: engine/table.py:1047
--#, fuzzy
-+#: engine/table.py:1067
- msgid "Full-width Punctuation"
--msgstr "切换到全角标点"
-+msgstr "全角标点"
- 
--#: engine/table.py:1048
-+#: engine/table.py:1067
- msgid "Switch to half-width punctuation"
- msgstr "切换到半角标点"
- 
--#: engine/table.py:1051
--#, fuzzy
-+#: engine/table.py:1069
- msgid "Half-width Punctuation"
--msgstr "切换到半角标点"
-+msgstr "半角标点"
- 
--#: engine/table.py:1052
-+#: engine/table.py:1069
- msgid "Switch to full-width punctuation"
- msgstr "切换到全角标点"
- 
--#: engine/table.py:1056
--#, fuzzy
-+#: engine/table.py:1072
- msgid "PinYin Mode"
--msgstr "切换到拼音反查模式"
-+msgstr "拼音反查模式"
- 
--#: engine/table.py:1061
--#, fuzzy
-+#: engine/table.py:1074
- msgid "Table Mode"
--msgstr "切换到形码模式"
-+msgstr "形码模式"
- 
--#: engine/table.py:1062
-+#: engine/table.py:1074
- msgid "Switch to PinYin mode"
- msgstr "切换到拼音反查模式"
- 
--#: engine/table.py:1066
--#, fuzzy
-+#: engine/table.py:1077
- msgid "Single Char Mode"
--msgstr "切换到单字模式"
-+msgstr "单字模式"
- 
--#: engine/table.py:1067
-+#: engine/table.py:1077
- msgid "Switch to phrase mode"
- msgstr "切换到词组模式"
- 
--#: engine/table.py:1070
-+#: engine/table.py:1079
- msgid "Phrase Mode"
--msgstr ""
-+msgstr "词组模式"
- 
--#: engine/table.py:1071
-+#: engine/table.py:1079
- msgid "Switch to single char mode"
- msgstr "切换到单字模式"
- 
--#: engine/table.py:1074
--#, fuzzy
-+#: engine/table.py:1082
- msgid "Direct Commit Mode"
--msgstr "切换直接提交模式"
-+msgstr "直接提交模式"
- 
--#: engine/table.py:1075
-+#: engine/table.py:1082
- msgid "Switch to normal commit mode, which use space to commit"
- msgstr "切换到普通提交模式，即用空格键提交"
- 
--#: engine/table.py:1078
-+#: engine/table.py:1084
- msgid "Normal Commit Mode"
--msgstr ""
-+msgstr "普通提交模式"
- 
--#: engine/table.py:1079
-+#: engine/table.py:1084
- msgid "Switch to direct commit mode"
--msgstr "切换直接提交模式"
-+msgstr "切换到直接提交模式"
- 
--#: engine/table.py:1085
--#, fuzzy
-+#: engine/table.py:1089
- msgid "Simplified Chinese Mode"
--msgstr "切换到简体模式"
-+msgstr "简体模式"
- 
--#: engine/table.py:1086
-+#: engine/table.py:1089
- msgid "Switch to Traditional Chinese mode"
- msgstr "切换到繁体模式"
- 
--#: engine/table.py:1090
--#, fuzzy
-+#: engine/table.py:1091
- msgid "Traditional Chinese Mode"
--msgstr "切换到繁体模式"
-+msgstr "繁体模式"
- 
- #: engine/table.py:1091
- msgid "Switch to Simplify Chinese first Big Charset Mode"
- msgstr "切换到简体优先的大字集模式"
- 
--#: engine/table.py:1095
--#, fuzzy
-+#: engine/table.py:1093
- msgid "Simplified Chinese First Big Charset Mode"
--msgstr "切换到简体优先的大字集模式"
-+msgstr "简体优先的大字集模式"
- 
--#: engine/table.py:1096
-+#: engine/table.py:1093
- msgid "Switch to Traditional Chinese first Big Charset Mode"
- msgstr "切换到繁体优先的大字集模式"
- 
--#: engine/table.py:1100
--#, fuzzy
--msgid "Traditional Chinese Big First Charset Mode"
--msgstr "切换到繁体优先的大字集模式"
-+#: engine/table.py:1095
-+msgid "Traditional Chinese First Big Charset Mode"
-+msgstr "繁体优先的大字集模式"
- 
--#: engine/table.py:1101
-+#: engine/table.py:1095
- msgid "Switch to Big Charset Mode"
- msgstr "切换到大字集模式"
- 
--#: engine/table.py:1105
--#, fuzzy
-+#: engine/table.py:1097
- msgid "Big Chinese Mode"
--msgstr "切换到大字集模式"
-+msgstr "大字集模式"
- 
--#: engine/table.py:1106
--msgid "Switch to Simplify Chinese Mode"
-+#: engine/table.py:1097
-+msgid "Switch to Simplified Chinese Mode"
- msgstr "切换到简体模式"
- 
- #~ msgid "CN"
-diff --git a/po/zh_HK.po b/po/zh_HK.po
-index 26d79c8..e9627f3 100644
---- a/po/zh_HK.po
-+++ b/po/zh_HK.po
-@@ -7,7 +7,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: 0.1.20080819\n"
- "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
--"POT-Creation-Date: 2012-10-03 17:05+1000\n"
-+"POT-Creation-Date: 2012-11-13 08:58+0100\n"
- "PO-Revision-Date: 2009-05-21 13:17+1000\n"
- "Last-Translator: Caius 'kaio' Chance <k@kaio.me>\n"
- "Language-Team: Caius 'kaio' Chance <k@kaio.me>\n"
-@@ -16,115 +16,115 @@ msgstr ""
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: engine/table.py:1026
-+#: engine/table.py:1055
- msgid "Chinese Mode"
- msgstr ""
- 
--#: engine/table.py:1030
-+#: engine/table.py:1055 engine/table.py:1057
- msgid "Switch to English mode"
- msgstr "切換到中文模式"
- 
--#: engine/table.py:1033
-+#: engine/table.py:1059
- #, fuzzy
- msgid "English Mode"
- msgstr "切換到中文模式"
- 
--#: engine/table.py:1034 engine/table.py:1057
-+#: engine/table.py:1059 engine/table.py:1072
- msgid "Switch to Table mode"
- msgstr "切換成形碼模式"
- 
--#: engine/table.py:1038
-+#: engine/table.py:1062
- msgid "Full Letter"
- msgstr ""
- 
--#: engine/table.py:1039
-+#: engine/table.py:1062
- msgid "Switch to half-width letter"
- msgstr "切換成半形字元"
- 
--#: engine/table.py:1042
-+#: engine/table.py:1064
- msgid "Half Letter"
- msgstr ""
- 
--#: engine/table.py:1043
-+#: engine/table.py:1064
- msgid "Switch to full-width letter"
- msgstr "切換成全形字元"
- 
--#: engine/table.py:1047
-+#: engine/table.py:1067
- #, fuzzy
- msgid "Full-width Punctuation"
- msgstr "切換成全形標點"
- 
--#: engine/table.py:1048
-+#: engine/table.py:1067
- msgid "Switch to half-width punctuation"
- msgstr "切換成半形標點"
- 
--#: engine/table.py:1051
-+#: engine/table.py:1069
- #, fuzzy
- msgid "Half-width Punctuation"
- msgstr "切換成半形標點"
- 
--#: engine/table.py:1052
-+#: engine/table.py:1069
- msgid "Switch to full-width punctuation"
- msgstr "切換成全形標點"
- 
--#: engine/table.py:1056
-+#: engine/table.py:1072
- #, fuzzy
- msgid "PinYin Mode"
- msgstr "切換成拼音反查模式"
- 
--#: engine/table.py:1061
-+#: engine/table.py:1074
- #, fuzzy
- msgid "Table Mode"
- msgstr "切換成形碼模式"
- 
--#: engine/table.py:1062
-+#: engine/table.py:1074
- msgid "Switch to PinYin mode"
- msgstr "切換成拼音反查模式"
- 
--#: engine/table.py:1066
-+#: engine/table.py:1077
- #, fuzzy
- msgid "Single Char Mode"
- msgstr "切換成單字元模式"
- 
--#: engine/table.py:1067
-+#: engine/table.py:1077
- msgid "Switch to phrase mode"
- msgstr "切換成詞組模式"
- 
--#: engine/table.py:1070
-+#: engine/table.py:1079
- msgid "Phrase Mode"
- msgstr ""
- 
--#: engine/table.py:1071
-+#: engine/table.py:1079
- msgid "Switch to single char mode"
- msgstr "切換成單字元模式"
- 
--#: engine/table.py:1074
-+#: engine/table.py:1082
- #, fuzzy
- msgid "Direct Commit Mode"
- msgstr "切換成直接輸出模式，亦即單項結果即時輸出"
- 
--#: engine/table.py:1075
-+#: engine/table.py:1082
- msgid "Switch to normal commit mode, which use space to commit"
- msgstr "切換成標準輸出模式，亦即按空格鍵執行輸出"
- 
--#: engine/table.py:1078
-+#: engine/table.py:1084
- msgid "Normal Commit Mode"
- msgstr ""
- 
--#: engine/table.py:1079
-+#: engine/table.py:1084
- msgid "Switch to direct commit mode"
- msgstr "切換成直接輸出模式，亦即單項結果即時輸出"
- 
--#: engine/table.py:1085
-+#: engine/table.py:1089
- #, fuzzy
- msgid "Simplified Chinese Mode"
- msgstr "切換成簡體模式"
- 
--#: engine/table.py:1086
-+#: engine/table.py:1089
- msgid "Switch to Traditional Chinese mode"
- msgstr "切換成繁體模式"
- 
--#: engine/table.py:1090
-+#: engine/table.py:1091
- #, fuzzy
- msgid "Traditional Chinese Mode"
- msgstr "切換成繁體模式"
-@@ -133,31 +133,32 @@ msgstr "切換成繁體模式"
- msgid "Switch to Simplify Chinese first Big Charset Mode"
- msgstr "切換成大字集模式（簡體結果優先）"
- 
--#: engine/table.py:1095
-+#: engine/table.py:1093
- #, fuzzy
- msgid "Simplified Chinese First Big Charset Mode"
- msgstr "切換成大字集模式（簡體結果優先）"
- 
--#: engine/table.py:1096
-+#: engine/table.py:1093
- msgid "Switch to Traditional Chinese first Big Charset Mode"
- msgstr "切換成大字集模式（繁體結果優先）"
- 
--#: engine/table.py:1100
-+#: engine/table.py:1095
- #, fuzzy
--msgid "Traditional Chinese Big First Charset Mode"
-+msgid "Traditional Chinese First Big Charset Mode"
- msgstr "切換成大字集模式（繁體結果優先）"
- 
--#: engine/table.py:1101
-+#: engine/table.py:1095
- msgid "Switch to Big Charset Mode"
- msgstr "切換到大字集模式（預設結果順序）"
- 
--#: engine/table.py:1105
-+#: engine/table.py:1097
- #, fuzzy
- msgid "Big Chinese Mode"
- msgstr "切換到大字集模式（預設結果順序）"
- 
--#: engine/table.py:1106
--msgid "Switch to Simplify Chinese Mode"
-+#: engine/table.py:1097
-+#, fuzzy
-+msgid "Switch to Simplified Chinese Mode"
- msgstr "切換成簡體模式"
- 
- #~ msgid "CN"
-diff --git a/po/zh_TW.po b/po/zh_TW.po
-index 26d79c8..4d7cae7 100644
---- a/po/zh_TW.po
-+++ b/po/zh_TW.po
-@@ -7,8 +7,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: 0.1.20080819\n"
- "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
--"POT-Creation-Date: 2012-10-03 17:05+1000\n"
--"PO-Revision-Date: 2009-05-21 13:17+1000\n"
-+"POT-Creation-Date: 2012-11-13 08:58+0100\n"
-+"PO-Revision-Date: 2012-11-13 08:31+0100\n"
- "Last-Translator: Caius 'kaio' Chance <k@kaio.me>\n"
- "Language-Team: Caius 'kaio' Chance <k@kaio.me>\n"
- "Language: \n"
-@@ -16,148 +16,137 @@ msgstr ""
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: engine/table.py:1026
-+#: engine/table.py:1055
- msgid "Chinese Mode"
--msgstr ""
-+msgstr "中文模式"
- 
--#: engine/table.py:1030
-+#: engine/table.py:1055 engine/table.py:1057
- msgid "Switch to English mode"
--msgstr "切換到中文模式"
-+msgstr "切換成英文模式"
- 
--#: engine/table.py:1033
--#, fuzzy
-+#: engine/table.py:1059
- msgid "English Mode"
--msgstr "切換到中文模式"
-+msgstr "英文模式"
- 
--#: engine/table.py:1034 engine/table.py:1057
-+#: engine/table.py:1059 engine/table.py:1072
- msgid "Switch to Table mode"
- msgstr "切換成形碼模式"
- 
--#: engine/table.py:1038
-+#: engine/table.py:1062
- msgid "Full Letter"
--msgstr ""
-+msgstr "全形字元"
- 
--#: engine/table.py:1039
-+#: engine/table.py:1062
- msgid "Switch to half-width letter"
- msgstr "切換成半形字元"
- 
--#: engine/table.py:1042
-+#: engine/table.py:1064
- msgid "Half Letter"
--msgstr ""
-+msgstr "半形字元"
- 
--#: engine/table.py:1043
-+#: engine/table.py:1064
- msgid "Switch to full-width letter"
- msgstr "切換成全形字元"
- 
--#: engine/table.py:1047
--#, fuzzy
-+#: engine/table.py:1067
- msgid "Full-width Punctuation"
--msgstr "切換成全形標點"
-+msgstr "全形標點"
- 
--#: engine/table.py:1048
-+#: engine/table.py:1067
- msgid "Switch to half-width punctuation"
- msgstr "切換成半形標點"
- 
--#: engine/table.py:1051
--#, fuzzy
-+#: engine/table.py:1069
- msgid "Half-width Punctuation"
--msgstr "切換成半形標點"
-+msgstr "半形標點"
- 
--#: engine/table.py:1052
-+#: engine/table.py:1069
- msgid "Switch to full-width punctuation"
- msgstr "切換成全形標點"
- 
--#: engine/table.py:1056
--#, fuzzy
-+#: engine/table.py:1072
- msgid "PinYin Mode"
--msgstr "切換成拼音反查模式"
-+msgstr "拼音反查模式"
- 
--#: engine/table.py:1061
-+#: engine/table.py:1074
- #, fuzzy
- msgid "Table Mode"
--msgstr "切換成形碼模式"
-+msgstr "形碼模式"
- 
--#: engine/table.py:1062
-+#: engine/table.py:1074
- msgid "Switch to PinYin mode"
- msgstr "切換成拼音反查模式"
- 
--#: engine/table.py:1066
--#, fuzzy
-+#: engine/table.py:1077
- msgid "Single Char Mode"
--msgstr "切換成單字元模式"
-+msgstr "單字元模式"
- 
--#: engine/table.py:1067
-+#: engine/table.py:1077
- msgid "Switch to phrase mode"
- msgstr "切換成詞組模式"
- 
--#: engine/table.py:1070
-+#: engine/table.py:1079
- msgid "Phrase Mode"
--msgstr ""
-+msgstr "詞組模式"
- 
--#: engine/table.py:1071
-+#: engine/table.py:1079
- msgid "Switch to single char mode"
- msgstr "切換成單字元模式"
- 
--#: engine/table.py:1074
--#, fuzzy
-+#: engine/table.py:1082
- msgid "Direct Commit Mode"
--msgstr "切換成直接輸出模式，亦即單項結果即時輸出"
-+msgstr "直接輸出模式，亦即單項結果即時輸出"
- 
--#: engine/table.py:1075
-+#: engine/table.py:1082
- msgid "Switch to normal commit mode, which use space to commit"
- msgstr "切換成標準輸出模式，亦即按空格鍵執行輸出"
- 
--#: engine/table.py:1078
-+#: engine/table.py:1084
- msgid "Normal Commit Mode"
--msgstr ""
-+msgstr "標準輸出模式"
- 
--#: engine/table.py:1079
-+#: engine/table.py:1084
- msgid "Switch to direct commit mode"
- msgstr "切換成直接輸出模式，亦即單項結果即時輸出"
- 
--#: engine/table.py:1085
--#, fuzzy
-+#: engine/table.py:1089
- msgid "Simplified Chinese Mode"
--msgstr "切換成簡體模式"
-+msgstr "簡體模式"
- 
--#: engine/table.py:1086
-+#: engine/table.py:1089
- msgid "Switch to Traditional Chinese mode"
- msgstr "切換成繁體模式"
- 
--#: engine/table.py:1090
--#, fuzzy
-+#: engine/table.py:1091
- msgid "Traditional Chinese Mode"
--msgstr "切換成繁體模式"
-+msgstr "繁體模式"
- 
- #: engine/table.py:1091
- msgid "Switch to Simplify Chinese first Big Charset Mode"
- msgstr "切換成大字集模式（簡體結果優先）"
- 
--#: engine/table.py:1095
--#, fuzzy
-+#: engine/table.py:1093
- msgid "Simplified Chinese First Big Charset Mode"
--msgstr "切換成大字集模式（簡體結果優先）"
-+msgstr "大字集模式（簡體結果優先）"
- 
--#: engine/table.py:1096
-+#: engine/table.py:1093
- msgid "Switch to Traditional Chinese first Big Charset Mode"
- msgstr "切換成大字集模式（繁體結果優先）"
- 
--#: engine/table.py:1100
--#, fuzzy
--msgid "Traditional Chinese Big First Charset Mode"
--msgstr "切換成大字集模式（繁體結果優先）"
-+#: engine/table.py:1095
-+msgid "Traditional Chinese First Big Charset Mode"
-+msgstr "大字集模式（繁體結果優先）"
- 
--#: engine/table.py:1101
-+#: engine/table.py:1095
- msgid "Switch to Big Charset Mode"
--msgstr "切換到大字集模式（預設結果順序）"
-+msgstr "切換成大字集模式（預設結果順序）"
- 
--#: engine/table.py:1105
--#, fuzzy
-+#: engine/table.py:1097
- msgid "Big Chinese Mode"
--msgstr "切換到大字集模式（預設結果順序）"
-+msgstr "大字集模式（預設結果順序）"
- 
--#: engine/table.py:1106
--msgid "Switch to Simplify Chinese Mode"
-+#: engine/table.py:1097
-+msgid "Switch to Simplified Chinese Mode"
- msgstr "切換成簡體模式"
- 
- #~ msgid "CN"
--- 
-1.7.11.7
-
diff --git a/0003-Add-German-translation.patch b/0003-Add-German-translation.patch
deleted file mode 100644
index ef12f39..0000000
--- a/0003-Add-German-translation.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 7fa914591d2f5be7b93100f7d5ef3798b1a41399 Mon Sep 17 00:00:00 2001
-From: Mike FABIAN <mfabian@redhat.com>
-Date: Tue, 13 Nov 2012 08:34:54 +0100
-Subject: [PATCH 3/5] Add German translation
-
----
- po/LINGUAS |   1 +
- po/de.po   | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 152 insertions(+)
- create mode 100644 po/de.po
-
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 0585d7b..66f999b 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -1,3 +1,4 @@
-+de
- zh_CN
- zh_TW
- zh_HK
-diff --git a/po/de.po b/po/de.po
-new file mode 100644
-index 0000000..349c54e
---- /dev/null
-+++ b/po/de.po
-@@ -0,0 +1,151 @@
-+# IBus-Table Translation file: de.po
-+# Copyright (C) 2012 Mike FABIAN <mfabian@@redhat.com>
-+# This file is distributed under the same license as the ibus-table package.
-+# Mike FABIAN <mfabian@redhat>, 2012.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: ibus-table 1.4.99\n"
-+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-+"POT-Creation-Date: 2012-11-13 08:58+0100\n"
-+"PO-Revision-Date: 2012-11-13 08:57+0100\n"
-+"Last-Translator: Mike FABIAN <mfabian@redhat.com>\n"
-+"Language-Team: German <trans-de@lists.fedoraproject.org>\n"
-+"Language: de\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-+
-+#: engine/table.py:1055
-+msgid "Chinese Mode"
-+msgstr "Chinesischer Modus"
-+
-+#: engine/table.py:1055 engine/table.py:1057
-+msgid "Switch to English mode"
-+msgstr "In Englischen Modus wechseln"
-+
-+#: engine/table.py:1059
-+msgid "English Mode"
-+msgstr "Englischer Modus"
-+
-+#: engine/table.py:1059 engine/table.py:1072
-+msgid "Switch to Table mode"
-+msgstr "In Tabellen Modus wechseln"
-+
-+#: engine/table.py:1062
-+msgid "Full Letter"
-+msgstr "Buchstaben in voller Breite"
-+
-+#: engine/table.py:1062
-+msgid "Switch to half-width letter"
-+msgstr "Wechseln zu Buchstaben in halber Breite"
-+
-+#: engine/table.py:1064
-+msgid "Half Letter"
-+msgstr "Buchstaben in halber Breite"
-+
-+#: engine/table.py:1064
-+msgid "Switch to full-width letter"
-+msgstr "Wechseln zu Buchstaben in voller Breite"
-+
-+#: engine/table.py:1067
-+msgid "Full-width Punctuation"
-+msgstr "Zeichensetzung in voller Breite"
-+
-+#: engine/table.py:1067
-+msgid "Switch to half-width punctuation"
-+msgstr "Wechseln zu Zeichensetzung in halber Breite"
-+
-+#: engine/table.py:1069
-+msgid "Half-width Punctuation"
-+msgstr "Zeichensetzung in halber Breite"
-+
-+#: engine/table.py:1069
-+msgid "Switch to full-width punctuation"
-+msgstr "Wechseln zu Zeichensetzung in voller Breite"
-+
-+#: engine/table.py:1072
-+msgid "PinYin Mode"
-+msgstr "PinYin Modus"
-+
-+#: engine/table.py:1074
-+msgid "Table Mode"
-+msgstr "Tabellenmodus"
-+
-+#: engine/table.py:1074
-+msgid "Switch to PinYin mode"
-+msgstr "Wechseln zum PinYin Modus"
-+
-+#: engine/table.py:1077
-+msgid "Single Char Mode"
-+msgstr "Einzelzeichenmodus"
-+
-+#: engine/table.py:1077
-+msgid "Switch to phrase mode"
-+msgstr "Wechseln zum Satzmodus"
-+
-+#: engine/table.py:1079
-+msgid "Phrase Mode"
-+msgstr "Satzmodus"
-+
-+#: engine/table.py:1079
-+msgid "Switch to single char mode"
-+msgstr "Wechseln zum Einzelzeichenmodus"
-+
-+#: engine/table.py:1082
-+msgid "Direct Commit Mode"
-+msgstr "Direkter Commitmodus"
-+
-+#: engine/table.py:1082
-+msgid "Switch to normal commit mode, which use space to commit"
-+msgstr ""
-+"Wechseln zum normalen Commitmodus (Commit beim Tippen des Leerzeichens)"
-+
-+#: engine/table.py:1084
-+msgid "Normal Commit Mode"
-+msgstr "Normaler Commitmodus"
-+
-+#: engine/table.py:1084
-+msgid "Switch to direct commit mode"
-+msgstr "Wechseln zu direktem Commitmodus"
-+
-+#: engine/table.py:1089
-+msgid "Simplified Chinese Mode"
-+msgstr "Modus für vereinfachtes Chinesisch"
-+
-+#: engine/table.py:1089
-+msgid "Switch to Traditional Chinese mode"
-+msgstr "Wechseln zum Modus für traditionelles Chinesisch"
-+
-+#: engine/table.py:1091
-+msgid "Traditional Chinese Mode"
-+msgstr "Modus für traditionelles Chinesisch"
-+
-+#: engine/table.py:1091
-+msgid "Switch to Simplify Chinese first Big Charset Mode"
-+msgstr "Wechseln zu vereinfachtem Chinesisch, Big5 Zeichensatz bevorzugt"
-+
-+#: engine/table.py:1093
-+msgid "Simplified Chinese First Big Charset Mode"
-+msgstr "Vereinfachtes Chinesisch, Big5 Zeichensatz bevorzugt"
-+
-+#: engine/table.py:1093
-+msgid "Switch to Traditional Chinese first Big Charset Mode"
-+msgstr "Wechseln zu traditionellem Chinesisch, Big5 Zeichensatz bevorzugt"
-+
-+#: engine/table.py:1095
-+msgid "Traditional Chinese First Big Charset Mode"
-+msgstr "Traditionelles Chinesisch, Big5 Zeichensatz bevorzugt"
-+
-+#: engine/table.py:1095
-+msgid "Switch to Big Charset Mode"
-+msgstr "Wechseln in Big5 Zeichensatzmodus"
-+
-+#: engine/table.py:1097
-+msgid "Big Chinese Mode"
-+msgstr "Big5 Zeichensatzmodus"
-+
-+#: engine/table.py:1097
-+msgid "Switch to Simplified Chinese Mode"
-+msgstr "Wechseln zum Modus für vereinfachtes Chinesisch"
--- 
-1.7.11.7
-
diff --git a/0005-Do-not-fail-if-the-.ibus-byo-tables-directory-does-n.patch b/0005-Do-not-fail-if-the-.ibus-byo-tables-directory-does-n.patch
deleted file mode 100644
index a0ea385..0000000
--- a/0005-Do-not-fail-if-the-.ibus-byo-tables-directory-does-n.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 12abcdbdc55aa1f25fcbe725ce70765b8519674e Mon Sep 17 00:00:00 2001
-From: Mike FABIAN <mfabian@redhat.com>
-Date: Tue, 13 Nov 2012 10:24:13 +0100
-Subject: [PATCH 5/5] Do not fail if the ~/.ibus/byo-tables/ directory does
- not exist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-“/usr/libexec/ibus-engine-table --xml” aborted with an error
-if ~/.ibus/byo-tables did not exist.
----
- engine/main.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/engine/main.py b/engine/main.py
-index eca9e9b..0065371 100644
---- a/engine/main.py
-+++ b/engine/main.py
-@@ -161,8 +161,10 @@ def main():
-         #    Elements
-         dbs = os.listdir(db_dir)
-         dbs = filter (lambda x: x.endswith('.db'), dbs)
--        byo_dbs = os.listdir(byo_db_dir)
--        byo_dbs = filter (lambda x: x.endswith('.db'), byo_dbs)
-+        byo_dbs = []
-+        if os.path.isdir(byo_db_dir):
-+            byo_dbs = os.listdir(byo_db_dir)
-+            byo_dbs = filter (lambda x: x.endswith('.db'), byo_dbs)
-        
-         _all_dbs = []
-         for _db in dbs:
--- 
-1.7.11.7
-
diff --git a/ibus-table.spec b/ibus-table.spec
index bd51377..9089233 100644
--- a/ibus-table.spec
+++ b/ibus-table.spec
@@ -1,5 +1,5 @@
 Name:       ibus-table
-Version:    1.4.99.20121113
+Version:    1.4.99.20130103
 Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
@@ -100,6 +100,9 @@ Development files for %{name}.
 %{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Jan 03 2013 Mike FABIAN <mfabian@redhat.com> - 1.4.99.20130103-1
+- update to latest upstream 1.4.99.20130103 from Caius ‘kaio’ Chance’s repository, 1.5.0 branch
+
 * Tue Nov 13 2012 Mike FABIAN <mfabian@redhat.com> - 1.4.99.20121113-1
 - update to latest upstream 1.4.99.20121113 from Caius ‘kaio’ Chance’s repository, using rel20121101 git tag
 - remove ibus-table-1.4.99.20120907-improve-chinese-category-check.patch (included upstream)
diff --git a/sources b/sources
index 22a4a21..eddf7d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9596ff254a86f9d20064eed8c6a99d86  ibus-table-1.4.99.20121113.tar.gz
+5dc041dac24bf4a76c4b8d1d1b39e846  ibus-table-1.4.99.20130103.tar.gz