Update tooltip of status icon.

2 files changed, 47 insertions, 43 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 59aea5e..866018b 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: 2009-02-17 16:05+0800\n"
+"POT-Creation-Date: 2009-02-23 14:34+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"
@@ -16,24 +16,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ibus/lang.py:40 ui/gtk/panel.py:310 ui/gtk/panel.py:311 ui/gtk/panel.py:312
-#: ui/gtk/panel.py:313
+#: ibus/lang.py:40 ui/gtk/panel.py:312 ui/gtk/panel.py:313 ui/gtk/panel.py:314
+#: ui/gtk/panel.py:315
 msgid "Other"
 msgstr "其他"
 
 #: ui/gtk/panel.py:97
-msgid "IBus - Running"
-msgstr "IBus - 运行"
+msgid "IBus input method framework"
+msgstr "IBus输入法框架"
 
-#: ui/gtk/panel.py:280
+#: ui/gtk/panel.py:282
 msgid "Restart"
-msgstr ""
+msgstr "重新启动"
 
-#: ui/gtk/panel.py:379
+#: ui/gtk/panel.py:381
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ui/gtk/panel.py:383
+#: ui/gtk/panel.py:385
 msgid "translator-credits"
 msgstr "Huang Peng <shawn.p.huang@gmail.com>"
 
@@ -104,38 +104,34 @@ msgid "Select an input method"
 msgstr "选择输入法"
 
 #: setup/setup.glade:7
-msgid "IBus - Setup"
-msgstr "IBus - 设置"
+msgid "IBus Preferences"
+msgstr ""
 
-#: setup/setup.glade:32
-msgid "Auto start IBus on session login"
-msgstr "启动桌面时自动启动IBus"
+#: setup/setup.glade:48 setup/setup.glade:67 setup/setup.glade:86
+msgid "..."
+msgstr ""
 
-#: setup/setup.glade:60
-msgid "Trigger:"
-msgstr "开关:"
+#: setup/setup.glade:148
+msgid "Previous engine:"
+msgstr "上一个引擎:"
 
-#: setup/setup.glade:74
+#: setup/setup.glade:164
 msgid "Next engine:"
 msgstr "下一个引擎:"
 
-#: setup/setup.glade:90
-msgid "Previous engine:"
-msgstr "上一个引擎:"
-
-#: setup/setup.glade:153 setup/setup.glade:170 setup/setup.glade:190
-msgid "..."
-msgstr ""
+#: setup/setup.glade:180
+msgid "Trigger:"
+msgstr "开关:"
 
-#: setup/setup.glade:211
+#: setup/setup.glade:197
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>快捷键</b>"
 
-#: setup/setup.glade:243
+#: setup/setup.glade:228
 msgid "Lookup table orientation:"
 msgstr "候选词表方向:"
 
-#: setup/setup.glade:254
+#: setup/setup.glade:239
 msgid ""
 "Horizontal\n"
 "Vertical"
@@ -143,43 +139,51 @@ msgstr ""
 "水平\n"
 "竖直"
 
-#: setup/setup.glade:267
+#: setup/setup.glade:252
 msgid "Auto hide language bar"
 msgstr "自动隐藏语言栏"
 
-#: setup/setup.glade:279
+#: setup/setup.glade:264
 msgid "Use custom font"
 msgstr "使用自定义字体"
 
-#: setup/setup.glade:305
-msgid "<b>UI</b>"
+#: setup/setup.glade:290
+msgid "<b>Font and Style</b>"
+msgstr ""
+
+#: setup/setup.glade:316
+msgid "Start ibus on login"
+msgstr "启动桌面时自动启动IBus"
+
+#: setup/setup.glade:326
+msgid "<b>Startup</b>"
 msgstr "<b>用户界面</b>"
 
-#: setup/setup.glade:328
+#: setup/setup.glade:351
 msgid "General"
 msgstr "通用"
 
-#: setup/setup.glade:399
+#: setup/setup.glade:422
 msgid "gtk-add"
 msgstr ""
 
-#: setup/setup.glade:409
+#: setup/setup.glade:432
 msgid "gtk-remove"
 msgstr ""
 
-#: setup/setup.glade:422
+#: setup/setup.glade:445
 msgid "gtk-go-up"
 msgstr ""
 
-#: setup/setup.glade:435
+#: setup/setup.glade:458
 msgid "gtk-go-down"
 msgstr ""
 
-#: setup/setup.glade:460
-msgid "Engine"
+#: setup/setup.glade:483
+msgid "Engines"
 msgstr "输入法引擎"
 
-#: setup/setup.glade:477
+#: setup/setup.glade:499
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -189,10 +193,10 @@ msgid ""
 "\n"
 msgstr ""
 
-#: setup/setup.glade:502
+#: setup/setup.glade:524
 msgid "About"
 msgstr "关于"
 
-#: setup/setup.glade:524
+#: setup/setup.glade:546
 msgid "gtk-close"
 msgstr ""
diff --git a/ui/gtk/panel.py b/ui/gtk/panel.py
index 8129bd9..ee29ea0 100644
--- a/ui/gtk/panel.py
+++ b/ui/gtk/panel.py
@@ -94,7 +94,7 @@ class Panel(ibus.PanelBase):
         self.__status_icon.connect("popup-menu", self.__status_icon_popup_menu_cb)
         self.__status_icon.connect("activate", self.__status_icon_activate_cb)
         self.__status_icon.set_from_file(self.__ibus_icon)
-        self.__status_icon.set_tooltip(_("IBus - Running"))
+        self.__status_icon.set_tooltip(_("IBus input method framework"))
         self.__status_icon.set_visible(True)
 
         self.__config_load_lookup_table_orientation()