Update Setup dialog

 * Add hanja key configuration ui
 * Migrate to GtkBuilder: use intltool, change ui filename
 * Update po files
 * Issue #689
   http://code.google.com/p/ibus/issues/detail?id=689
   https://bugzilla.redhat.com/show_bug.cgi?id=493509

3 files changed, 97 insertions, 38 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2c97c14..1d9b7d9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,5 @@
+setup/keycapturedialog.py
 setup/main.py
-setup/setup.glade
+[type: gettext/glade]setup/setup.ui
 src/engine.c
 src/main.c
diff --git a/po/ko.po b/po/ko.po
index f28865e..a8d265b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ibus-hangul\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-10-31 16:11+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-13 20:54+0900\n"
 "PO-Revision-Date: 2009-02-18 23:32+0900\n"
 "Last-Translator: Choe Hwanjin <choe.hwanjin@gmail.com>\n"
 "Language-Team: korean <ko@li.org>\n"
@@ -15,62 +15,93 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: setup/main.py:44
+#: ../setup/main.py:46 ../setup/setup.ui.h:4
+msgid "Hangul"
+msgstr "한글"
+
+#: ../setup/main.py:51
 msgid "Dubeolsik"
 msgstr "두벌식"
 
-#: setup/main.py:45
+#: ../setup/main.py:52
 msgid "Sebeolsik Final"
 msgstr "세벌식 최종"
 
-#: setup/main.py:46
+#: ../setup/main.py:53
 msgid "Sebeolsik 390"
 msgstr "세벌식 390"
 
-#: setup/main.py:47
+#: ../setup/main.py:54
 msgid "Sebeolsik No-shift"
 msgstr "세벌식 순아래"
 
-#: setup/main.py:48
+#: ../setup/main.py:55
 msgid "Sebeolsik 2 set"
 msgstr "세벌식 두벌배열"
 
-#: setup/main.py:49
+#: ../setup/main.py:56
 msgid "Romaja"
 msgstr "로마자"
 
-#: setup/setup.glade:8
-msgid "IBusHangul Setup"
-msgstr "IBus 한글 설정"
+#: ../setup/main.py:142
+msgid "Select Hanja key"
+msgstr "한자키를 선택하시오"
+
+#: ../setup/keycapturedialog.py:15
+msgid ""
+"Press any key which you want to use as hanja key. The key you pressed is "
+"displayed below.\n"
+"If you want to use it, click \"Ok\" or click \"Cancel\""
+msgstr ""
+"한자키로 사용하고자 하는 키를 입력하십시오. 그러면 그 키가 아래에 표시될 것입"
+"니다.\n"
+"그 키를 사용하시려면 \"확인\"을 누르시고, 사용하지 않으시려면 \"취소\"를누르"
+"십시오."
 
-#: setup/setup.glade:34
+#: ../setup/setup.ui.h:1
+msgid "<b>Hanja key</b>"
+msgstr "<b>한자키</b>"
+
+#: ../setup/setup.ui.h:2
 msgid "<b>Keyboard Layout</b>"
 msgstr "<b>자판 설정</b>"
 
-#: setup/setup.glade:58
+#: ../setup/setup.ui.h:3
+msgid "Advanced"
+msgstr "고급"
+
+#: ../setup/setup.ui.h:5
+msgid "Hanja"
+msgstr "한자"
+
+#: ../setup/setup.ui.h:6
+msgid "IBusHangul Setup"
+msgstr "IBus 한글 설정"
+
+#: ../setup/setup.ui.h:7
 msgid "_Hangul keyboard:"
 msgstr "한글 자판(_H)"
 
-#: src/engine.c:216
+#: ../src/engine.c:248
 msgid "Hanja lock"
 msgstr "한자 전용"
 
-#: src/engine.c:217
+#: ../src/engine.c:249
 msgid "Enable/Disable Hanja mode"
 msgstr "한자 전용 모드 선택합니다"
 
-#: src/engine.c:229
+#: ../src/engine.c:261
 msgid "Setup"
 msgstr "설정"
 
-#: src/engine.c:230
+#: ../src/engine.c:262
 msgid "Configure hangul engine"
 msgstr "한글 입력기를 설정합니다"
 
-#: src/main.c:52
+#: ../src/main.c:52
 msgid "Hangul input method"
 msgstr "한글 입력기"
 
-#: src/main.c:61 src/main.c:62
+#: ../src/main.c:61 ../src/main.c:62
 msgid "Hangul Input Method"
 msgstr "한글 입력기"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 18baeeb..bcf176c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-10-31 16:11+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-13 20:54+0900\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"
@@ -16,62 +16,89 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: setup/main.py:44
+#: ../setup/main.py:46 ../setup/setup.ui.h:4
+msgid "Hangul"
+msgstr ""
+
+#: ../setup/main.py:51
 msgid "Dubeolsik"
 msgstr ""
 
-#: setup/main.py:45
+#: ../setup/main.py:52
 msgid "Sebeolsik Final"
 msgstr ""
 
-#: setup/main.py:46
+#: ../setup/main.py:53
 msgid "Sebeolsik 390"
 msgstr ""
 
-#: setup/main.py:47
+#: ../setup/main.py:54
 msgid "Sebeolsik No-shift"
 msgstr ""
 
-#: setup/main.py:48
+#: ../setup/main.py:55
 msgid "Sebeolsik 2 set"
 msgstr ""
 
-#: setup/main.py:49
+#: ../setup/main.py:56
 msgid "Romaja"
 msgstr ""
 
-#: setup/setup.glade:8
-msgid "IBusHangul Setup"
+#: ../setup/main.py:142
+msgid "Select Hanja key"
+msgstr ""
+
+#: ../setup/keycapturedialog.py:15
+msgid ""
+"Press any key which you want to use as hanja key. The key you pressed is "
+"displayed below.\n"
+"If you want to use it, click \"Ok\" or click \"Cancel\""
+msgstr ""
+
+#: ../setup/setup.ui.h:1
+msgid "<b>Hanja key</b>"
 msgstr ""
 
-#: setup/setup.glade:34
+#: ../setup/setup.ui.h:2
 msgid "<b>Keyboard Layout</b>"
 msgstr ""
 
-#: setup/setup.glade:58
+#: ../setup/setup.ui.h:3
+msgid "Advanced"
+msgstr ""
+
+#: ../setup/setup.ui.h:5
+msgid "Hanja"
+msgstr ""
+
+#: ../setup/setup.ui.h:6
+msgid "IBusHangul Setup"
+msgstr ""
+
+#: ../setup/setup.ui.h:7
 msgid "_Hangul keyboard:"
 msgstr ""
 
-#: src/engine.c:216
+#: ../src/engine.c:248
 msgid "Hanja lock"
 msgstr ""
 
-#: src/engine.c:217
+#: ../src/engine.c:249
 msgid "Enable/Disable Hanja mode"
 msgstr ""
 
-#: src/engine.c:229
+#: ../src/engine.c:261
 msgid "Setup"
 msgstr ""
 
-#: src/engine.c:230
+#: ../src/engine.c:262
 msgid "Configure hangul engine"
 msgstr ""
 
-#: src/main.c:52
+#: ../src/main.c:52
 msgid "Hangul input method"
 msgstr ""
 
-#: src/main.c:61 src/main.c:62
+#: ../src/main.c:61 ../src/main.c:62
 msgid "Hangul Input Method"
 msgstr ""