diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index 8c9805d..b26797f 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -97,8 +97,6 @@ struct _BusInputContextPrivate {
IBusLookupTable *lookup_table;
gboolean lookup_table_visible;
- /* properties */
- IBusPropList *props;
};
typedef struct _BusInputContextPrivate BusInputContextPrivate;
@@ -557,7 +555,6 @@ bus_input_context_init (BusInputContext *context)
priv->lookup_table_visible = FALSE;
g_object_ref (props_empty);
- priv->props = props_empty;
}
static void
@@ -590,11 +587,6 @@ bus_input_context_destroy (BusInputContext *context)
priv->lookup_table = NULL;
}
- if (priv->props) {
- g_object_unref (priv->props);
- priv->props = NULL;
- }
-
if (priv->connection) {
g_signal_handlers_disconnect_by_func (priv->connection,
(GCallback) _connection_destroy_cb,
@@ -1156,12 +1148,6 @@ bus_input_context_focus_in (BusInputContext *context)
if (priv->capabilities & IBUS_CAP_FOCUS) {
g_signal_emit (context, context_signals[FOCUS_IN], 0);
- if ((priv->capabilities & IBUS_CAP_PROPERTY) == 0) {
- g_signal_emit (context,
- context_signals[REGISTER_PROPERTIES],
- 0,
- priv->props);
- }
if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
g_signal_emit (context,
context_signals[UPDATE_PREEDIT_TEXT],
@@ -1650,23 +1636,17 @@ bus_input_context_register_properties (BusInputContext *context,
BusInputContextPrivate *priv;
priv = BUS_INPUT_CONTEXT_GET_PRIVATE (context);
- if (priv->props) {
- g_object_unref (priv->props);
- }
-
- priv->props = (IBusPropList *) g_object_ref (props ? props : props_empty);
-
if (priv->capabilities & IBUS_CAP_PROPERTY) {
bus_input_context_send_signal (context,
"RegisterProperties",
- IBUS_TYPE_PROP_LIST, &(priv->props),
+ IBUS_TYPE_PROP_LIST, &props,
G_TYPE_INVALID);
}
else {
g_signal_emit (context,
context_signals[REGISTER_PROPERTIES],
0,
- priv->props);
+ props);
}
}
@@ -1680,14 +1660,6 @@ bus_input_context_update_property (BusInputContext *context,
BusInputContextPrivate *priv;
priv = BUS_INPUT_CONTEXT_GET_PRIVATE (context);
- if (priv->props == props_empty) {
- return;
- }
-
- if (!ibus_prop_list_update_property (priv->props, prop)) {
- return;
- }
-
if (priv->capabilities & IBUS_CAP_PROPERTY) {
bus_input_context_send_signal (context,
"UpdateProperty",
diff --git a/po/ar.po b/po/ar.po
index 15c31e8..f59ac97 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
@@ -50,23 +50,23 @@ msgstr "Muayyad Alsadi <alsadi@ojuba.org>"
msgid "Switch input method"
msgstr "تبديل طريقة الإدخال"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "زناد"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "طريقة الإدخال التالية"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "طريقة الإدخال السابقة"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "خادم IBUS لم يبدأ من قبل. هل تريد تشغيله الآن؟"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -75,24 +75,24 @@ msgid ""
" export QT_IM_MODULE=ibus"
msgstr ""
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "اختر الاختصار ل %s"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "اختصارات لوحة المفاتيح"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "كود المفتاح"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr ""
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -100,7 +100,7 @@ msgstr ""
"فضلا اضغط مفتاح أو (عدة مفاتيح).\n"
"صندوق الحوار سيغلق عند ترك المفتاح."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "فضلا اضغط مفتاح أو عدة مفاتيح"
@@ -141,26 +141,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "حول"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "الاتجاهات المرشحة:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "خط مخصص:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "تفعيّل أو تثبيط:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "عام"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -168,15 +174,15 @@ msgstr ""
"أفقي\n"
"عمودي"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "تفضيلات IBus"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "طرق الإدخال"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -186,23 +192,23 @@ msgstr ""
"عند التفعيل\n"
"دائما"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "طريقة الإدخال التالية"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "طريقة الإدخال السابقة"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "إظهار لوحة اللغات:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "بدء ibus عند الولوج"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "استعمال خط مخصص"
@@ -272,6 +278,5 @@ msgstr "استخدم خط مخصص"
msgid "Use custom font name for language panel"
msgstr "استخدم خط مخصص في لوحة اللغة"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
diff --git a/po/as.po b/po/as.po
index 9b81669..b9ff58c 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
"PO-Revision-Date: 2009-04-09 19:03+0530\n"
"Last-Translator: Amitakhya Phukan <aphukan@fedoraproject.org>\n"
"Language-Team: Assamese <fedora-trans-as@redhat.com>\n"
@@ -50,23 +50,23 @@ msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)"
msgid "Switch input method"
msgstr "নিবেশ পদ্ধতি সলনি কৰক"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ট্ৰিগাৰ"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "পিছৰ নিবেশ পদ্ধতি"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "আগৰ নিবেশ পদ্ধতি"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus ডেমন আৰম্ভ কৰা হোৱা নাই । আপুনি ইয়াক এতিয়া আৰম্ভ কৰিব বিচাৰে নেকি ?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -80,24 +80,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s ৰ কাৰণে চাবিফলকৰ চমুপথ নিৰ্ব্বাচন কৰক"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "কীবৰ্ডৰ চমুপথবোৰ"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "চাবিৰ কোড:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "পৰিবৰ্তক:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -105,7 +105,7 @@ msgstr ""
"অনুগ্ৰহ কৰি এটা চাবি টিপক (বা এটা চাবিৰ মিশ্ৰণ) ।\n"
"চাবি এৰিলে সম্বাদ বন্ধ হ'ব ।"
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "অনুগ্ৰহ কৰি এটা চাবি টিপক (বা এটা চাবিৰ মিশ্ৰণ)"
@@ -146,26 +146,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "বিষয়ে"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "প্ৰাৰ্থীৰ দিশ:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "স্বনিৰ্বাচিত ফন্ট:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "সক্ৰিয় বা নিষ্ক্ৰিয় কৰক:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "সাধাৰণ"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -173,15 +179,15 @@ msgstr ""
"অনুভূমিক\n"
"উলম্ব"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus পছন্দ"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "নিবেশ পদ্ধতি"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -191,23 +197,23 @@ msgstr ""
"যেতিয়া সক্ৰিয়\n"
"সদায়"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "পিছৰ নিবেশ পদ্ধতি:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "আগৰ নিবেশ পদ্ধতি"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "ভাষাৰ পেনেল দেখুৱাওক:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "প্ৰৱেশত ibus আৰম্ভ কৰক"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰা হ'ব"
@@ -278,9 +284,8 @@ msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ
msgid "Use custom font name for language panel"
msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্বাচিত ফন্টৰ নাম ব্যৱহাৰ কৰক"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
#~ msgid "keyboard label|BackSpace"
#~ msgstr "keyboard label|BackSpace"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index d9e31cd..03d64fb 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,14 +1,14 @@
-# translation of ibus.master.ibus.po to Bengali INDIA
+# translation of ibus.master.bn_IN.po to Bengali INDIA
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Runa Bhattacharjee <runab@fedoraproject.org>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: ibus.master.ibus\n"
+"Project-Id-Version: ibus.master.bn_IN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 11:45+0800\n"
-"PO-Revision-Date: 2009-04-07 12:16+0530\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
"MIME-Version: 1.0\n"
@@ -51,23 +51,23 @@ msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.o
msgid "Switch input method"
msgstr "ইনপুট পদ্ধতি পরিবর্তন করুন"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ট্রিগার"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "পরবর্তী ইনপুট পদ্ধতি"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "পূর্ববর্তী ইনপুট পদ্ধতি"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus ডেমন আরম্ভ করা হয়নি। এটি এখন আরম্ভ করা হবে কি?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -75,29 +75,30 @@ msgid ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
msgstr ""
-"IBus আরম্ভ করা হয়েছে! IBus ব্যবহার করা সম্ভব নয় হলে $HOME/.bashrc ফাইলের মধ্যে নিম্নলিখিত পংক্তিগুলি যোগ করে ডেস্কটপে পুনরায় লগ-ইন করুন।\n"
+"IBus আরম্ভ করা হয়েছে! IBus ব্যবহার করা সম্ভব নয় হলে $HOME/.bashrc ফাইলের মধ্যে "
+"নিম্নলিখিত পংক্তিগুলি যোগ করে ডেস্কটপে পুনরায় লগ-ইন করুন।\n"
" export GTK_IM_MODULE=ibus\n"
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "কি-বোর্ড শর্ট-কাট"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "কি-র কোড:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "পরিবর্তক:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -105,7 +106,7 @@ msgstr ""
"অনুগ্রহ করে কোনো কি (অথবা কি সংকলন) টিপুন।\n"
"কি মুক্ত করা হলে এই ডায়লগ বক্সটি বন্ধ করা হবে।"
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
@@ -146,26 +147,34 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\n"
+"ডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।</i></small>"
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "পরিচিতি"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "নির্বাচিত বস্তুর দিশা:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "স্বনির্ধারিত ফন্ট:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "সক্রিয় অথা নিষ্ক্রিয় করুন:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "সাধারণ"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -173,15 +182,15 @@ msgstr ""
"অনুভূমিক\n"
"উল্লম্ব"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus সংক্রান্ত পছন্দ"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "ইনপুট পদ্ধতি"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -191,23 +200,23 @@ msgstr ""
"সক্রিয় অবস্থায়\n"
"সর্বদা"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "পরবর্তী ইনপুট পদ্ধতি:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "পূর্ববর্তী ইনপুট পদ্ধতি:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "ভাষার প্যানেল প্রদর্শন করা হবে:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "লগ-ইন করার সময় ibus আরম্ভ করা হবে"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন"
@@ -259,7 +268,9 @@ msgstr "পূর্ববর্তী ইনপুট পদ্ধতির ই
msgid ""
"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
"show"
-msgstr "ভাষা প্রদর্শনের প্যানেলের আচরণ। 0 (০) = সর্বদা আড়াল করা হবে, 1 (১) = স্বয়ংক্রিয়ভাবে আড়াল করা হবে, 2 (২) = সর্বদা প্রদর্শন করা হবে"
+msgstr ""
+"ভাষা প্রদর্শনের প্যানেলের আচরণ। 0 (০) = সর্বদা আড়াল করা হবে, 1 (১) = "
+"স্বয়ংক্রিয়ভাবে আড়াল করা হবে, 2 (২) = সর্বদা প্রদর্শন করা হবে"
#: ../data/ibus.schemas.in.h:13
msgid "Trigger Hotkey"
@@ -277,7 +288,3 @@ msgstr "স্বনির্ধারিত ফন্ট ব্যবহার
msgid "Use custom font name for language panel"
msgstr "ভাষার প্যানেলের জন্য স্বনির্ধারিত ফন্টের নাম ব্যবহার করা হবে"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
-
diff --git a/po/ca.po b/po/ca.po
index 7b6b145..397cadd 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-04-21 07:03+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
"PO-Revision-Date: 2009-04-18 20:43+0200\n"
"Last-Translator: Oscar Osta Pueyo <oostap@gmail.com>\n"
"Language-Team: Catalan <fedora@softcatala.net>\n"
@@ -65,23 +65,23 @@ msgstr ""
msgid "Switch input method"
msgstr "Canvia el mètode d'entrada"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "activador"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "següent mètode d'entrada"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "anterior mètode d'entrada"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "El dimoni IBus no està iniciat. Voleu iniciar-lo ara?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -95,7 +95,7 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "Seleccioneu la drecera de teclat per a %s"
@@ -112,7 +112,7 @@ msgstr "Codi de lletra:"
msgid "Modifiers:"
msgstr "Modificadors:"
-#: ../setup/keyboardshortcut.py:218
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -120,7 +120,7 @@ msgstr ""
"Si us plau premeu una tecla (o una combinació de tecles).\n"
"El diàleg es tancarà quan es deixi anar la tecla."
-#: ../setup/keyboardshortcut.py:220
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "Si us plau premeu una tecla (o una combinació de tecles)"
@@ -161,26 +161,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "Quant a"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "Orientació dels candidats:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "Tipus de lletra personalitzada:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "Activa o desactiva:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "General"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -188,15 +194,15 @@ msgstr ""
"Horitzontal\n"
"Vertical"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "Prefèrencies de l'IBus"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "Mètodes d'entrada"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -206,23 +212,23 @@ msgstr ""
"Quan s'activa\n"
"Sempre"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "Següent mètode d'entrada:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "Anterior mètode d'entrada:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "Mostra el quadre d'idiomes:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "Inicia l'ibus en entrar"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "Empra tipus de lletra personalitzat"
@@ -293,4 +299,3 @@ msgstr "Empra el tipus de lletra personalitzada"
#: ../data/ibus.schemas.in.h:16
msgid "Use custom font name for language panel"
msgstr "Empra el tipus de lletra personalitzada per al quadre d'idiomes"
-
diff --git a/po/da.po b/po/da.po
index 781d0d0..94ac003 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
"PO-Revision-Date: 2009-04-06 21:47+0200\n"
"Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -53,23 +53,23 @@ msgstr ""
msgid "Switch input method"
msgstr "Skift inddatametode"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "udløser"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "næste inddatametode"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "forrige inddatametode"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus-dæmonen er ikke startet. Vil du starte den nu?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -83,24 +83,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "Vælg tastaturgenveje til %s"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "Tastaturgenveje"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "Nøglekode:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "Kombinationstaster:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -108,7 +108,7 @@ msgstr ""
"Tryk venligst på en tast (eller en tastekombination).\n"
"Dialogen bliver lukket, når tasten slippes."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "Tryk venligst på en tast (eller en tastekombination)"
@@ -149,26 +149,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "Om"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "Orientering for kandidater:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "Tilpasset skrifttype:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "Aktivér eller deaktivér:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "Generelt"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -176,15 +182,15 @@ msgstr ""
"Vandret\n"
"Lodret"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "Indstillinger for IBus"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "Inddatametoder"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -194,23 +200,23 @@ msgstr ""
"Hvis aktiv\n"
"Altid"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "Næste inddatametode:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "Forrige inddatametode:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "Vis sprogpanel:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "Start ibus ved logind"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "Brug tilpasset skrifttype"
@@ -284,6 +290,5 @@ msgstr "Brug tilpasset skrifttype"
msgid "Use custom font name for language panel"
msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
diff --git a/po/de.po b/po/de.po
index 9e01d70..fbbbdc8 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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,16 +20,12 @@ msgstr ""
msgid "IBus"
msgstr "IBus"
-#: ../bus/ibus.desktop.in.h:2
-#: ../ui/gtk/panel.py:97
+#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:97
msgid "IBus input method framework"
msgstr "IBus-Eingabemethode-Framework"
-#: ../ibus/lang.py:40
-#: ../ui/gtk/panel.py:307
-#: ../ui/gtk/panel.py:308
-#: ../ui/gtk/panel.py:309
-#: ../ui/gtk/panel.py:310
+#: ../ibus/lang.py:40 ../ui/gtk/panel.py:307 ../ui/gtk/panel.py:308
+#: ../ui/gtk/panel.py:309 ../ui/gtk/panel.py:310
msgid "Other"
msgstr "Sonstige"
@@ -54,55 +50,58 @@ msgstr "Fabian Affolter <fab@fedoraproject.org>, 2009."
msgid "Switch input method"
msgstr "Eingabemethode wechseln"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "trigger"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "Nächste Eingabemethode"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "Vorherige Eingabemethode"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr ""
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
-"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
+"IBus has been started! If you can not use IBus, please add below lines in "
+"$HOME/.bashrc, and relogin your desktop.\n"
" export GTK_IM_MODULE=ibus\n"
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
msgstr ""
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr ""
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "Tastatureingabe aufnehmen"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "Tasten-Code:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr ""
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
-msgstr "Bitte eine Taste (oder eine Tastenkombination drücken).nDer Dialog wird geschlossen, wenn die Taste losgelassen wird."
+msgstr ""
+"Bitte eine Taste (oder eine Tastenkombination drücken).nDer Dialog wird "
+"geschlossen, wenn die Taste losgelassen wird."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
@@ -144,26 +143,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "Über"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr ""
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "Benutzerdefinierte Schriftart:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "Aktivieren oder deaktivieren:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "Allgemein"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -171,16 +176,15 @@ msgstr ""
"Horizontal\n"
"Vertikal"
-#: ../setup/setup.glade.h:19
-#: ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus-Einstellungen"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "Eingabemethode"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -190,23 +194,23 @@ msgstr ""
"Wenn aktiv\n"
"Immer"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "Nächste Eingabemethode:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "Vorherige Eingabemethode:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "Zeige Sprach-Panel:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "Starte ibus bei der Anmeldung"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "Benutze benutzerdefinierte Schriftart"
@@ -256,7 +260,9 @@ msgid "Prev engine hotkey for switch to previous input method engine"
msgstr ""
#: ../data/ibus.schemas.in.h:12
-msgid "The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always show"
+msgid ""
+"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
+"show"
msgstr ""
#: ../data/ibus.schemas.in.h:13
@@ -275,7 +281,5 @@ msgstr "Benutze benutzerdefinierte Schriftart"
msgid "Use custom font name for language panel"
msgstr ""
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Ctrl+Leertaste]"
-
+#~ msgid "[Control+space]"
+#~ msgstr "[Ctrl+Leertaste]"
diff --git a/po/es.po b/po/es.po
index ee11e31..1cd2667 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: Domingo Becker <domingobecker@gmail.com>\n"
"Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
@@ -46,25 +46,25 @@ msgstr "Domingo Becker, <domingobecker@gmail.com>, 2009"
msgid "Switch input method"
msgstr "Cambiar método de entrada"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "activador"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
#, fuzzy
msgid "next input method"
msgstr "siguiente método de entrada"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
#, fuzzy
msgid "previous input method"
msgstr "método de entrada anterior"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "El demonio IBUS no fue iniciado. ¿Desea iniciarlo ahora?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -78,24 +78,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "Seleccione la tecla de atajo para %s"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "Atajos de teclado"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "Código clave:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "Modificadores:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -103,7 +103,7 @@ msgstr ""
"Por favor, presione una tecla (o una combinación de tecla).\n"
"El diálogo será cerrado cuando la tecla sea soltada."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "Por favor, presione una tecla (o combinación de teclas)"
@@ -144,26 +144,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "Acerca de"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "Orientaciones candidato:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "Fuente personalizada:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "Habilitar o deshabilitar:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "General"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -171,15 +177,15 @@ msgstr ""
"Horizontal\n"
"Vertical"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "Preferencias de IBus"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "Métodos de entrada"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -189,24 +195,24 @@ msgstr ""
"Cuando esté activo\n"
"Siempre"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "Siguiente método de entrada:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
#, fuzzy
msgid "Previous input method:"
msgstr "Método de entrada anterior:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "Mostrar el panel de idioma:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "Iniciar ibus al ingresar"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "Usar fuente personalizada"
@@ -281,6 +287,5 @@ msgstr "Usar Fuente Personalizada"
msgid "Use custom font name for language panel"
msgstr "Usar nombre de fuente personalizada para el panel de idioma"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
diff --git a/po/fr.po b/po/fr.po
index 48192d0..adfaabf 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-04-27 07:42+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
@@ -56,23 +56,23 @@ msgstr "HUMBERT Julien <julroy67@gmail.com>"
msgid "Switch input method"
msgstr "Changer de méthode d'entrée"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "déclencheur"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "méthode d'entrée suivante"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "méthode d'entrée précédente"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "Le démon IBus n'est pas démarré. Voulez-vous le démarrer maintenant ?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -87,7 +87,7 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "Choisissez le raccourci clavier pour %s"
@@ -104,7 +104,7 @@ msgstr "Code touche :"
msgid "Modifiers:"
msgstr "Modificateurs :"
-#: ../setup/keyboardshortcut.py:218
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -112,7 +112,7 @@ msgstr ""
"Veuillez presser une touche (ou une combinaison de touches).\n"
"La boîte de dialogue se fermera lorsque la touche sera relâchée."
-#: ../setup/keyboardshortcut.py:220
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "Veuillez presser une touche (ou une combinaison de touches)"
@@ -153,26 +153,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "À propos"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "Orientation de la table :"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "Police personnalisée :"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "Activer ou désactiver :"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "Général"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -180,15 +186,15 @@ msgstr ""
"Horizontale\n"
"Verticale"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "Préférences d'IBus"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "Méthodes d'entrées"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -198,23 +204,23 @@ msgstr ""
"Dynamiquement\n"
"Toujours"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "Méthode d'entrée suivante :"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "Méthode d'entrée précédente :"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "Afficher la barre de langue :"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "Démarrer IBus lors de la connexion"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "Utiliser une police personnalisée"
@@ -285,5 +291,3 @@ msgstr "Utiliser une police personnalisée"
#: ../data/ibus.schemas.in.h:16
msgid "Use custom font name for language panel"
msgstr "Utiliser une police personnalisée pour le panneau de langue"
-
-
diff --git a/po/gu.po b/po/gu.po
index 07262b6..e20ce4e 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,14 +1,14 @@
-# translation of ibus.po to Gujarati
+# translation of ibus.master.gu.po to Gujarati
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Sweta Kothari <swkothar@redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: ibus\n"
+"Project-Id-Version: ibus.master.gu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 11:45+0800\n"
-"PO-Revision-Date: 2009-04-06 12:04+0530\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
+"PO-Revision-Date: 2009-05-26 11:50+0530\n"
"Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
"Language-Team: Gujarati\n"
"MIME-Version: 1.0\n"
@@ -51,23 +51,23 @@ msgstr "શ્ર્વેતા કોઠારી <swkothar@redhat.com>"
msgid "Switch input method"
msgstr "ઇનપુટ પદ્દતિને બદલો"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ટ્રીગર"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "પછીની ઇનપુટ પદ્દતિ"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "પહેલાની ઇનપુટ પદ્દતિ"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus ડિમન એ શરૂ થયેલ નથી. શું તમે હવે તેને શરૂ કરવા ઇચ્છો છો?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -81,24 +81,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s માટે કિબોર્ડ ટૂંકાણોને પસંદ કરો"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "કિબોર્ડ ટૂંકાણો"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "કિ કોડ:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "બદલનારો:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -106,7 +106,7 @@ msgstr ""
"મહેરબાની કરીને કીને દબાવો (અથવા કી સંયોજન).\n"
"સંવાદ એ બંધ થયેલ હશે જ્યારે કી પ્રકાશિત થયેલ હોય તો."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "મહેરબાની કરીને કી ને દબાવો (અથવા કી સંયોજન)"
@@ -147,26 +147,34 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>મૂળભૂત ઇનપુટ પદ્દતિ એ યાદીમાં ઉપર છે.\n"
+"તમારે તેને બદલવા માટે ઉપર/નીચે બટનોને વાપરી શકો છો.</i></small>"
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "વિશે"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "ઉમેદવારોની દિશા:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "વૈવિધ્ય ફોન્ટ:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "સક્રિય અથવા નિષ્ક્રિય:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "સામાન્ય"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -174,15 +182,15 @@ msgstr ""
"આડુ\n"
"ઊભુ"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus પસંદગીઓ"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "ઇનપુટ પદ્દતિઓ"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -192,23 +200,23 @@ msgstr ""
"જ્યારે સક્રિય હોય તો\n"
"હંમેશા"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "પછીની ઇનપુટ પદ્દતિ:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "પહેલાંની ઇનપુટ પદ્દતિ:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "ભાષા પેનલને બતાવો:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "પ્રવેશ પર ibus ને શરૂ કરો"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "વૈવિધ્ય ફોન્ટને વાપરો"
@@ -278,6 +286,3 @@ msgstr "વૈવિધ્ય ફોન્ટને વાપરો"
msgid "Use custom font name for language panel"
msgstr "ભાષા પેનલ માટે વૈવિધેય ફોન્ટ નામ ને વાપરો"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
diff --git a/po/hi.po b/po/hi.po
index 2dbec23..b6dc999 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.master.ibus\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
"PO-Revision-Date: 2009-04-06 13:42+0530\n"
"Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
"Language-Team: Hindi <Hindi.sf.net>\n"
@@ -52,23 +52,23 @@ msgstr "राजेश रंजन (rranjan@redhat.com)"
msgid "Switch input method"
msgstr "इनपुट विधि बदलें"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ट्रिगर"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "अगली इनपुट विधि"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "पिछली इनपुट विधि"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus अबतक आरंभ नहीं हुआ है. क्या आप इसे आरंभ करना चाहते हैं?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -82,24 +82,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s के लिए कुंजीपटल शॉर्टकर्ट चुनें"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "कुंजीपटल शॉर्टकर्ट"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "कुंजी कोड:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "परिवर्तनकर्ता:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -107,7 +107,7 @@ msgstr ""
"कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग).\n"
"यह संवाद कुंजी छोड़े जाने पर बंद हो जाएगा."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग)"
@@ -148,26 +148,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "परिचय"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "कंडीडेट दिशा:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "मनपसंद फ़ॉन्ट:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "सक्रिय या निष्क्रिय करें:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "सामान्य"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -175,15 +181,15 @@ msgstr ""
"क्षैतिज\n"
"लंबवत"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus वरीयता"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "इनपुट विधि"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -193,23 +199,23 @@ msgstr ""
"जब सक्रिय हो\n"
"हमेशा"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "अगली इनपुट विधि :"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "पिछली इनपुट विधि:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "भाषा पैनल दिखाएँ:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "लॉगिन पर ibus आरंभ करें"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "मनपसंद फ़ॉन्ट का प्रयोग करें"
@@ -279,6 +285,5 @@ msgstr "मनपसंद फ़ॉन्ट का प्रयोग कर
msgid "Use custom font name for language panel"
msgstr "भाषा पटल के लिए मनपसंद फ़ॉन्ट नाम का प्रयोग करें"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
diff --git a/po/hu.po b/po/hu.po
index bb8f02e..904eab7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,13 +7,13 @@ msgid ""
msgstr ""
"Project-Id-Version: IBus master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#: ../bus/ibus.desktop.in.h:1
msgid "IBus"
@@ -49,23 +49,23 @@ msgstr "Sulyok Péter <peti@fedoraproject.org>, 2009."
msgid "Switch input method"
msgstr "Bevitel eljárás átváltás"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ravasz"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "következő bevitel eljárás"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "előző bevitel eljárás"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "Az IBus szolgáltatás áll. Beindítja?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -76,27 +76,27 @@ msgstr ""
"IBus működik! Ha nem tudja IBus-t használni, kérem fűzze az \n"
" export GTK_IM_MODULE=ibus\n"
" export XMODIFIERS=@im=ibus\n"
-" export QT_IM_MODULE=ibus"
-"sorokat a $HOME/.bashrc fájlhoz, majd lépjen be újra."
+" export QT_IM_MODULE=ibussorokat a $HOME/.bashrc fájlhoz, majd lépjen be "
+"újra."
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s gyorsbillentyűjének kiválasztása"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "Gyorsbillentyűk"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "Kulcs kód:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "Módosítók:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -104,7 +104,7 @@ msgstr ""
"Kérem nyomjon egy billentyűt (vagy kombinációt).\n"
"Az ablak bezárul, amint a billentyűt felengedi."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "Kérem nyomjon egy billentyűt (vagy kombinációt)."
@@ -145,26 +145,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "Névjegy"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "Jelöltek iránya:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "Saját betű:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "Engedés vagy tiltás"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "Általános"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -172,15 +178,15 @@ msgstr ""
"vízszintes\n"
"függőleges"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus beállítás"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "Bevitel eljárások"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -190,23 +196,23 @@ msgstr ""
"aktívan\n"
"mindig"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "Következő bevitel eljárás:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "Előző bevitel eljárás:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "Nyelv panel mutatása:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "Belépve ibus indítása"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "Saját betű használata"
@@ -228,7 +234,8 @@ msgstr "Következő eljárás gyorsbillentyű"
#: ../data/ibus.schemas.in.h:5
msgid "Next engine hotkey for switch to next input method engine"
-msgstr "A következő eljárás gyorsbillentyű a következő bevitel eljárásra kapcsol"
+msgstr ""
+"A következő eljárás gyorsbillentyű a következő bevitel eljárásra kapcsol"
#: ../data/ibus.schemas.in.h:6
msgid "Orientation of Lookup Table"
@@ -259,7 +266,8 @@ msgid ""
"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
"show"
msgstr ""
-"A nyelv panel viselkedése. 0 = mindig rejtve, 1 = rejtőzködő, 2 = mindig látható"
+"A nyelv panel viselkedése. 0 = mindig rejtve, 1 = rejtőzködő, 2 = mindig "
+"látható"
#: ../data/ibus.schemas.in.h:13
msgid "Trigger Hotkey"
@@ -277,7 +285,5 @@ msgstr "Saját betű használata"
msgid "Use custom font name for language panel"
msgstr "Saját betű használata a nyelv panelen"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Ctrl+szóköz]"
-
+#~ msgid "[Control+space]"
+#~ msgstr "[Ctrl+szóköz]"
diff --git a/po/ja.po b/po/ja.po
index 527d7d5..e6f51e8 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
@@ -53,23 +53,23 @@ msgstr ""
msgid "Switch input method"
msgstr "インプットメソッドがありません"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "トリガー"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "次のインプットメソッド"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "ひとつ前のインプットメソッド"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus デーモンが動いていません。起動しますか？"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -83,24 +83,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s のキーボードショートカットを選択"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "キーボードショートカット"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "キーコード:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "モディファイア:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -108,7 +108,7 @@ msgstr ""
"キーもしくはキーの組み合わせを入力してください。\n"
"キーを離すとダイアログを閉じます"
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "キーもしくはキーの組み合わせを入力してください"
@@ -149,26 +149,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "About"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "候補ウィンドウの向き:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "カスタムフォント:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "切り替え"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "一般"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -176,15 +182,15 @@ msgstr ""
"横\n"
"縦"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus の設定"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "インプットメソッド"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -194,23 +200,23 @@ msgstr ""
"有効なときだけ表示する\n"
"常に表示する"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "次のインプットメソッド:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "ひとつ前のインプットメソッド:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "言語パネルの表示:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "ログイン時に IBus を起動"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "カスタムフォントを使う"
@@ -282,10 +288,6 @@ msgstr "カスタムフォントを使う"
msgid "Use custom font name for language panel"
msgstr ""
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr ""
-
#~ msgid "Switch engine"
#~ msgstr "エンジンの変更"
diff --git a/po/kn.po b/po/kn.po
index 4af913a..a509ee7 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-04-07 15:38+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
"PO-Revision-Date: 2009-04-07 11:40+0530\n"
"Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
"Language-Team: Kannada <en@li.org>\n"
@@ -51,23 +51,23 @@ msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
msgid "Switch input method"
msgstr "ಇನ್ಪುಟ್ ವಿಧಾನವನ್ನು ಬದಲಾಯಿಸು"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ಟ್ರಿಗರ್"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "ಮುಂದಿನ ಇನ್ಪುಟ್ ವಿಧಾನ"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "ಹಿಂದಿನ ಇನ್ಪುಟ್ ವಿಧಾನ"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus ಡೀಮನ್ ಇನ್ನೂ ಸಹ ಆರಂಭಗೊಂಡಿಲ್ಲ. ನೀವದನ್ನು ಈಗಲೆ ಆರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -81,24 +81,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್ಗಳು"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "ಕೀಲಿ ಸಂಕೇತ:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "ಮಾರ್ಪಡಕಗಳು:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -106,7 +106,7 @@ msgstr ""
"ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ.\n"
"ಕೀಲಿಯನ್ನು ಬಿಟ್ಟಾಗ ಸಂವಾದವು ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ"
@@ -147,26 +147,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "ಇದರ ಬಗ್ಗೆ"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "ಅಬ್ಯರ್ಥಿಗಳ ಹೊಂದಿಕೆ:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿ:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "ಸಾಮಾನ್ಯ"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -174,15 +180,15 @@ msgstr ""
"ಅಡ್ಡ\n"
"ಲಂಬ"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus ಆದ್ಯತೆಗಳು"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "ಇನ್ಪುಟ್ ವಿಧಾನಗಳು"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -192,23 +198,23 @@ msgstr ""
"ಸಕ್ರಿಯವಾಗಿದ್ದಾಗ\n"
"ಯಾವಾಗಲೂ"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "ಮುಂದಿನ ಇನ್ಪುಟ್ ವಿಧಾನ:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "ಹಿಂದಿನ ಇನ್ಪುಟ್ ವಿಧಾನ:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "ಪ್ರವೇಶಿಸಿದಾಗ ibus ಅನ್ನು ಆರಂಭಿಸು"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಿ"
diff --git a/po/ml.po b/po/ml.po
index 9f19b7f..c902234 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.master.ibus.ml\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
"PO-Revision-Date: 2009-04-21 11:28+0530\n"
"Last-Translator: Ani Peter <apeter@redhat.com>\n"
-"Language-Team: Swathanthra Malayalam Computing|സ്വതന്ത്ര മലയാളം കമ്പ്യൂട്ടിങ് <smc-discuss@googlegroups.com>\n"
+"Language-Team: Swathanthra Malayalam Computing|സ്വതന്ത്ര മലയാളം കമ്പ്യൂട്ടിങ് <smc-"
+"discuss@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -50,23 +51,23 @@ msgstr "അനി പീറ്റര് <apeter@redhat.com>"
msgid "Switch input method"
msgstr "ഇന്പുട്ട് മെഥേഡ് മാറ്റുക"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ട്രിഗ്ഗര് ചെയ്യുക"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "അടുത്ത ഇന്പുട്ട് മെഥേഡ്"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "മുമ്പുള്ള ഇന്പുട്ട് മെഥേഡ്"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus ഡെമണ് ആരംഭിച്ചിട്ടില്ല. നിങ്ങള്ക്കിതു് ഉടന് ആരംഭിക്കണമോ?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -80,24 +81,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s-നുള്ള കീബോര്ഡ് എളുപ്പവഴി തെരഞ്ഞെടുക്കുക"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "കീബോര്ഡ് എളുപ്പവഴികള്"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "കീ കോഡ്:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "മോഡിഫയറുകള്:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -105,7 +106,7 @@ msgstr ""
"ദയവായി ഒരു കീ അമര്ത്തുക (അല്ലെങ്കില് ഒരു കീ കൂട്ട്).\n"
"കീ റിലീസ് ചെയ്യുമ്പോള് ഡയലോഗ് അടയ്ക്കുന്നു."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "ദയവായി ഒരു കീ അമര്ത്തുക (അല്ലെങ്കില് ഒരു കീ കൂട്ട്)"
@@ -146,26 +147,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "സംബന്ധിച്ചു്"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "ലഭ്യമായവയുടെ ക്രമീകരണങ്ങള്:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "അക്ഷരസഞ്ചയം സജ്ജമാക്കുക:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "സജ്ജമാക്കുക അല്ലെങ്കില് നിര്ജ്ജീവമാക്കുക:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "സാധാരണ"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -173,15 +180,15 @@ msgstr ""
"നേരേയുള്ള\n"
"കുറുകെയുള്ള"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus മുന്ഗണനകള്"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "ഇന്പുട്ട് മെഥേഡുകള്"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -191,23 +198,23 @@ msgstr ""
"സജീവമാകുമ്പോള്\n"
"എപ്പോഴും"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "അടുത്ത ഇന്പുട്ട് മെഥേഡ്:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "മുമ്പുള്ള ഇന്പുട്ട് മെഥേഡ്:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "ഭാഷയുടെ പാനല് കാണിക്കുക:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "പ്രവേശിക്കുമ്പോള് തന്നെ ibus ആരംഭിക്കുക"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "സജ്ജമാക്കിയ അക്ഷരസഞ്ചയം ഉപയോഗിക്കുക"
@@ -253,15 +260,15 @@ msgstr "തൊട്ടു് മുമ്പുള്ള സംവിധാന
#: ../data/ibus.schemas.in.h:11
msgid "Prev engine hotkey for switch to previous input method engine"
-msgstr "മുമ്പുള്ള ഇന്പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള ഹോട്ട്കീ"
+msgstr ""
+"മുമ്പുള്ള ഇന്പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള ഹോട്ട്കീ"
#: ../data/ibus.schemas.in.h:12
msgid ""
"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
"show"
msgstr ""
-"ഭാഷയുടെ പാനലിന്റെ രീതി. 0 = എപ്പോഴും അദൃശ്യം, 1 = സ്വയം അദൃശ്യമാകുക, 2 = എപ്പോഴും "
-"കാണിക്കുക"
+"ഭാഷയുടെ പാനലിന്റെ രീതി. 0 = എപ്പോഴും അദൃശ്യം, 1 = സ്വയം അദൃശ്യമാകുക, 2 = എപ്പോഴും കാണിക്കുക"
#: ../data/ibus.schemas.in.h:13
msgid "Trigger Hotkey"
@@ -269,7 +276,8 @@ msgstr "ഹോട്ട്കീ ട്രിഗര് ചെയ്യുക"
#: ../data/ibus.schemas.in.h:14
msgid "Trigger hotkey for enable or disable input context"
-msgstr "ഇന്പുട്ട് കോണ്ടെക്സ്റ്റ് സജ്ജമാക്കുകയോ നിര്ജ്ജീവമാക്കുകയോ ചെയ്യുന്നതിനായി ഹോട്ട്കീ ട്രിഗര് ചെയ്യുക"
+msgstr ""
+"ഇന്പുട്ട് കോണ്ടെക്സ്റ്റ് സജ്ജമാക്കുകയോ നിര്ജ്ജീവമാക്കുകയോ ചെയ്യുന്നതിനായി ഹോട്ട്കീ ട്രിഗര് ചെയ്യുക"
#: ../data/ibus.schemas.in.h:15
msgid "Use Custom Font"
@@ -279,7 +287,5 @@ msgstr "നിങ്ങള് സജ്ജമാക്കിയ അക്ഷ
msgid "Use custom font name for language panel"
msgstr "ഭാഷ്ക്കുള്ള പാനലില് നിങ്ങള് സജ്ജമാക്കിയ അക്ഷരസഞ്ചയത്തിന്റെ പേരു് ഉപയോഗിക്കുക"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
-
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
diff --git a/po/mr.po b/po/mr.po
index f7598bc..852f91f 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,14 +1,14 @@
-# translation of ibus.master.ibus.po to marathi
+# translation of ibus.master.mr.po to marathi
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Sandeep Shedmake <sandeep.shedmake@gmail.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: ibus.master.ibus\n"
+"Project-Id-Version: ibus.master.mr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 11:45+0800\n"
-"PO-Revision-Date: 2009-04-06 13:54+0530\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
"MIME-Version: 1.0\n"
@@ -51,23 +51,23 @@ msgstr "संदिप शेडमाके <sandeep.shedmake@gmail.com>, 2009
msgid "Switch input method"
msgstr "इनपुट पद्धत बदला"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ट्रिगर"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "पुढिल इनपुट पद्धत"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "मागील इनपुट पद्धत"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus डिमन सुरू केले गेले नाही. तुम्हाला आता सुरू करायचे?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -81,24 +81,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s करीता कळफलक शार्टकट निवडा"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "कळफलक शार्टकट"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "कि कोड:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "मॉडिफायर:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -106,7 +106,7 @@ msgstr ""
"कृपया कि (किंवा कि जोडणी) दाबा.\n"
"कि सोडल्यावर संवाद बंद होईल."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "कृपया कि (किंवा कि जोडणी) दाबा"
@@ -147,26 +147,34 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>यादीतील प्रथम इन्पुट पद्धती मुलभूत नुरूप आहे.\n"
+"बदलण्याकरीता तुम्ही वर/खाली बटणांचा वापर करू शकता.</i></small>"
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "विषयी"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "घटकांचे निर्देशन:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "स्वपसंत फॉन्ट:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "कार्यान्वीत करा किंवा अकार्यान्वीत करा:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "सर्वसाधारण"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -174,15 +182,15 @@ msgstr ""
"आडवे\n"
"उभे"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus आवड निवड"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "इनपुट पद्धत"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -192,23 +200,23 @@ msgstr ""
"सक्रीय असल्यास\n"
"नेहमी"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "पुढची इनपुट पद्धत:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "मागील इनपुट पद्धत:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "भाषा पटल दाखवा:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "प्रवेशवेळी ibus सुरू करा"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "स्वपसंत फॉन्ट वापरा"
@@ -278,6 +286,3 @@ msgstr "स्वपसंत फॉन्ट वापरा"
msgid "Use custom font name for language panel"
msgstr "भाषा पटल करीत स्वपसंत फॉन्ट नाव वापरा"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
diff --git a/po/or.po b/po/or.po
index dfb406f..d7600a1 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-04-08 11:23+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
"PO-Revision-Date: 2009-04-08 00:30+0530\n"
"Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
"Language-Team: Oriya <oriya-it@googlegroups.com>\n"
@@ -53,23 +53,23 @@ msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
msgid "Switch input method"
msgstr "ନିବେଶ ପ୍ରଣୀଳିକୁ ବଦଳାନ୍ତୁ"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ଟ୍ରିଗର"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "ପରବର୍ତ୍ତି ନିବେଶ ପ୍ରଣାଳୀ"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus ଡେମନଟି ଆରମ୍ଭ ହୋଇନାହିଁ। ଆପଣ ଏହାକୁ ବର୍ତ୍ତମାନ ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -83,24 +83,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s ପାଇଁ କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ ବାଛନ୍ତୁ"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "କି ସଂକେତ:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "ରୂପାନ୍ତରକ:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -108,7 +108,7 @@ msgstr ""
"ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।\n"
"କିକୁ ଛାଡ଼ିଦେଲାପରେ ସଂଳାପଟି ବନ୍ଦ ହୋଇଯିବ।"
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।"
@@ -149,26 +149,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "ବିବରଣୀ"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "ପ୍ରାର୍ଥୀ ଅନୁସ୍ଥାପନ:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "ଇଚ୍ଛାରୂପୀ ଅକ୍ଷରରୂପ:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "ସକ୍ରିୟ ଅଥବା ନିଷ୍କ୍ରିୟ:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "ସାଧାରଣ"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -176,15 +182,15 @@ msgstr ""
"ଭୂ-ସମାନ୍ତରାଳ\n"
"ଭୂ-ଲମ୍ବ"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus ପସନ୍ଦ"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "ନିବେଶ ପ୍ରଣାଳୀଗୁଡ଼ିକ"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -194,23 +200,23 @@ msgstr ""
"ସକ୍ରିୟ ଥିବା ସମୟରେ\n"
"ସର୍ବଦା"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "ପରବର୍ତ୍ତି ନିବେଶ ପ୍ରଣାଳୀ:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "ଭାଷା ତାଲିକା ଦର୍ଶାନ୍ତୁ:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "ଲଗଇନ ସମୟରେ ibus କୁ ଆରମ୍ଭ କରନ୍ତୁ"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ"
diff --git a/po/pa.po b/po/pa.po
index 1626fa4..7361ef8 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
"PO-Revision-Date: 2009-03-31 21:46+0000\n"
"Last-Translator: A S Alam <aalam@users.sf.net>\n"
"Language-Team: Punjabi/Panjabi <punjab-l10n@list.sf.net>\n"
@@ -54,25 +54,25 @@ msgstr ""
msgid "Switch input method"
msgstr "ਕੋਈ ਇੰਪੁੱਟ ਢੰਗ ਨਹੀਂ"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ਟਰਿੱਗਰ"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
#, fuzzy
msgid "next input method"
msgstr "ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
#, fuzzy
msgid "previous input method"
msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus ਡੈਮਨ ਚੱਲਦੀ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -85,24 +85,24 @@ msgstr ""
"
export XMODIFIERS=@im=ibus\n"
"
export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "ਕੀ ਕੋਡ:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "ਮਾਡੀਫਾਇਰ:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -110,7 +110,7 @@ msgstr ""
"ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਕੋਈ ਸਵਿੱਚ ਜੋੜ)।\n"
"ਜਦੋਂ ਸਵਿੱਚ ਛੱਡੀ ਜਾਵੇਗੀ ਤਾਂ ਇਹ ਡਾਈਲਾਗ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।"
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)"
@@ -151,26 +151,32 @@ msgstr ""
"
\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "ਇਸ ਬਾਰੇ"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "ਉਮੀਦਵਾਰ ਸਥਿਤੀ:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "ਚਾਲੂ ਜਾਂ ਬੰਦ:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "ਆਮ"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -178,15 +184,15 @@ msgstr ""
"ਹਰੀਜੱਟਲ\n"
"ਵਰਟੀਕਲ"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus ਪਸੰਦ"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "ਇੰਪੁੱਟ ਢੰਗ"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -196,24 +202,24 @@ msgstr ""
"ਜਦੋਂ ਐਕਟਿਵ\n"
"ਹਮੇਸ਼ਾ"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
#, fuzzy
msgid "Previous input method:"
msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਵੇਖੋ:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "ਲਾਗਇਨ ਸਮੇਂ ibus ਚਲਾਉ"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
@@ -283,9 +289,8 @@ msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
msgid "Use custom font name for language panel"
msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਪਸੰਦੀਦਾ ਫੋਂਟ ਨਾਂ ਵਰਤੋਂ"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
#~ msgid "Switch engine"
#~ msgstr "ਇੰਜਣ ਬਦਲੋ"
diff --git a/po/pl.po b/po/pl.po
index e418e84..d54a9d6 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-04-08 11:23+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
"PO-Revision-Date: 2009-04-07 00:51+0200\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -47,23 +47,23 @@ msgstr "Piotr Drąg <piotrdrag@gmail.com>, 2009"
msgid "Switch input method"
msgstr "Przełącz metodę wejścia"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "przełącznik"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "następna metoda wejścia"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "poprzednia metoda wejścia"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "Demon IBus nie jest uruchomiony. Czy chcesz uruchomić teraz?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -77,24 +77,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "Wybierz skrót klawiszowy dla %s"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "Skróty klawiszowe"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "Kod klawisza:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "Modyfikatory:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -102,7 +102,7 @@ msgstr ""
"Naciśnij klawisz (lub kombinację klawiszy).\n"
"Okno dialogowe zostanie zamknięte po zwolnieniu klawisza."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "Naciśnij klawisz (lub kombinację klawiszy)"
@@ -143,26 +143,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "O programie"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "Orientacja kandydatów:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "Własna czcionka:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "Włącz lub wyłącz:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "Ogólne"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -170,15 +176,15 @@ msgstr ""
"Poziome\n"
"Pionowe"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "Preferencje IBus"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "Metody wejścia"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -188,23 +194,23 @@ msgstr ""
"W czasie aktywności\n"
"Zawsze"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "Następna metoda wejścia:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "Poprzednia metoda wejścia:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "Wyświetl panel języka:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "Uruchom IBus podczas logowania"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "Użyj własnej czcionki"
diff --git a/po/sr.po b/po/sr.po
index 26e8dbb..404e52a 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
@@ -52,25 +52,25 @@ msgstr "Serbian <fedora-trans-sr@redhat.com>"
msgid "Switch input method"
msgstr "Нема методе уноса"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "окидач"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
#, fuzzy
msgid "next input method"
msgstr "Следећа метода уноса"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
#, fuzzy
msgid "previous input method"
msgstr "Претходна метода уноса"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus демон није покренут. Да ли желите да га сада покренете?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -84,24 +84,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "Изаберите пречицу тастатуре за %s"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "Пречице тастатуре"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "Код тастера:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "Модификатори:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -109,7 +109,7 @@ msgstr ""
"Притисните тастер (или комбинацију тастера).\n"
"Прозорче ће бити затворено када се тастер отпусти."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "Притисните тастер (или комбинацију тастера)"
@@ -150,26 +150,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "О програму"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "Оријентације кандидата:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "Прилагођени фонт:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "Укључи или искључи:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "Опште"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -177,15 +183,15 @@ msgstr ""
"Водоравно\n"
"Усправно"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus поставке"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "Методе уноса"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -195,24 +201,24 @@ msgstr ""
"Када је активно\n"
"Увек"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "Следећа метода уноса:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
#, fuzzy
msgid "Previous input method:"
msgstr "Претходна метода уноса:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "Прикажи језички панел:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "Покрени ibus при пријави"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "Употреби прилагођени фонт"
@@ -285,9 +291,8 @@ msgstr "Користи прилагођени фонт"
msgid "Use custom font name for language panel"
msgstr "Користи прилагођени фонт за језички панел"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
#~ msgid "Switch engine"
#~ msgstr "Промени погон"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 0eedab1..9144001 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
@@ -52,25 +52,25 @@ msgstr "Serbian <fedora-trans-sr@redhat.com>"
msgid "Switch input method"
msgstr "Nema metode unosa"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "okidač"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
#, fuzzy
msgid "next input method"
msgstr "sledeća metoda unosa"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
#, fuzzy
msgid "previous input method"
msgstr "prethodna metoda unosa"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus demon nije pokrenut. Da li želite da ga sada pokrenete?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -84,24 +84,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "Izaberite prečicu tastature za %s"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "Prečice tastature"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "Kod tastera:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "Modifikatori:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -109,7 +109,7 @@ msgstr ""
"Pritisnite taster (ili kombinaciju tastera).\n"
"Prozorče će biti zatvoreno kada se taster otpusti."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "Pritisnite taster (ili kombinaciju tastera)"
@@ -150,26 +150,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "O programu"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "Orijentacije kandidata:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "Prilagođeni font:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "Uključi ili isključi:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "Opšte"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -177,15 +183,15 @@ msgstr ""
"Vodoravno\n"
"Uspravno"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus postavke"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "Metode unosa"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -195,24 +201,24 @@ msgstr ""
"Kada je aktivno\n"
"Uvek"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "Sledeća metoda unosa:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
#, fuzzy
msgid "Previous input method:"
msgstr "Prethodna metoda unosa:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "Prikaži jezički panel:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "Pokreni ibus pri prijavi"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "Upotrebi prilagođeni font"
@@ -285,9 +291,8 @@ msgstr "Koristi prilagođeni font"
msgid "Use custom font name for language panel"
msgstr "Koristi prilagođeni font za jezički panel"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
#~ msgid "Switch engine"
#~ msgstr "Promeni pogon"
diff --git a/po/ta.po b/po/ta.po
index b271390..1c3522b 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
@@ -51,23 +51,23 @@ msgstr "I. Felix <ifelix@redhat.com>"
msgid "Switch input method"
msgstr "உள்ளீடு முறையை மாற்று"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "ட்ரிகர்"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "அடுத்த உள்ளீடு முறை"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "முந்தைய உள்ளீடு முறை"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus daemon துவக்கப்படவில்லை. இப்போது துவக்க வேண்டுமா?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -75,30 +75,30 @@ msgid ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
msgstr ""
-"IBus துவக்கப்பட்டது! உங்களால் IBusஐ பயன்படுத்த முடியவில்லையெனில், பின்வரும் வரியை சேர்த்து "
-"$HOME/.bashrc, உங்கள் பணிமேடையை மறுதுவக்கவும்.\n"
+"IBus துவக்கப்பட்டது! உங்களால் IBusஐ பயன்படுத்த முடியவில்லையெனில், பின்வரும் வரியை "
+"சேர்த்து $HOME/.bashrc, உங்கள் பணிமேடையை மறுதுவக்கவும்.\n"
" export GTK_IM_MODULE=ibus\n"
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "விசைப்பலகை குறுக்குவழிகள்"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "விசை குறியீடு:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "மாற்றிகள்;"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -106,7 +106,7 @@ msgstr ""
"ஒரு விசையை அழுத்தவும் (அல்லது விசை கலவையை).\n"
"விசையை விடுத்தால் உரையாடல் மூடப்படும்."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "ஒரு விசையை அழுத்தவும் (அல்லது ஒரு விசை கலவையை)"
@@ -147,26 +147,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "பற்றி"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "கேண்டிடேட் சார்ந்து:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "தனிபயன் எழுத்துரு:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "செயல்படுத்து அல்லது செயல்நீக்கு:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "பொது"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -174,15 +180,15 @@ msgstr ""
"கிடைமட்டம்\n"
"செங்குத்து"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus முன்னுரிமைகள்"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "உள்ளீடு முறைகள்"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -192,23 +198,23 @@ msgstr ""
"செயலிலிருக்கும் போது\n"
"எப்போதும்"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "அடுத்த உள்ளீடு முறை:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "முந்தைய உள்ளீடு முறை:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "மொழி பலகத்தை காட்டு:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "புகுபதிவில் ibusஐ துவக்கு"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "தனிபயன் எழுத்துருவை பயன்படுத்து"
@@ -268,7 +274,9 @@ msgstr "ட்ரிகர் குறுக்குவிசை"
#: ../data/ibus.schemas.in.h:14
msgid "Trigger hotkey for enable or disable input context"
-msgstr "உள்ளீடு சூழலை செயல்படுத்த அல்லது செயல் நீக்க ட்ரிகர் குறுக்குவிசையை செயல்படுத்து அல்லது செயல்நீக்கு"
+msgstr ""
+"உள்ளீடு சூழலை செயல்படுத்த அல்லது செயல் நீக்க ட்ரிகர் குறுக்குவிசையை செயல்படுத்து அல்லது "
+"செயல்நீக்கு"
#: ../data/ibus.schemas.in.h:15
msgid "Use Custom Font"
@@ -278,7 +286,5 @@ msgstr "தனிபயன் எழுத்துருவை பயன்ப
msgid "Use custom font name for language panel"
msgstr "மொழி பலகத்தில் தனிபயன் எழுத்துரு பெயர்"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
-
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
diff --git a/po/te.po b/po/te.po
index 9c65afd..52f1a8f 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.master.te\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 11:45+0800\n"
-"PO-Revision-Date: 2009-04-14 15:04+0530\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
"MIME-Version: 1.0\n"
@@ -17,6 +17,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
"\n"
+"\n"
#: ../bus/ibus.desktop.in.h:1
msgid "IBus"
@@ -52,23 +53,23 @@ msgstr "కృష్ణబాబు కె <kkrothap@redhat.com> 2009."
msgid "Switch input method"
msgstr "ఇన్పుట్ పద్దతి మార్చుము"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "బిస (ట్రిగ్గర్)"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "తరువాతి ఇన్పుట్ పద్దతి"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "మునుపటి ఇన్పుట్ పద్దతి"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus డెమోన్ ప్రారంభమవలేదు. మీరు దానిని ప్రారంభించాలని అనుకొనుచున్నారా?"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -82,24 +83,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "%s కొరకు కీబోర్డు లఘువును యెంపికచేయుము"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "కీబోర్డు లఘువులు"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "కీ కోడ్:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "సవరణిలు:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -107,7 +108,7 @@ msgstr ""
"దయచేసి వొక కీను వత్తండి (లేదా కీ మిశ్రమాన్ని).\n"
"కీ వదిలినప్పుడు డైలాగు మూయబడుతుంది."
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "దయచేసి కీను వత్తండి (లేదా కీ మిశ్రమాన్ని)"
@@ -148,26 +149,34 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>జాబితాలో పైన వున్నది అప్రమేయ యిన్పుట్ విధానం అవుతుంది.\n"
+"దానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు.</i></small>"
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "గురించి"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "సభ్యుల దృక్పధము:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "మలచుకొనిన ఫాంటు:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "చేతనముచేయి లేదా అచేతనముచేయి:"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "సాదారణ"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -175,15 +184,15 @@ msgstr ""
"చదరముగా\n"
"నిలువుగా"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus అభీష్టములు"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "ఇన్పుట్ పద్దతులు"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -193,23 +202,23 @@ msgstr ""
"క్రియాశీలముగా వున్నప్పుడు\n"
"ఎల్లప్పుడు"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "తరువాతి ఇన్పుట్ పద్దతి:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "మునుపటి ఇన్పుట్ పద్దతి:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "భాషా ప్యానల్ చూపుము:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "లాగిన్నందు ibus ప్రారంభించుము"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "మలచుకొనిన ఫాంటు వుపయోగించుము"
@@ -281,7 +290,3 @@ msgstr "మలచుకొనిన ఫాంటు వుపయోగించ
msgid "Use custom font name for language panel"
msgstr "భాషా ప్యానల్ కొరకు మలచుకొనిన ఫాంట్ నామము వుపయోగించుము"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
-
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dfe85a4..7a73300 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-04-06 11:45+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
@@ -50,23 +50,23 @@ msgstr "Huang Peng <shawn.p.huang@gmail.com>"
msgid "Switch input method"
msgstr "切换输入法"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "开关"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "下一入法"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "前一入法"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus守护进程没有启动，您是否想现在启动它？"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -79,24 +79,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "选择%s的快捷键"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "快捷键"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "按键:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "修饰符:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -104,7 +104,7 @@ msgstr ""
"请按一个键盘按键（或者一个组合按键）\n"
"当您松开任意按键时，对话框会自动关闭。"
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "请按一个键盘按键（或者一个组合按键）"
@@ -145,26 +145,34 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+"<small><i>列表中第一个输入法是默认的输入法。\n"
+"您可以使用上/下按钮来更改默认的输入法。</i></small>"
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "关于"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "候选词排列方向:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "自定义字体:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "开关"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "通用"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -172,15 +180,15 @@ msgstr ""
"水平\n"
"竖直"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus设置"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "输入法"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -190,23 +198,23 @@ msgstr ""
"活动时\n"
"总是"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "下一入法:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "前一入法:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "显示语言栏:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "启动桌面时自动启动IBus"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "使用自定义字体"
@@ -276,6 +284,5 @@ msgstr "使用自定义字体"
msgid "Use custom font name for language panel"
msgstr "语言栏是否使用自定义字体"
-#: ../data/ibus.schemas.in.h:17
-msgid "[Control+space]"
-msgstr "[Control+space]"
+#~ msgid "[Control+space]"
+#~ msgstr "[Control+space]"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index a225a2c..a01d2da 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-04-07 15:38+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
@@ -50,23 +50,23 @@ msgstr "Caius 'kaio' Chance <k@kaio.me>"
msgid "Switch input method"
msgstr "切換輸入法"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "切換"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "下一個輸入法"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "上一個輸入法"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus daemon 没有啟動，您是否想現在啟動它？"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -79,24 +79,24 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "選擇%s的捷徑鍵"
-#: ../setup/keyboardshortcut.py:53
+#: ../setup/keyboardshortcut.py:54
msgid "Keyboard shortcuts"
msgstr "捷徑鍵"
-#: ../setup/keyboardshortcut.py:61
+#: ../setup/keyboardshortcut.py:65
msgid "Key code:"
msgstr "按鍵:"
-#: ../setup/keyboardshortcut.py:76
+#: ../setup/keyboardshortcut.py:80
msgid "Modifiers:"
msgstr "組合按鍵:"
-#: ../setup/keyboardshortcut.py:206
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -104,7 +104,7 @@ msgstr ""
"請按一個鍵盤按鍵（或是一個按鍵組合）\n"
"當按鍵被放開時，對話框會自動關閉。"
-#: ../setup/keyboardshortcut.py:208
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "請按一個鍵盤按鍵（或是一個按鍵組合）"
@@ -145,26 +145,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "關於"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "候選詞排列方向:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "自訂字體:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "開關"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "通用"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -172,15 +178,15 @@ msgstr ""
"水平\n"
"垂直"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus設定"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "輸入法"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -190,23 +196,23 @@ msgstr ""
"啟動時\n"
"總是"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "下一個輸入法:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "上一個輸入法:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "顯示語言面板:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "登入時自動啟動IBus"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "使用自訂字體"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6494e39..fc59aec 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-04-28 15:40+0800\n"
+"POT-Creation-Date: 2009-05-26 07:38+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"
@@ -50,23 +50,23 @@ msgstr "Ding-Yi Chen 陳定彞 <dchen@redhat.com>"
msgid "Switch input method"
msgstr "切換輸入法"
-#: ../setup/main.py:103
+#: ../setup/main.py:104
msgid "trigger"
msgstr "切換"
-#: ../setup/main.py:113
+#: ../setup/main.py:114
msgid "next input method"
msgstr "下一輸入法"
-#: ../setup/main.py:123
+#: ../setup/main.py:124
msgid "previous input method"
msgstr "前一輸入法"
-#: ../setup/main.py:204
+#: ../setup/main.py:205
msgid "IBus daemon is not started. Do you want to start it now?"
msgstr "IBus daemon 没有啟動，您是否想現在啟動它？"
-#: ../setup/main.py:219
+#: ../setup/main.py:220
msgid ""
"IBus has been started! If you can not use IBus, please add below lines in "
"$HOME/.bashrc, and relogin your desktop.\n"
@@ -79,7 +79,7 @@ msgstr ""
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
-#: ../setup/main.py:234
+#: ../setup/main.py:235
#, python-format
msgid "Select keyboard shortcut for %s"
msgstr "選%s的熱鍵"
@@ -96,7 +96,7 @@ msgstr "按鍵:"
msgid "Modifiers:"
msgstr "組合按鍵:"
-#: ../setup/keyboardshortcut.py:218
+#: ../setup/keyboardshortcut.py:222
msgid ""
"Please press a key (or a key combination).\n"
"The dialog will be closed when the key is released."
@@ -104,7 +104,7 @@ msgstr ""
"請按一個鍵盤按鍵（或是一個按鍵組合）\n"
"當您鬆開任意鍵時，對話框會自動關閉。"
-#: ../setup/keyboardshortcut.py:220
+#: ../setup/keyboardshortcut.py:224
msgid "Please press a key (or a key combination)"
msgstr "請按一個鍵盤按鍵（或是一個按鍵組合）"
@@ -145,26 +145,32 @@ msgstr ""
"\n"
#: ../setup/setup.glade.h:12
+msgid ""
+"<small><i>The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it.</i></small>"
+msgstr ""
+
+#: ../setup/setup.glade.h:14
msgid "About"
msgstr "關於"
-#: ../setup/setup.glade.h:13
+#: ../setup/setup.glade.h:15
msgid "Candidates orientation:"
msgstr "候選詞排列方向:"
-#: ../setup/setup.glade.h:14
+#: ../setup/setup.glade.h:16
msgid "Custom font:"
msgstr "自訂字體:"
-#: ../setup/setup.glade.h:15
+#: ../setup/setup.glade.h:17
msgid "Enable or disable:"
msgstr "開關"
-#: ../setup/setup.glade.h:16
+#: ../setup/setup.glade.h:18
msgid "General"
msgstr "通用"
-#: ../setup/setup.glade.h:17
+#: ../setup/setup.glade.h:19
msgid ""
"Horizontal\n"
"Vertical"
@@ -172,15 +178,15 @@ msgstr ""
"水平\n"
"垂直"
-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
msgid "IBus Preferences"
msgstr "IBus設定"
-#: ../setup/setup.glade.h:20
+#: ../setup/setup.glade.h:22
msgid "Input Methods"
msgstr "輸入法"
-#: ../setup/setup.glade.h:21
+#: ../setup/setup.glade.h:23
msgid ""
"Never\n"
"When active\n"
@@ -190,23 +196,23 @@ msgstr ""
"啟動時\n"
"總是"
-#: ../setup/setup.glade.h:24
+#: ../setup/setup.glade.h:26
msgid "Next input method:"
msgstr "下一輸入法:"
-#: ../setup/setup.glade.h:25
+#: ../setup/setup.glade.h:27
msgid "Previous input method:"
msgstr "前一輸入法:"
-#: ../setup/setup.glade.h:26
+#: ../setup/setup.glade.h:28
msgid "Show language panel:"
msgstr "顯示語言面板:"
-#: ../setup/setup.glade.h:27
+#: ../setup/setup.glade.h:29
msgid "Start ibus on login"
msgstr "啟動桌面時自動啟動IBus"
-#: ../setup/setup.glade.h:28
+#: ../setup/setup.glade.h:30
msgid "Use custom font"
msgstr "使用自訂字體"
diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index 0f971dd..4ee403d 100644
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -22,6 +22,7 @@
import gtk
import glib
import gobject
+import pango
import ibus
from icon import load_icon
@@ -96,6 +97,12 @@ class EngineTreeView(gtk.TreeView):
renderer.set_property("sensitive", True)
language = ibus.get_language_name(engine.language)
renderer.set_property("text", "%s - %s" % (language, engine.longname))
+ if self.__model.get_path(iter)[0] == 0:
+ #default engine
+ renderer.set_property("weight", pango.WEIGHT_BOLD)
+ else:
+ renderer.set_property("weight", pango.WEIGHT_NORMAL)
+
def set_engines(self, engines):
self.__model.clear()
@@ -132,6 +139,14 @@ class EngineTreeView(gtk.TreeView):
self.__engines.add(engine)
self.scroll_to_cell(self.__model[0].path, None)
+ def append_engine(self, engine):
+ if engine == None or engine in self.__engines:
+ return
+ iter = self.__model.append(None)
+ self.__model.set(iter, 0, engine)
+ self.__engines.add(engine)
+ self.scroll_to_cell(self.__model[-1].path, None)
+
def remove_engine(self):
iter = self.get_selected_iter()
if iter == None:
diff --git a/setup/main.py b/setup/main.py
index 3e6db39..8aea11b 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -22,6 +22,7 @@
import locale
import gettext
import os
+import signal
import sys
import time
import gtk
@@ -177,7 +178,7 @@ class Setup(object):
button = self.__xml.get_widget("button_engine_add")
button.connect("clicked",
- lambda *args:self.__treeview.prepend_engine(self.__combobox.get_active_engine()))
+ lambda *args:self.__treeview.append_engine(self.__combobox.get_active_engine()))
button = self.__xml.get_widget("button_engine_remove")
button.connect("clicked", lambda *args:self.__treeview.remove_engine())
button = self.__xml.get_widget("button_engine_up")
@@ -361,9 +362,14 @@ class Setup(object):
def __config_reloaded_cb(self, bus):
pass
+ def __sigusr1_cb(self, *args):
+ self.__window.present()
+
def run(self):
self.__window.show_all()
+ signal.signal(signal.SIGUSR1, self.__sigusr1_cb)
gtk.main()
if __name__ == "__main__":
- Setup().run()
+ setup = Setup()
+ setup.run()
diff --git a/setup/setup.glade b/setup/setup.glade
index 5bbea76..aab7988 100644
--- a/setup/setup.glade
+++ b/setup/setup.glade
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
+ <!-- interface-requires gtk+ 2.16 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="window_preferences">
<property name="border_width">12</property>
<property name="title" translatable="yes">IBus Preferences</property>
<property name="resizable">False</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="window_position">center</property>
<property name="icon_name">gtk-preferences</property>
<child>
<widget class="GtkVBox" id="vbox1">
@@ -31,7 +31,7 @@
<widget class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
@@ -92,14 +92,17 @@
<property name="can_focus">True</property>
<property name="editable">False</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="button_trigger">
+ <property name="label" translatable="yes">...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -122,14 +125,17 @@
<property name="can_focus">True</property>
<property name="editable">False</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="button_next_engine">
+ <property name="label" translatable="yes">...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -155,15 +161,18 @@
<property name="can_focus">True</property>
<property name="editable">False</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="button_prev_engine">
+ <property name="label" translatable="yes">...</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -195,13 +204,14 @@
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
@@ -220,10 +230,11 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Candidates orientation:</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="justify">right</property>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -237,6 +248,9 @@ Vertical</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkHBox" id="hbox3">
@@ -247,10 +261,11 @@ Vertical</property>
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Show language panel:</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="justify">right</property>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -271,11 +286,11 @@ Always</property>
</child>
<child>
<widget class="GtkCheckButton" id="checkbutton_custom_font">
+ <property name="label" translatable="yes">Use custom font</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use custom font</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -291,12 +306,15 @@ Always</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Custom font:</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkFontButton" id="fontbutton_custom_font">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="position">1</property>
@@ -337,8 +355,8 @@ Always</property>
<property name="label" translatable="yes">General</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -349,99 +367,163 @@ Always</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
- <widget class="GtkAlignment" id="alignment6">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment_engine_combobox">
+ <widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment_engine_combobox">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <placeholder/>
+ <widget class="GtkScrolledWindow" id="scrolledwindow_engine_treeview">
+ <property name="width_request">240</property>
+ <property name="height_request">300</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- </packing>
</child>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_engine_treeview">
- <property name="width_request">240</property>
- <property name="height_request">300</property>
+ <widget class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="spacing">5</property>
+ <property name="layout_style">start</property>
+ <child>
+ <widget class="GtkButton" id="button_engine_add">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_engine_remove">
+ <property name="label">gtk-remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_engine_up">
+ <property name="label">gtk-go-up</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child>
- <placeholder/>
+ <widget class="GtkButton" id="button_engine_down">
+ <property name="label">gtk-go-down</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <widget class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="top_padding">6</property>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
+ <widget class="GtkHBox" id="hbox8">
<property name="visible">True</property>
- <property name="spacing">5</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
- <child>
- <widget class="GtkButton" id="button_engine_add">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="button_engine_remove">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="button_engine_up">
+ <widget class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-up</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
+ <property name="stock">gtk-info</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_engine_down">
+ <widget class="GtkLabel" id="label11">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-down</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><small><i>The default input method is the top one in the list.
+You may use up/down buttons to change it.</i></small></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -465,9 +547,9 @@ Always</property>
<property name="label" translatable="yes">Input Methods</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -487,7 +569,7 @@ Homepage: http://code.google.com/p/ibus
</property>
<property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</widget>
<packing>
<property name="position">1</property>
@@ -497,7 +579,7 @@ Homepage: http://code.google.com/p/ibus
<widget class="GtkFrame" id="frame1">
<property name="no_show_all">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
@@ -505,11 +587,11 @@ Homepage: http://code.google.com/p/ibus
<property name="left_padding">12</property>
<child>
<widget class="GtkCheckButton" id="checkbutton_auto_start">
+ <property name="label" translatable="yes">Start ibus on login</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Start ibus on login</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
</child>
@@ -543,26 +625,34 @@ Homepage: http://code.google.com/p/ibus
<property name="label" translatable="yes">About</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">2</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="spacing">12</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="button_close">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-close</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
diff --git a/ui/gtk/panel.py b/ui/gtk/panel.py
index 2640c65..534a394 100644
--- a/ui/gtk/panel.py
+++ b/ui/gtk/panel.py
@@ -404,6 +404,7 @@ class Panel(ibus.PanelBase):
if self.__setup_pid != 0:
pid, state = os.waitpid(self.__setup_pid, os.P_NOWAIT)
if pid != self.__setup_pid:
+ os.kill(self.__setup_pid, signal.SIGUSR1)
return
self.__setup_pid = 0
self.__setup_pid = os.spawnl(os.P_NOWAIT, self.__setup_cmd, "ibus-setup")