From 3d68f2129245cb03b485836ad94c30c5ba5afb2b Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Fri, 22 Aug 2008 10:55:16 +0800
Subject: [PATCH] Update translation.

---
 po/POTFILES.in |  1 +
 po/zh_CN.po    | 33 +++++++++++++++++++++++++++------
 setup/main.py  |  2 +-
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 31ad61a..052e645 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -35,6 +35,7 @@
 ./gconf/main.py
 ./gconf/config.py
 ./setup/main.py
+./setup/keyboardshortcut.py
 ./daemon/bus.py
 ./daemon/register.py
 ./daemon/contextmanager.py
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7a05cf1..2652a91 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1.20080813\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2008-08-21 21:35+0800\n"
+"POT-Creation-Date: 2008-08-22 10:54+0800\n"
 "PO-Revision-Date: 2008-08-13 21:59+0800\n"
 "Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
 "Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n"
@@ -385,15 +385,15 @@ msgstr "繁体中文"
 
 #: setup/main.py:91
 msgid "trigger"
-msgstr ""
+msgstr "开关"
 
 #: setup/main.py:91
 msgid "next_engine"
-msgstr ""
+msgstr "下一个引擎"
 
 #: setup/main.py:91
 msgid "prev_engine"
-msgstr ""
+msgstr "上一个引擎"
 
 #: setup/main.py:116
 msgid "IBus daemon is not started. Do you want to start it now?"
@@ -417,8 +417,28 @@ msgstr "预加载"
 
 #: setup/main.py:196
 #, python-format
-msgid "Select keyboart shortcut for %s"
+msgid "Select keyboard shortcut for %s"
+msgstr "选择%s的快捷键"
+
+#: setup/keyboardshortcut.py:60
+msgid "Key code:"
+msgstr "按键:"
+
+#: setup/keyboardshortcut.py:75
+msgid "Modifiers:"
+msgstr "修饰符:"
+
+#: setup/keyboardshortcut.py:204
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
 msgstr ""
+"请按一个键盘按键（或者一个组合按键）\n"
+"当您松开任意按键时，对话框会自动关闭。"
+
+#: setup/keyboardshortcut.py:206
+msgid "Please press a key (or a key combination)"
+msgstr "请按一个键盘按键（或者一个组合按键）"
 
 #: setup/setup.glade:7
 msgid "IBus - Setup"
@@ -456,7 +476,8 @@ msgstr "候选词表方向:"
 msgid ""
 "Horizontal\n"
 "Vertical"
-msgstr "æ°´å¹³\n"
+msgstr ""
+"æ°´å¹³\n"
 "竖直"
 
 #: setup/setup.glade:261
diff --git a/setup/main.py b/setup/main.py
index 56c394c..e9cf7c4 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -193,7 +193,7 @@ class Setup(object):
 
     def __shortcut_button_clicked_cb(self, button, name, entry):
         buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OK, gtk.RESPONSE_OK)
-        title = _("Select keyboart shortcut for %s") %  _(name)
+        title = _("Select keyboard shortcut for %s") %  _(name)
         dialog = keyboardshortcut.KeyboardShortcutSelectionDialog(buttons = buttons, title = title)
         text = entry.get_text()
         if text:
-- 
2.7.4