From 65c0269615e5f2596601dd9c1d2f4e2d170f28c9 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Wed, 26 Aug 2009 17:25:29 +0800
Subject: [PATCH] Update po files.

---
 po/ar.po          | 26 +++++++++++---------------
 po/as.po          | 26 +++++++++++---------------
 po/bn_IN.po       | 26 +++++++++++---------------
 po/ca.po          | 35 +++++++++++++++++++----------------
 po/da.po          | 26 +++++++++++---------------
 po/de.po          | 26 +++++++++++---------------
 po/es.po          | 35 +++++++++++++++++++----------------
 po/fr.po          | 26 +++++++++++---------------
 po/gu.po          | 26 +++++++++++---------------
 po/hi.po          | 26 +++++++++++---------------
 po/hu.po          | 26 +++++++++++---------------
 po/ibus.pot       | 26 +++++++++++---------------
 po/ja.po          | 26 +++++++++++---------------
 po/kn.po          | 26 +++++++++++---------------
 po/ml.po          | 35 +++++++++++++++++++----------------
 po/mr.po          | 26 +++++++++++---------------
 po/or.po          | 26 +++++++++++---------------
 po/pa.po          | 26 +++++++++++---------------
 po/pl.po          | 26 +++++++++++---------------
 po/sr.po          | 26 +++++++++++---------------
 po/sr@latin.po    | 26 +++++++++++---------------
 po/ta.po          | 26 +++++++++++---------------
 po/te.po          | 26 +++++++++++---------------
 po/vi.po          | 26 +++++++++++---------------
 po/zh_CN.po       | 34 ++++++++++++++++------------------
 po/zh_HK.po       | 26 +++++++++++---------------
 po/zh_TW.po       | 26 +++++++++++---------------
 setup/setup.glade |  4 ++--
 28 files changed, 328 insertions(+), 413 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index f419a51..5f1b793 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-04-06 11:45+0800\n"
 "Last-Translator: Muayyad Alsadi <alsadi@ojuba.org>\n"
 "Language-Team: Arabic <AR@li.org>\n"
@@ -20,29 +20,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "إطار إطرق الإدخال IBUS"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "أخرى"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "إعادة تشغيل"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "لا يوجد طريقة إدخال"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "نظام IBus هو ناقل إدخال ذكي لنظام لينكس ويونكس."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Muayyad Alsadi <alsadi@ojuba.org>"
 
@@ -312,11 +312,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "استخدم خط مخصص في لوحة اللغة"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -402,9 +402,5 @@ msgstr "استخدم خط مخصص في لوحة اللغة"
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
-
 #~ msgid "[Control+space]"
 #~ msgstr "[Control+space]"
diff --git a/po/as.po b/po/as.po
index 41f8c30..d053319 100644
--- a/po/as.po
+++ b/po/as.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.ibus.as\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-05-26 15:19+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan@fedoraproject.org>\n"
 "Language-Team: Assamese <fedora-trans-as@redhat.com>\n"
@@ -20,29 +20,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus input method framework"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "অন্য"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "পুনৰাৰম্ভ"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "কোনো নিবেশ পদ্ধতি নাই"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus এটা Linux/Unix ৰ কাৰণে বুদ্ধিমান নিবেশ bus ।"
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)"
 
@@ -322,11 +322,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্টৰ নাম ব্যৱহাৰ কৰক"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -413,10 +413,6 @@ msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্ব
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
-
 #~ msgid "[Control+space]"
 #~ msgstr "[Control+space]"
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 4965602..5a59317 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.bn_IN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-05-26 11:28+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab@fedoraproject.org>\n"
 "Language-Team: Bengali INDIA <fedora-trans-bn_in@redhat.com>\n"
@@ -21,29 +21,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus ইনপুট পদ্ধতির পরিকাঠামো"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "পুনরারম্ভ"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "ইনপুট পদ্ধতি অনুপস্থিত"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
 
@@ -324,11 +324,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "ভাষার প্যানেলের জন্য স্বনির্ধারিত ফন্টের নাম ব্যবহার করা হবে"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -415,7 +415,3 @@ msgstr "ভাষার প্যানেলের জন্য স্বনি
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/ca.po b/po/ca.po
index abf4afd..0249474 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-08-24 20:43+0200\n"
 "Last-Translator: Patricia Rivera Escuder <patysya@gmail.com>\n"
 "Language-Team: Catalan <fedora@softcatala.net>\n"
@@ -33,29 +33,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "Entorn de mètodes d'entrada IBus"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "Altres"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "Reinicia"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "Cap mètode d'entrada"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus és un bus d'entrada intel·ligent per a Linux/Unix."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr ""
 "Oscar Osta Pueyo <oostap@gmail.com>, 2009\n"
@@ -336,12 +336,13 @@ msgstr ""
 "candidats"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
-msgstr "Usa la configuració de la disposició de teclat del sistema (XKB)"
+#, fuzzy
+msgid "Use system keyboard (XKB) layout"
+msgstr "Utilitza la disposició de teclat del sistema"
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
-msgstr "Usa la configuració de la disposició de teclat del sistema"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
+msgstr "Utilitza la disposició de teclat del sistema"
 
 #: ../setup/setup.glade.h:49
 msgid "gtk-about"
@@ -427,6 +428,8 @@ msgstr "Empra el tipus de lletra personalitzat per al quadre d'idiomes"
 msgid "Use system keyboard (XKB) layout setting"
 msgstr "Utilitza la configuració de la disposició de teclat del sistema (XKB)"
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr "Utilitza la disposició de teclat del sistema"
+#~ msgid "Use system keyboard layout (XKB) setting"
+#~ msgstr "Usa la configuració de la disposició de teclat del sistema (XKB)"
+
+#~ msgid "Use system keyboard layout setting"
+#~ msgstr "Usa la configuració de la disposició de teclat del sistema"
diff --git a/po/da.po b/po/da.po
index 6b66dd3..757a4a7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-06-11 17:58+0200\n"
 "Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -19,29 +19,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus-ramme for inddatametode"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "Andre"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "Genstart"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "Ingen inddatametode"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus er en intelligent inddatabus til Linux/Unix."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr ""
 "Kris Thomsen\n"
@@ -327,11 +327,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -421,9 +421,5 @@ msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
-
 #~ msgid "[Control+space]"
 #~ msgstr "[Control+space]"
diff --git a/po/de.po b/po/de.po
index 85bba1a..8d4059e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iBus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-04-17 11:32+0100\n"
 "Last-Translator: Fabian Affolter <fab@fedoraproject.org>\n"
 "Language-Team: Gemran <fedora-trans-de@redhat.com>\n"
@@ -20,29 +20,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus-Eingabemethode-Framework"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "Sonstige"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "Neustart"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "Keine Eingabemethode"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Fabian Affolter <fab@fedoraproject.org>, 2009."
 
@@ -311,11 +311,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr ""
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -402,9 +402,5 @@ msgstr ""
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
-
 #~ msgid "[Control+space]"
 #~ msgstr "[Ctrl+Leertaste]"
diff --git a/po/es.po b/po/es.po
index 2f53ee7..aabc525 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Domingo Becker <domingobecker@gmail.com>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
@@ -15,29 +15,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "Marco de trabajo para métodos de entrada IBus"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "Otro"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "Ningún método de entrada"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus es un bus de entrada inteligente para Linux/Unix."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Domingo Becker, <domingobecker@gmail.com>, 2009"
 
@@ -323,12 +323,13 @@ msgid "Use custom font for language bar and candidates"
 msgstr "Usar fuente personalizada para la barra de idiomas y candidatos"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
-msgstr "Usar la configuración de diseño del teclado del sistema (XKB)"
+#, fuzzy
+msgid "Use system keyboard (XKB) layout"
+msgstr "Usar el diseño del teclado del sistema"
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
-msgstr "Usar la configuración de diseño del teclado del sistema"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
+msgstr "Usar el diseño del teclado del sistema"
 
 #: ../setup/setup.glade.h:49
 msgid "gtk-about"
@@ -417,9 +418,11 @@ msgstr "Usar nombre de fuente personalizada para el panel de idioma"
 msgid "Use system keyboard (XKB) layout setting"
 msgstr "Usar configuración de diseño del teclado del sistema (XKB)"
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr "Usar el diseño del teclado del sistema"
+#~ msgid "Use system keyboard layout (XKB) setting"
+#~ msgstr "Usar la configuración de diseño del teclado del sistema (XKB)"
+
+#~ msgid "Use system keyboard layout setting"
+#~ msgstr "Usar la configuración de diseño del teclado del sistema"
 
 #~ msgid "[Control+space]"
 #~ msgstr "[Control+space]"
diff --git a/po/fr.po b/po/fr.po
index 1062037..af8620b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-05-05 13:53+0200\n"
 "Last-Translator: Humbert Julien <julroy67@gmail.com>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -26,29 +26,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "Framework de méthode d'entrée IBus"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "Autre"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "Redémarrer IBus"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "Aucune méthode d'entrée"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix"
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "HUMBERT Julien <julroy67@gmail.com>"
 
@@ -327,11 +327,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "Utiliser une police personnalisée pour le panneau de langue"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -418,7 +418,3 @@ msgstr "Utiliser une police personnalisée pour le panneau de langue"
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 70c2972..c4da718 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-05-26 11:50+0530\n"
 "Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
 "Language-Team: Gujarati\n"
@@ -21,29 +21,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus ઇનપુટ પદ્દતિ ફ્રેમવર્ક"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "બીજા"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "ફરી શરી કરો"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "ઇનપુટ પદ્દતિ નથી"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus એ Linux/Unix માટે હોશિયાર ઇનપુટ બસ છે."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
 
@@ -323,11 +323,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "ભાષા પેનલ માટે વૈવિધેય ફોન્ટ નામ ને વાપરો"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -412,7 +412,3 @@ msgstr "ભાષા પેનલ માટે વૈવિધેય ફોન
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 5b9a33e..6a02f7d 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-05-27 13:41+0530\n"
 "Last-Translator: Rajesh Ranjan <rajesh672@gmail.com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
@@ -24,29 +24,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus इनपुट विधि फ्रेमवर्क"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "अन्य"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "पुनः प्रारंभ करें"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "कोई इनपुट विधि नहीं"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus Linux/Unix के लिए तेज तर्रार इनपुट बस है."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "राजेश रंजन (rranjan@redhat.com)"
 
@@ -326,11 +326,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "भाषा पटल के लिए मनपसंद फ़ॉन्ट नाम का प्रयोग करें"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -415,7 +415,3 @@ msgstr "भाषा पटल के लिए मनपसंद फ़ॉन
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 11a8d9b..cd2cff3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IBus master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-04-11 10:58+0200\n"
 "Last-Translator: Sulyok Péter <peti@fedoraproject.org>\n"
 "Language-Team: Hungarian <fedora-trans-hu@redhat.com>\n"
@@ -19,29 +19,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus bevitel eljárás keretrendszer"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "Más"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "Nincs bevitel eljárás"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus egy okos bemenő csatorna Linux/Unixhoz"
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Sulyok Péter <peti@fedoraproject.org>, 2009."
 
@@ -320,11 +320,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "Saját betű használata a nyelv panelen"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -413,9 +413,5 @@ msgstr "Saját betű használata a nyelv panelen"
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
-
 #~ msgid "[Control+space]"
 #~ msgstr "[Ctrl+szóköz]"
diff --git a/po/ibus.pot b/po/ibus.pot
index 1448e62..e647697 100644
--- a/po/ibus.pot
+++ b/po/ibus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\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"
@@ -20,28 +20,28 @@ msgstr ""
 msgid "IBus"
 msgstr ""
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr ""
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr ""
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr ""
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 msgid "Turn off input method"
 msgstr ""
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr ""
 
@@ -292,11 +292,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr ""
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -380,7 +380,3 @@ msgstr ""
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 2231fca..9111863 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-04-11 03:13+0900\n"
 "Last-Translator: IWAI, Masaharu <iwai@alib.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -21,29 +21,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus インプットメソッドフレームワーク"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "その他"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "再起動"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "インプットメソッドがありません"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は、Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr ""
 "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
@@ -317,11 +317,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr ""
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -409,10 +409,6 @@ msgstr ""
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
-
 #~ msgid "Switch engine"
 #~ msgstr "エンジンの変更"
 
diff --git a/po/kn.po b/po/kn.po
index 2e5b572..edb980c 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-06-08 17:55+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: Kannada <en@li.org>\n"
@@ -21,29 +21,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "ಇತರೆ"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "ಪುನರಾರಂಭಿಸು"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "ಯಾವುದೆ ಇನ್‌ಪುಟ್ ವಿಧಾನವಿಲ್ಲ"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ಎನ್ನುವುದು Linux/Unix ಗಾಗಿನ ಒಂದು ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
 
@@ -323,11 +323,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -413,7 +413,3 @@ msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಇಚ್ಛೆಯ ಅಕ್
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 5e7f6b3..dcbdfba 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.ml\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-07-14 13:01+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -21,29 +21,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus ഇന്‍പുട്ട് മെഥേഡ് ആകൃതി"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "മറ്റുള്ളവ"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "വീണ്ടും ആരംഭിക്കുക"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "ഇന്‍പുട്ട് മെഥേഡ് ലഭ്യമല്ല"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "ലിനക്സ്/യുണിക്സിനുള്ള ഇന്റലിജന്റ് ഇന്‍പുട്ട് ബസാണു് IBus."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "അനി പീറ്റര്‍ <apeter@redhat.com>"
 
@@ -317,12 +317,13 @@ msgid "Use custom font for language bar and candidates"
 msgstr "ഭാഷ്ക്കുള്ള പാനലില്‍ നിങ്ങള്‍ സജ്ജമാക്കിയ അക്ഷരസഞ്ചയത്തിന്റെ പേരു് ഉപയോഗിക്കുക"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
-msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃകാ (XKB) സജ്ജീകരണം ഉപയോഗിക്കുക"
+#, fuzzy
+msgid "Use system keyboard (XKB) layout"
+msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃക ഉപയോഗിക്കുക"
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
-msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃകാ സജ്ജീകരണം ഉപയോഗിക്കുക"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
+msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃക ഉപയോഗിക്കുക"
 
 #: ../setup/setup.glade.h:49
 msgid "gtk-about"
@@ -409,6 +410,8 @@ msgstr "ഭാഷ്ക്കുള്ള പാനലില്‍ നിങ്
 msgid "Use system keyboard (XKB) layout setting"
 msgstr "സിസ്റ്റം കീബോര്‍ഡ് (XKB) മാതൃകാ സജ്ജീകരണം ഉപയോഗിക്കുക"
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃക ഉപയോഗിക്കുക"
+#~ msgid "Use system keyboard layout (XKB) setting"
+#~ msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃകാ (XKB) സജ്ജീകരണം ഉപയോഗിക്കുക"
+
+#~ msgid "Use system keyboard layout setting"
+#~ msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃകാ സജ്ജീകരണം ഉപയോഗിക്കുക"
diff --git a/po/mr.po b/po/mr.po
index ed1d27f..7a35ea4 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.mr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-05-26 14:10+0530\n"
 "Last-Translator: Sandeep Shedmake <sandeep.shedmake@gmail.com>\n"
 "Language-Team: marathi\n"
@@ -21,29 +21,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus इन्पुट पद्धती मांडणी"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "इतर"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "पुन्हा चालू करा"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "इनपुट पद्धत आढळली नाही"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Linux/Unix करीता IBus हे एक हुशार इनपुट बस आहे."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009."
 
@@ -323,11 +323,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "भाषा पटल करीत स्वपसंत फॉन्ट नाव वापरा"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -412,7 +412,3 @@ msgstr "भाषा पटल करीत स्वपसंत फॉन्
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/or.po b/po/or.po
index 74921a4..ebd1b80 100644
--- a/po/or.po
+++ b/po/or.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-05-27 17:24+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <oriya-it@googlegroups.com>\n"
@@ -24,29 +24,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus ନିବେଶ ପ୍ରଣାଳୀ ଫ୍ରେମୱର୍କ"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "ଅନ୍ୟାନ୍ୟ"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "ପୁନଃଚାଳନ"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "କୌଣସି ନିବେଶ ପ୍ରଣୀଳୀ ନାହିଁ"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ହେଉଛି Linux/Unix ପାଇଁ ଗୋଟିଏ ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ।"
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
 
@@ -326,11 +326,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ନାମକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -416,7 +416,3 @@ msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତା
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/pa.po b/po/pa.po
index c3be74f..4a82dd1 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-05-31 07:46+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
@@ -21,29 +21,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "ਹੋਰ"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "ਮੁੜ-ਚਾਲੂ"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "ਕੋਈ ਇੰਪੁੱਟ ਢੰਗ ਨਹੀਂ"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net> 2008, 2009\n"
@@ -324,11 +324,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਪਸੰਦੀਦਾ ਫੋਂਟ ਨਾਂ ਵਰਤੋਂ"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -414,10 +414,6 @@ msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਪਸੰਦੀਦਾ ਫੋਂਟ 
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
-
 #~ msgid "[Control+space]"
 #~ msgstr "[Control+space]"
 
diff --git a/po/pl.po b/po/pl.po
index c7be85f..319cab6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-06-15 21:23+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -17,29 +17,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "Struktura metody wejścia IBus"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "Inne"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "Brak metody wejścia"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus jest inteligentną magistralą wejścia dla Linuksa/Uniksa."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009"
 
@@ -315,11 +315,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "Nazwa własnej czcionki w panelu języka i kandydatów"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -410,7 +410,3 @@ msgstr "Nazwa własnej czcionki użytej w panelu języków"
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 9896c1c..8e2ffff 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-04-01 19:58+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian <fedora-trans-sr@redhat.com>\n"
@@ -21,29 +21,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus радни оквир методе уноса"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "Друго"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "Покрени поново"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "Нема методе уноса"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus је интелигентна магистрала уноса за Linux/Unix."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Serbian <fedora-trans-sr@redhat.com>"
 
@@ -326,11 +326,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "Користи прилагођени фонт за језички панел"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -419,10 +419,6 @@ msgstr "Користи прилагођени фонт за језички па
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
-
 #~ msgid "[Control+space]"
 #~ msgstr "[Control+space]"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 19cb238..57a1255 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-04-01 19:58+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian <fedora-trans-sr@redhat.com>\n"
@@ -21,29 +21,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus radni okvir metode unosa"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "Drugo"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "Pokreni ponovo"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "Nema metode unosa"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus je inteligentna magistrala unosa za Linux/Unix."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Serbian <fedora-trans-sr@redhat.com>"
 
@@ -326,11 +326,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "Koristi prilagođeni font za jezički panel"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -419,10 +419,6 @@ msgstr "Koristi prilagođeni font za jezički panel"
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
-
 #~ msgid "[Control+space]"
 #~ msgstr "[Control+space]"
 
diff --git a/po/ta.po b/po/ta.po
index c84bb29..000e054 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-04-08 16:35+0530\n"
 "Last-Translator: I. Felix <ifelix@redhat.com>\n"
 "Language-Team: Tamil <fedora-trans-ta@redhat.com>\n"
@@ -21,29 +21,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus உள்ளீடு முறை ஃபிரேம்வொர்க்"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "வேறு"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "மறுதுவக்கம்"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "உள்ளீடு முறை இல்லை"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus Linux/Unixக்கான உள்ளிடு பஸ்."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "I. Felix <ifelix@redhat.com>"
 
@@ -321,11 +321,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "மொழி பலகத்தில் தனிபயன் எழுத்துரு பெயர்"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -413,9 +413,5 @@ msgstr "மொழி பலகத்தில் தனிபயன் எழு
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
-
 #~ msgid "[Control+space]"
 #~ msgstr "[Control+space]"
diff --git a/po/te.po b/po/te.po
index 2de886a..c2d3558 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.te\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-05-26 14:13+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <en@li.org>\n"
@@ -24,29 +24,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus ఇన్పుట్ పద్దతి ఆకృతి"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "ఇతర"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "పునఃప్రారంభము"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "ఎటువంటి ఇన్పుట్ పద్దతిలేదు"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్పుట్ బస్."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "కృష్ణబాబు కె <kkrothap@redhat.com> 2009."
 
@@ -326,11 +326,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "భాషా ప్యానల్ కొరకు మలచుకొనిన ఫాంట్ నామము వుపయోగించుము"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -417,7 +417,3 @@ msgstr "భాషా ప్యానల్ కొరకు మలచుకొన
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 82726e3..49fc879 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: data 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-06-12 12:41+0700\n"
 "Last-Translator: Le Quoc Tuan <mr.lequoctuan@gmail.com>\n"
 "Language-Team: Vietnamese\n"
@@ -20,29 +20,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "Bộ gõ IBus"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "Khác"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "Khởi động lại"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "Không có bộ gõ"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus là một bộ gõ thông minh cho Linux/Unix."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Lê Quốc Tuấn <mr.lequoctuan@gmail.com>"
 
@@ -323,11 +323,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "Dùng phông tùy biến cho thanh ngôn ngữ"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -413,7 +413,3 @@ msgstr "Dùng phông tùy biến cho thanh ngôn ngữ"
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e18f01b..f195ef1 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: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+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"
@@ -20,28 +20,28 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus输入法框架"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "其他"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "重新启动"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 msgid "Turn off input method"
 msgstr "关闭输入法"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is an intelligent input bus for Linux/Unix."
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Huang Peng <shawn.p.huang@gmail.com>"
 
@@ -64,6 +64,7 @@ msgid "Language: %s\n"
 msgstr "语言: %s\n"
 
 #: ../ui/gtk/engineabout.py:64 ../setup/engineabout.py:64
+#, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "键盘: %s\n"
 
@@ -310,12 +311,12 @@ msgid "Use custom font for language bar and candidates"
 msgstr "使用自定义字体显示语言栏和候选词"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
-msgstr ""
+msgid "Use system keyboard (XKB) layout"
+msgstr "使用系统键盘（XKB）布局"
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
-msgstr ""
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
+msgstr "使用系统键盘布局"
 
 #: ../setup/setup.glade.h:49
 msgid "gtk-about"
@@ -396,12 +397,9 @@ msgid "Use custom font name for language panel"
 msgstr "语言栏是否使用自定义字体"
 
 #: ../data/ibus.schemas.in.h:19
+#, fuzzy
 msgid "Use system keyboard (XKB) layout setting"
-msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
+msgstr "使用系统键盘（XKB）布局"
 
 #~ msgid "[Control+space]"
 #~ msgstr "[Control+space]"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 03d3baf..6afe622 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0.20090331\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-04-07 06:38+1000\n"
 "Last-Translator: Caius 'kaio' Chance <k@kaio.me>\n"
 "Language-Team: Caius 'kaio' Chance <k@kaio.me>\n"
@@ -20,29 +20,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus輸入法框架"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "其他"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "無輸入法"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 為 Linux/Unix上的智能輸入法框架。"
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Caius 'kaio' Chance <k@kaio.me>"
 
@@ -319,11 +319,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "語言面板是否使用自訂字體"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -408,7 +408,3 @@ msgstr "語言面板是否使用自訂字體"
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b68fc5c..de6cdf3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0.20090331\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 11:02+0800\n"
+"POT-Creation-Date: 2009-08-26 17:24+0800\n"
 "PO-Revision-Date: 2009-04-07 21:59+0800\n"
 "Last-Translator: Ding-Yi Chen <dchen@redhat.com>\n"
 "Language-Team: Ding-Yi Chen <dchen@redhat.com>\n"
@@ -20,29 +20,29 @@ msgstr ""
 msgid "IBus"
 msgstr "IBus"
 
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:108
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:110
 msgid "IBus input method framework"
 msgstr "IBus輸入法框架"
 
-#: ../ibus/lang.py:40 ../ui/gtk/panel.py:337 ../ui/gtk/panel.py:338
-#: ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:339 ../ui/gtk/panel.py:340
+#: ../ui/gtk/panel.py:341 ../ui/gtk/panel.py:342
 msgid "Other"
 msgstr "其他"
 
-#: ../ui/gtk/panel.py:312
+#: ../ui/gtk/panel.py:314
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../ui/gtk/panel.py:367
+#: ../ui/gtk/panel.py:369
 #, fuzzy
 msgid "Turn off input method"
 msgstr "無輸入法"
 
-#: ../ui/gtk/panel.py:422
+#: ../ui/gtk/panel.py:424
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 為 Linux/Unix上的智慧型輸入法框架。"
 
-#: ../ui/gtk/panel.py:426
+#: ../ui/gtk/panel.py:428
 msgid "translator-credits"
 msgstr "Ding-Yi Chen 陳定彞 <dchen@redhat.com>"
 
@@ -319,11 +319,11 @@ msgid "Use custom font for language bar and candidates"
 msgstr "語言面板是否使用自訂字體"
 
 #: ../setup/setup.glade.h:47
-msgid "Use system keyboard layout (XKB) setting"
+msgid "Use system keyboard (XKB) layout"
 msgstr ""
 
-#: ../setup/setup.glade.h:48
-msgid "Use system keyboard layout setting"
+#: ../setup/setup.glade.h:48 ../data/ibus.schemas.in.h:20
+msgid "Use system keyboard layout"
 msgstr ""
 
 #: ../setup/setup.glade.h:49
@@ -408,7 +408,3 @@ msgstr "語言面板是否使用自訂字體"
 #: ../data/ibus.schemas.in.h:19
 msgid "Use system keyboard (XKB) layout setting"
 msgstr ""
-
-#: ../data/ibus.schemas.in.h:20
-msgid "Use system keyboard layout"
-msgstr ""
diff --git a/setup/setup.glade b/setup/setup.glade
index 2831c9f..e8b5964 100644
--- a/setup/setup.glade
+++ b/setup/setup.glade
@@ -623,11 +623,11 @@ You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <widget class="GtkCheckButton" id="checkbutton_use_sys_layout">
-                                        <property name="label" translatable="yes">Use system keyboard layout setting</property>
+                                        <property name="label" translatable="yes">Use system keyboard layout</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="tooltip" translatable="yes">Use system keyboard layout (XKB) setting</property>
+                                        <property name="tooltip" translatable="yes">Use system keyboard (XKB) layout</property>
                                         <property name="draw_indicator">True</property>
                                       </widget>
                                       <packing>
-- 
2.7.4