diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index acb465d..ca95d65 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -656,21 +656,24 @@ _ic_process_key_event_reply_cb (gpointer data,
{
gboolean retval;
CallData *call_data;
- IBusMessage *reply;
retval = (gboolean) GPOINTER_TO_INT (data);
call_data = (CallData *) user_data;
- reply = ibus_message_new_method_return (call_data->message);
- ibus_message_append_args (reply,
- G_TYPE_BOOLEAN, &retval,
- G_TYPE_INVALID);
+ /* make sure the connection is alive */
+ if (G_LIKELY (call_data->context->connection != NULL)) {
+ IBusMessage *reply;
+ reply = ibus_message_new_method_return (call_data->message);
+ ibus_message_append_args (reply,
+ G_TYPE_BOOLEAN, &retval,
+ G_TYPE_INVALID);
- ibus_connection_send ((IBusConnection *)call_data->context->connection, reply);
+ ibus_connection_send ((IBusConnection *)call_data->context->connection, reply);
+ ibus_message_unref (reply);
+ }
g_object_unref (call_data->context);
ibus_message_unref (call_data->message);
- ibus_message_unref (reply);
g_slice_free (CallData, call_data);
}
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 11b0c2f..1db51e1 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -53,10 +53,10 @@
<applyto>/desktop/ibus/panel/show</applyto>
<owner>ibus</owner>
<type>int</type>
- <default>1</default>
+ <default>0</default>
<locale name="C">
<short>Auto hide</short>
- <long>The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always show</long>
+ <long>The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = Always show</long>
</locale>
</schema>
<schema>
diff --git a/ibus.spec.in b/ibus.spec.in
index 96e3764..29c493d 100644
--- a/ibus.spec.in
+++ b/ibus.spec.in
@@ -44,6 +44,7 @@ Requires: dbus-python >= %{dbus_python_version}
Requires: im-chooser >= %{im_chooser_version}
Requires: GConf2 >= %{gconf2_version}
Requires: notify-python
+Requires: librsvg2
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
diff --git a/po/ar.po b/po/ar.po
index 2d94f0c..b135d2f 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: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+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"
@@ -245,11 +245,11 @@ msgstr "المحركات المحملة مسبقا عند بدء ibus"
msgid "Prev engine shortcut keys"
msgstr "مفتاح المحرك السابق"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr ""
@@ -258,15 +258,15 @@ msgstr ""
msgid "Show input method name"
msgstr "اسم الخط المخصص للوحة اللغة"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
#, fuzzy
msgid "Show input method name on language bar"
msgstr "اسم الخط المخصص للوحة اللغة"
#: ../data/ibus.schemas.in.h:17
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
#: ../data/ibus.schemas.in.h:18
@@ -275,11 +275,11 @@ msgid ""
"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
msgstr ""
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr ""
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr ""
@@ -301,11 +301,11 @@ msgstr "استخدم خط مخصص في لوحة اللغة"
msgid "Use global input method"
msgstr "اختر طريقة الإدخال"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr ""
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr ""
@@ -426,68 +426,64 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr ""
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr ""
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "طريقة الإدخال التالية"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "طريقة الإدخال السابقة"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr ""
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr ""
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr ""
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
#, fuzzy
msgid "Show input method's name on language bar when check the checkbox"
msgstr "اسم الخط المخصص للوحة اللغة"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "إظهار لوحة اللغات:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "بدء ibus عند الولوج"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr ""
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr ""
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr ""
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "استعمال خط مخصص"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr ""
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
#, fuzzy
msgid "When active"
msgstr ""
diff --git a/po/as.po b/po/as.po
index c03bacd..2e8119f 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: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2009-12-11 12:13+0530\n"
"Last-Translator: \n"
"Language-Team: Assamese <>\n"
@@ -243,11 +243,11 @@ msgstr "ibus আৰম্ভৰ আগতে কলঘৰ তুলি লওক
msgid "Prev engine shortcut keys"
msgstr "পূৰ্ববৰ্তী কলঘৰৰ ছৰ্টকাট চাবি"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "প্ৰণালী ট্ৰত আইকন প্ৰদৰ্শন কৰা হ'ব"
@@ -255,14 +255,15 @@ msgstr "প্ৰণালী ট্ৰত আইকন প্ৰদৰ্শন
msgid "Show input method name"
msgstr "নিবেশ পদ্ধতিৰ নাম দেখুৱাব"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "ভাষাৰ বাৰত নিবেশ পদ্ধতিৰ নাম দেখুৱাব"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"ভাষাৰ পেনেলৰ আচৰণ । ০ = সদায় লুকাওক, ১ = স্বয়ংক্ৰিয়ভাবে লুকাওক, ২ = সদায় দেখুৱাওক"
@@ -274,11 +275,11 @@ msgstr ""
"ভাষাৰ পেনেলৰ স্থান । 0 = ওপৰৰ বাওঁফালৰ কোণত, 1 = ওপৰৰ সোঁফালৰ কোণত, 2 = তলৰ "
"বাওঁফালৰ কোণত, 3 = তলৰ সোঁফালৰ কোণত, 4 = স্বনিৰ্ধাৰিত"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "তালিকাত উপস্থিত পৰবৰ্তী নিবেশ পদ্ধতিলৈ পৰিবৰ্তনৰ বাবে প্ৰযোজ্য ছৰ্ট-কাট চাবি"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "নিবেশ পদ্ধতি খোলা আৰু বন্ধ কৰাৰ বাবে প্ৰয়োজনীয় ছৰ্ট-কাট চাবি নিৰ্ধাৰণ কৰক"
@@ -299,11 +300,11 @@ msgstr "ভাষাৰ পেনেলৰ বাবে স্বনিৰ্ব
msgid "Use global input method"
msgstr "এটা নিবেশ পদ্ধতি নিৰ্ব্বাচন কৰক"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "প্ৰণালী চাবিৰ ফলক (XKB) বিন্যাস প্ৰয়োগ কৰা হ'ব"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "প্ৰণালী চাবিৰ ফলক বিন্যাস প্ৰয়োগ কৰা হ'ব"
@@ -420,70 +421,69 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "নিৰ্বাচিত নিবেশ পদ্ধতিক সক্ৰিয় নিবেশ পদ্ধতিৰ তালিকাৰ ওপৰলৈ স্থানান্তৰ কৰক"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "কেতিয়াও নহয়"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "পিছৰ নিবেশ পদ্ধতি:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "আগৰ নিবেশ পদ্ধতি"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "সক্ৰিয় নিবেশ পদ্ধতিৰ তালিকাৰ পৰা নিৰ্বাচিত নিবেশ পদ্ধতি আঁতৰুৱা হ'ব"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "ভাষাৰ বাৰ প্ৰদৰ্শন আৰু লুকুৱাৰ উদ্দেশ্যে ibus ৰ আচৰণ নিৰ্ধাৰণ কৰক"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "লুক-আপ টেবুলত প্ৰযোজ্য বিকল্পসমূহৰ দিশ নিৰ্ধাৰণ কৰক"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "নিৰ্বাচিত নিবেশ পদ্ধতি সংক্ৰান্ত তথ্য প্ৰদৰ্শন কৰা হ'ব"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "চেকবক্স নিৰ্বাচিত হ'লে ভাষাৰ বাৰত নিবেশ পদ্ধতিৰ নাম প্ৰদৰ্শন কৰা হ'ব"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "ভাষাৰ পেনেল দেখুৱাওক:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "প্ৰৱেশত ibus আৰম্ভ কৰক"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "তালিকাত উপস্থিত পূৰ্ববৰ্তী নিবেশ পদ্ধতিলৈ পৰিবৰ্তনৰ বাবে প্ৰযোজ্য ছৰ্ট-কাট চাবি"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "ওপৰৰ বাওঁফালৰ কোণত"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "ওপৰৰ সোঁফালৰ কোণত"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "স্বনিৰ্বাচিত ফন্ট ব্যৱহাৰ কৰা হ'ব"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "উল্লম্ব"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "সক্ৰিয় অৱস্থাত"
+#~ msgid "Never"
+#~ msgstr "কেতিয়াও নহয়"
+
#, fuzzy
#~ msgid "Use global engine"
#~ msgstr "কলঘৰ আগতে তুলি লোৱা হ'ব"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index f7e69e8..77d37a2 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2010-03-25 17:16+0530\n"
"Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
"Language-Team: Bengali INDIA <anubad@lists.ankur.org.in>\n"
@@ -245,11 +245,11 @@ msgstr "ibus আরম্ভের সময় ইঞ্জিনগুলি প
msgid "Prev engine shortcut keys"
msgstr "পূর্ববর্তী ইঞ্জিনের শর্টকাট-কি"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "সকল অ্যাপ্লিকেশনের মধ্যে একই ইনপুট পদ্ধতি ব্যবহার করা হবে"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "সিস্টেম ট্রের মধ্যে আইকন প্রদর্শন করা হবে"
@@ -257,14 +257,15 @@ msgstr "সিস্টেম ট্রের মধ্যে আইকন প
msgid "Show input method name"
msgstr "ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"ভাষা প্রদর্শনের প্যানেলের আচরণ। 0 (০) = সর্বদা আড়াল করা হবে, 1 (১) = "
"স্বয়ংক্রিয়ভাবে আড়াল করা হবে, 2 (২) = সর্বদা প্রদর্শন করা হবে"
@@ -277,11 +278,11 @@ msgstr ""
"ভাষার প্যানেলের অবস্থান। 0 = উপরে বাঁদিকের কোণায়, 1 = উপরে ডানদিকের কোণায়, 2 = "
"নীচে বাঁদিকের কোণায়, 3 = নীচে ডানদিকের কোণায়, 4 = স্বনির্ধারিত"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
@@ -301,11 +302,11 @@ msgstr "ভাষার প্যানেলের জন্য স্বনি
msgid "Use global input method"
msgstr "সার্বজনীন ইনপুট পদ্ধতি "
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস প্রয়োগ করা হবে"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে"
@@ -423,69 +424,68 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় উপরে স্থানান্তর করা হবে"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "কখনো নয়"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "পরবর্তী ইনপুট পদ্ধতি:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "পূর্ববর্তী ইনপুট পদ্ধতি:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "সক্রিয় ইনপুট পদ্ধতির তালিকা থেকে নির্বাচিত ইনপুট পদ্ধতিটি মুছে ফেলা হবে"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "ভাষার বার প্রদর্শন ও আড়াল করার উদ্দেশ্যে ibus-র আচরণ নির্ধারণ করুন"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "লুক-আপ টেবিলের মধ্যে প্রযোজ্য বিকল্পগুলির দিশা নির্ধারণ করুন"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "নির্বাচিত ইনপুট পদ্ধতি সংক্রান্ত তথ্য প্রদর্শন করা হবে"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "চেকবক্স নির্বাচিত হলে, ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "ভাষার প্যানেল প্রদর্শন করা হবে:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "লগ-ইন করার সময় ibus আরম্ভ করা হবে"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "উপরে বাঁদিকের কোণায়"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "উপরে ডানদিকের কোণায়"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "উল্লম্ব"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "সক্রিয় অবস্থায়"
+#~ msgid "Never"
+#~ msgstr "কখনো নয়"
+
#~ msgid "Show in Status Icon menu"
#~ msgstr "অবস্থাসীচক আইকনের মেনুর মধ্যে প্রদর্শন করা হবে"
diff --git a/po/ca.po b/po/ca.po
index fb06961..3329cd0 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: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2009-09-19 20:43+0200\n"
"Last-Translator: Patricia Rivera Escuder <patysya@gmail.com>\n"
"Language-Team: Catalan <fedora@softcatala.net>\n"
@@ -265,11 +265,11 @@ msgstr "Carrega els mètodes d'entrada a l'inici"
msgid "Prev engine shortcut keys"
msgstr "Tecla del mètode anterior"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr ""
@@ -278,14 +278,15 @@ msgstr ""
msgid "Show input method name"
msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "Mostra el nom del mètode d'entrada a la barra d'idioma"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"Comportament del quadre d'idiomes. 0 = Sempre ocult, 1 = Ocultar "
"automàticament, 2 = Sempre visible"
@@ -296,12 +297,12 @@ msgid ""
"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
msgstr ""
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr ""
"La drecera de teclat per canviar al següent mètode d'entrada de la llista"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
#, fuzzy
msgid "The shortcut keys for turning input method on or off"
msgstr ""
@@ -325,11 +326,11 @@ msgstr "Empra el tipus de lletra personalitzat per al quadre d'idiomes"
msgid "Use global input method"
msgstr "Selecciona un mètode d'entrada"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "Utilitza la disposició de teclat del sistema (XKB)"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "Utilitza la disposició de teclat del sistema"
@@ -452,69 +453,65 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "Apuja el mètode d'entrada seleccionat a la llista de mètodes activats"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr ""
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Següent mètode d'entrada:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "Anterior mètode d'entrada:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
"Suprimeix el mètode d'entrada seleccionat dels mètodes d'entrada activats"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "Ajusta com l'ibus mostra o amaga la barra d'idioma"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "Estableix l'orientació dels candidats a la taula de cerca"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "Mostra la informació del mètode d'entrada seleccionat"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "Mostra el nom del mètode a la barra d'idioma quan s'activi l'opció"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Mostra el quadre d'idiomes:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Inicia l'ibus en entrar"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr ""
"La drecera de teclat per canviar a l'anterior mètode d'entrada de la llista"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr ""
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr ""
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "Empra un tipus de lletra personalitzat"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr ""
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
#, fuzzy
msgid "When active"
msgstr ""
diff --git a/po/da.po b/po/da.po
index bb93cb2..256ade2 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: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2009-06-11 17:58+0200\n"
"Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -255,11 +255,11 @@ msgstr "Forindlæs motorer under opstarten af ibus"
msgid "Prev engine shortcut keys"
msgstr "Forrige tastaturgenvej til motor"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr ""
@@ -268,15 +268,16 @@ msgstr ""
msgid "Show input method name"
msgstr "Tilpasset skrifttypenavn til sprogpanel"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
#, fuzzy
msgid "Show input method name on language bar"
msgstr "Tilpasset skrifttypenavn til sprogpanel"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"Sprogpanelets opførsel. 0 = Skjul altid, 1 = Skjul automatisk, 2 = Vis altid"
@@ -286,13 +287,13 @@ msgid ""
"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
msgstr ""
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
#, fuzzy
msgid "The shortcut keys for switching to next input method in the list"
msgstr ""
"Næste tastaturgenvej til motor til skift af næste motor for inddatametode"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
#, fuzzy
msgid "The shortcut keys for turning input method on or off"
msgstr ""
@@ -316,11 +317,11 @@ msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
msgid "Use global input method"
msgstr "Vælg en inddatametode"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr ""
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr ""
@@ -443,71 +444,67 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr ""
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr ""
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Næste inddatametode:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "Forrige inddatametode:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr ""
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
#, fuzzy
msgid "Set the orientation of candidates in lookup table"
msgstr "Orientering af opslagstabel"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr ""
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
#, fuzzy
msgid "Show input method's name on language bar when check the checkbox"
msgstr "Tilpasset skrifttypenavn til sprogpanel"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Vis sprogpanel:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Start ibus ved logind"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
#, fuzzy
msgid "The shortcut keys for switching to previous input method in the list"
msgstr ""
"Forrige tastaturgenvej til motor til skift af forrige motor for inddatametode"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr ""
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr ""
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "Brug tilpasset skrifttype"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr ""
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
#, fuzzy
msgid "When active"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 96d32a0..2840de0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.master.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2009-12-10 09:44+1000\n"
"Last-Translator: Hedda Peters <hpeters@redhat.com>\n"
"Language-Team: \n"
@@ -248,11 +248,11 @@ msgstr "Engines vorladen, während IBus startet"
msgid "Prev engine shortcut keys"
msgstr "Vorherige Engine Tastenkombination"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "Symbol im Benachrichtigungsfeld anzeigen"
@@ -260,14 +260,15 @@ msgstr "Symbol im Benachrichtigungsfeld anzeigen"
msgid "Show input method name"
msgstr "Name der Eingabemethode anzeigen"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"Verhalten des Sprach-Panels: 0 = Immer verstecken, 1 = Automatisch "
"verstecken, 2 = Immer anzeigen"
@@ -280,12 +281,12 @@ msgstr ""
"Die Position des Sprach-Panels: 0 = Ecke oben links, 1 = Ecke oben rechts, 2 "
"= Ecke unten links, 3 = Ecke unten rechts, 4 = Benutzerdefiniert"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr ""
"Tastenkombination zum Wechseln zur nächsten Eingabemethode in der Liste"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "Tastenkombination zum An- oder Ausschalten der Eingabemethode"
@@ -306,11 +307,11 @@ msgstr "Benutzerdefinierte Schriftart für Sprach-Panel verwenden"
msgid "Use global input method"
msgstr "Eingabemethode wählen"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "System-Tastatur (XKB) Belegung verwenden"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "System-Tastaturbelegung verwenden"
@@ -434,75 +435,74 @@ msgstr ""
"nach oben"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "Nie"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Nächste Eingabemethode:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "Vorherige Eingabemethode:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
"Entfernen Sie die gewählte Eingabemethode aus den aktivierten Eingabemethoden"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr ""
"Verhalten von IBus einstellen, das Sprach-Panel anzuzeigen oder zu verstecken"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "Ausrichtung der Kandidaten in Lookup-Tabelle einstellen"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "Informationen zur gewählten Eingabemethode anzeigen"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr ""
"Name der gewählten Eingabemethode auf Sprach-Panel anzeigen, wenn "
"Auswahlkästchen aktiviert"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Zeige Sprach-Panel:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Starte IBus bei der Anmeldung"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr ""
"Tastenkombination zum Wechseln zur vorherigen Eingabemethode in der Liste"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "Ecke oben links"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "Ecke oben rechts"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "Benutzerdefinierte Schriftart verwenden"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "Vertikal"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "Wenn aktiv"
+#~ msgid "Never"
+#~ msgstr "Nie"
+
#, fuzzy
#~ msgid "Use global engine"
#~ msgstr "Engines vorladen"
diff --git a/po/es.po b/po/es.po
index 218754e..28dca84 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:44+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: Héctor Daniel Cabrera <logan@fedoraproject.org>\n"
"Language-Team: Fedora Spanish <trans-es@lists.fedoraproject.org>\n"
@@ -21,7 +21,8 @@ msgstr ""
msgid "IBus"
msgstr "IBus"
-#: ../bus/ibus.desktop.in.h:2 ../ui/gtk/panel.py:113
+#: ../bus/ibus.desktop.in.h:2
+#: ../ui/gtk/panel.py:113
msgid "IBus input method framework"
msgstr "Marco de trabajo para métodos de entrada IBus"
@@ -46,12 +47,8 @@ msgid "Next page"
msgstr "Siguiente página"
#: ../ui/gtk/main.py:57
-msgid ""
-"Some input methods have been installed, removed or updated. Please restart "
-"ibus input platform."
-msgstr ""
-"Algunos métodos de entrada han sido instalados, eliminados o actualizados. "
-"Por favor, reinicie la plataforma de entrada ibus."
+msgid "Some input methods have been installed, removed or updated. Please restart ibus input platform."
+msgstr "Algunos métodos de entrada han sido instalados, eliminados o actualizados. Por favor, reinicie la plataforma de entrada ibus."
#: ../ui/gtk/main.py:62
msgid "Restart Now"
@@ -89,8 +86,10 @@ msgstr "Acerca del método de entrada"
msgid "Switch input method"
msgstr "Cambiar método de entrada"
-#: ../ui/gtk/languagebar.py:358 ../ui/gtk/engineabout.py:35
-#: ../setup/engineabout.py:35 ../setup/setup.ui.h:16
+#: ../ui/gtk/languagebar.py:358
+#: ../ui/gtk/engineabout.py:35
+#: ../setup/engineabout.py:35
+#: ../setup/setup.ui.h:16
msgid "About"
msgstr "Acerca de"
@@ -98,22 +97,26 @@ msgstr "Acerca de"
msgid "About the Input Method"
msgstr "Acerca del Método de Entrada"
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
+#: ../ui/gtk/engineabout.py:63
+#: ../setup/engineabout.py:63
#, python-format
msgid "Language: %s\n"
msgstr "Idioma: %s\n"
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
+#: ../ui/gtk/engineabout.py:65
+#: ../setup/engineabout.py:65
#, python-format
msgid "Keyboard layout: %s\n"
msgstr "Diseño del teclado: %s\n"
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
+#: ../ui/gtk/engineabout.py:67
+#: ../setup/engineabout.py:67
#, python-format
msgid "Author: %s\n"
msgstr "Autor: %s\n"
-#: ../ui/gtk/engineabout.py:69 ../setup/engineabout.py:69
+#: ../ui/gtk/engineabout.py:69
+#: ../setup/engineabout.py:69
msgid "Description:\n"
msgstr "Descripción:\n"
@@ -135,14 +138,12 @@ msgstr "El demonio IBUS no fue iniciado. ¿Desea iniciarlo ahora?"
#: ../setup/main.py:283
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 ""
-"¡IBus ha sido iniciado! Si no puede usar IBus, por favor, agregue las "
-"siguientes líneas a $HOME/.bashrc, y reingrese a su escritorio.\n"
+"¡IBus ha sido iniciado! Si no puede usar IBus, por favor, agregue las siguientes líneas a $HOME/.bashrc, y reingrese a su escritorio.\n"
" export GTK_IM_MODULE=ibus\n"
" export XMODIFIERS=@im=ibus\n"
" export QT_IM_MODULE=ibus"
@@ -181,7 +182,8 @@ msgid "Select an input method"
msgstr "Seleccione un método de entrada"
#. create im name & icon column
-#: ../setup/enginetreeview.py:67 ../setup/setup.ui.h:31
+#: ../setup/enginetreeview.py:67
+#: ../setup/setup.ui.h:31
msgid "Input Method"
msgstr "Métodos de Entrada"
@@ -189,7 +191,8 @@ msgstr "Métodos de Entrada"
msgid "Kbd"
msgstr "Kbd"
-#: ../setup/ibus-setup.desktop.in.h:1 ../setup/setup.ui.h:30
+#: ../setup/ibus-setup.desktop.in.h:1
+#: ../setup/setup.ui.h:30
msgid "IBus Preferences"
msgstr "Preferencias de IBus"
@@ -241,11 +244,13 @@ msgstr "Precargar los motores durante el inicio de ibus"
msgid "Prev engine shortcut keys"
msgstr "Atajo de teclado para la máquina previa"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13
+#: ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14
+#: ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "Mostrar un ícono en el área de notificación"
@@ -253,33 +258,26 @@ msgstr "Mostrar un ícono en el área de notificación"
msgid "Show input method name"
msgstr "Mostrar el nombre del método de entrada"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16
+#: ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
#: ../data/ibus.schemas.in.h:17
-msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
-msgstr ""
-"El comportamiento del panel de idioma. 0 = Siempre oculto, 1 = Auto ocultar, "
-"2 = mostrar siempre"
+msgid "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = Always show"
+msgstr "El comportamiento del panel de idioma. 0 = Incrustado en el menú, 1 = Ocultarlo automáticamente, 2 = Mostrarlo siempre"
#: ../data/ibus.schemas.in.h:18
-msgid ""
-"The position of the language panel. 0 = Top left corner, 1 = Top right "
-"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
-msgstr ""
-"La posicion el panel de idioma. 0 = esquina superior izquierda, 1 = esquina "
-"superior derecha, 2 = esquina inferior izquierda, 3 = esquina inferior "
-"derecha, 4 = personalizado"
+msgid "The position of the language panel. 0 = Top left corner, 1 = Top right corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
+msgstr "La posicion el panel de idioma. 0 = esquina superior izquierda, 1 = esquina superior derecha, 2 = esquina inferior izquierda, 3 = esquina inferior derecha, 4 = personalizado"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19
+#: ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
-msgstr ""
-"Tecla programada para cambiar al siguiente método de entrada en la lista"
+msgstr "Tecla programada para cambiar al siguiente método de entrada en la lista"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20
+#: ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "Atajo de teclado para encender o apagar el método de entrada"
@@ -299,11 +297,13 @@ msgstr "Usar nombre de fuente personalizada para el panel de idioma"
msgid "Use global input method"
msgstr "Utilizar método de entrada global"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "Usar el diseño del teclado del sistema (XKB)"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "Usar el diseño del teclado del sistema"
@@ -357,9 +357,7 @@ msgstr ""
#: ../setup/setup.ui.h:17
msgid "Add the selected input method into the enabled input methods"
-msgstr ""
-"Agregar el método de entrada seleccionado a los métodos de entrada "
-"habilitados"
+msgstr "Agregar el método de entrada seleccionado a los métodos de entrada habilitados"
#: ../setup/setup.ui.h:18
msgid "Advanced"
@@ -391,9 +389,7 @@ msgstr "Insertar texto previamente editado en la ventana de la aplicación"
#: ../setup/setup.ui.h:25
msgid "Embed the preedit text of input method in the application window"
-msgstr ""
-"Insertar el texto previamente editado del método de entrada en la ventana de "
-"la aplicación"
+msgstr "Insertar el texto previamente editado del método de entrada en la ventana de la aplicación"
#: ../setup/setup.ui.h:26
msgid "Embedded in menu"
@@ -417,88 +413,74 @@ msgstr "Posición del panel de idioma:"
#: ../setup/setup.ui.h:33
msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Mover abajo el método de entrada seleccionado en los métodos de entrada "
-"habilitados"
+msgstr "Mover abajo el método de entrada seleccionado en los métodos de entrada habilitados"
#: ../setup/setup.ui.h:34
msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"Mover arriba el método de entrada seleccionado en la lista de métodos de "
-"entrada habilitados"
+msgstr "Mover arriba el método de entrada seleccionado en la lista de métodos de entrada habilitados"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "Nunca"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Siguiente método de entrada:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "Método de entrada anterior:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Eliminar el método de entrada seleccionado de los métodos de entrada "
-"habilitados"
+msgstr "Eliminar el método de entrada seleccionado de los métodos de entrada habilitados"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
-msgstr ""
-"Configurar el comportamiento de ibus sobre cómo mostrar u ocultar la barra "
-"de idiomas"
+msgstr "Configurar el comportamiento de ibus sobre cómo mostrar u ocultar la barra de idiomas"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "Poner la orientación de la tabla de búsqueda de candidatos"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "Mostrar información sobre el método de entrada seleccionado"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"Mostrar el nombre del método de entrada en la barra de idioma cuando se "
-"marque la casilla"
+msgstr "Mostrar el nombre del método de entrada en la barra de idioma cuando se marque la casilla"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Mostrar el panel de idioma:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Iniciar ibus al ingresar"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"Tecla programada para cambiar al método de entrada anterior en la lista"
+msgstr "Tecla programada para cambiar al método de entrada anterior en la lista"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "Esquina superior izquierda"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "Esquina superior derecha"
-#: ../setup/setup.ui.h:53
-#, fuzzy
+#: ../setup/setup.ui.h:52
msgid "Use custom font:"
-msgstr "Usar fuente personalizada"
+msgstr "Usar fuente personalizada:"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "Vertical"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "Cuando esté activo"
+#~ msgid "Never"
+#~ msgstr "Nunca"
#~ msgid "Show in Status Icon menu"
#~ msgstr "Mostrar en el menú de íconos de estado"
@@ -509,24 +491,18 @@ msgstr "Cuando esté activo"
#, fuzzy
#~ msgid "Langauge panel position"
#~ msgstr "Mostrar el panel de idioma:"
-
#~ msgid "Custom font:"
#~ msgstr "Fuente personalizada:"
-
#~ msgid "Font for language bar and candidates"
#~ msgstr "Fuente para la barra de idioma y candidatos"
-
#~ msgid "Use custom font for language bar and candidates"
#~ msgstr "Usar fuente personalizada para la barra de idiomas y candidatos"
-
#~ msgid "Custom Font"
#~ msgstr "Fuente Personalizada"
-
#~ msgid "Show IM Name"
#~ msgstr "Mostrar Nombre de ME"
-
#~ msgid "Show IM name on language bar"
#~ msgstr "Mostrar nombre de ME en la barra de idioma"
-
#~ msgid "Use Custom Font"
#~ msgstr "Usar Fuente Personalizada"
+
diff --git a/po/fr.po b/po/fr.po
index ded728b..5e81a5c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
-"PO-Revision-Date: 2010-01-30 18:22+0100\n"
-"Last-Translator: Julien <julroy67@gmail.com>\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
+"PO-Revision-Date: 2010-04-26 13:25+0200\n"
+"Last-Translator: \n"
"Language-Team: French <kde-i18n-doc@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -87,9 +87,8 @@ msgid "translator-credits"
msgstr "HUMBERT Julien <julroy67@gmail.com>"
#: ../ui/gtk/languagebar.py:107
-#, fuzzy
msgid "About the input method"
-msgstr "À propos de la Méthode d'Entrée"
+msgstr "À propos de la méthode d'entrée"
#: ../ui/gtk/languagebar.py:215
msgid "Switch input method"
@@ -214,11 +213,11 @@ msgstr "Police personnalisée pour le panneau de langue"
#: ../data/ibus.schemas.in.h:4
msgid "Embed Preedit Text"
-msgstr ""
+msgstr "Insérer le Texte en cours d'Édition"
#: ../data/ibus.schemas.in.h:5
msgid "Embed Preedit Text in Application Window"
-msgstr ""
+msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
#: ../data/ibus.schemas.in.h:6
msgid "Language panel position"
@@ -233,28 +232,26 @@ msgid "Orientation of lookup table"
msgstr "Orientation de la table"
#: ../data/ibus.schemas.in.h:9
-#, fuzzy
msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
-msgstr "Orientation de la table. 0 = Horizontale, 1 = Verticale"
+msgstr "Orientation de la liste des candidats. 0 = Horizontale, 1 = Verticale"
#: ../data/ibus.schemas.in.h:10
msgid "Preload engines"
msgstr "Précharger les moteurs"
#: ../data/ibus.schemas.in.h:11
-#, fuzzy
msgid "Preload engines during ibus starts up"
-msgstr "Précharger les moteurs lors du démarrage d'iBus"
+msgstr "Précharger les moteurs au démarrage d'ibus"
#: ../data/ibus.schemas.in.h:12
msgid "Prev engine shortcut keys"
msgstr "Raccourci clavier pour revenir au moteur précédent"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "Partager la même méthode d'entrée pour toutes les applications"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "Afficher l'icône dans la boîte à miniatures"
@@ -262,17 +259,17 @@ msgstr "Afficher l'icône dans la boîte à miniatures"
msgid "Show input method name"
msgstr "Afficher le nom de la méthode d'entrée"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "Afficher le nom de la méthode d'entrée sur la barre de langue"
#: ../data/ibus.schemas.in.h:17
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
-"Préférence d'affichage du panneau de langue. 0 = Toujours cacher, 1 = Cacher "
-"automatiquement, 2 = Toujours afficher"
+"Sélection du comportement d'affichage de la liste des candidats. 0 = Insérée "
+"dans le menu, 1 = Cacher automatiquement, 2 = Toujours afficher"
#: ../data/ibus.schemas.in.h:18
msgid ""
@@ -282,11 +279,11 @@ msgstr ""
"Position de la barre de langue. 0 = En haut à gauche, 1 = En haut à droite, "
"2 = En bas à gauche, 3 = En bas à droite, 4 = Personnalisé"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "Raccourci clavier pour passer à la méthode d'entrée suivante"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr ""
"Sélection des raccourcis claviers pour activer ou désactiver les méthodes "
@@ -308,11 +305,11 @@ msgstr "Utiliser une police personnalisée pour la barre de langue"
msgid "Use global input method"
msgstr "Utiliser une méthode d'éntrée globale"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "Utiliser la disposition clavier système (XKB)"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "Utiliser la disposition clavier système"
@@ -394,16 +391,17 @@ msgstr "Personnalisée"
#: ../setup/setup.ui.h:24
msgid "Embed preedit text in application window"
-msgstr ""
+msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
#: ../setup/setup.ui.h:25
-#, fuzzy
msgid "Embed the preedit text of input method in the application window"
-msgstr "Partager la même méthode d'entrée pour toutes les applications"
+msgstr ""
+"Insérer le texte en cours d'édition par la méthode d'entrée dans la fenêtre "
+"de l'application"
#: ../setup/setup.ui.h:26
msgid "Embedded in menu"
-msgstr ""
+msgstr "Insérée dans le menu"
#: ../setup/setup.ui.h:27
msgid "Enable or disable:"
@@ -434,73 +432,71 @@ msgstr ""
"méthodes d'entrée actives"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "Ne jamais afficher"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Méthode d'entrée suivante :"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "Méthode d'entrée précédente :"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
"Supprimer la méthode d'entrée selectionnée des méthodes d'entrées actives"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "Sélection du comportent d'affichage de la barre de langue d'Ibus"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "Permet de choisir l'orientation de la liste des candidats"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "Afficher les informations de la méthode d'entrée selectionnée"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr ""
"Afficher le nom de la méthode d'entrée sur la barre de langue lorsque la "
"case est cochée"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Afficher la barre de langue :"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Démarrer IBus lors de la connexion"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "Raccourci clavier pour revenir à la méthode d'entrée précédente"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "Coin en haut à gauche"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "Coin en haut à droite"
-#: ../setup/setup.ui.h:53
-#, fuzzy
+#: ../setup/setup.ui.h:52
msgid "Use custom font:"
msgstr "Utiliser une police personnalisée :"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "Verticale"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "Uniquement lorsque active"
+#~ msgid "Never"
+#~ msgstr "Ne jamais afficher"
+
#~ msgid "Show in Status Icon menu"
#~ msgstr "Afficher l'icône de statut dans le menu"
diff --git a/po/gu.po b/po/gu.po
index 4935b88..f243f4d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2010-03-23 12:09+0530\n"
"Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
"Language-Team: Gujarati\n"
@@ -244,11 +244,11 @@ msgstr "ibus ની શરૂ કરવા દરમ્યાન એંજિન
msgid "Prev engine shortcut keys"
msgstr "પહેલાંની એંજિન ટૂંકાણ કીઓ"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "બધા કાર્યક્રમોમાં એજ ઇનપુટ પદ્દતિને વહેંચો"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "સિસ્ટમ ટ્રે પર ચિહ્નને બતાવો"
@@ -256,14 +256,15 @@ msgstr "સિસ્ટમ ટ્રે પર ચિહ્નને બતા
msgid "Show input method name"
msgstr "ઇનપુટ પદ્દતિ નામને બતાવો"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "ભાષા પેનલ પર ઇનપુટ પદ્દતિ નામને બતાવો"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr "ભાષા પેનલની વર્ણતૂક. 0 = હંમેશા છુપાડો, 1 = આપમેળે છુપાડો, 2 = હંમેશા બતાવો"
#: ../data/ibus.schemas.in.h:18
@@ -274,11 +275,11 @@ msgstr ""
"ભાષા પેનલનું સ્થાન. ૦ = ઉંચે ડાબી બાજુનો ખૂણો, ૧ = ઉંચે જમણી બાજુનો ખૂણો, ૨ = નીચે ડાબી "
"બાજુનો ખૂણો, ૩ = નીચે જમણી બાજુનો ખૂણો, ૪ = વૈવિધ્ય"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "યાદીમાં પછીની ઇનપુટ પદ્દતિને ખસેડવા માટે ટૂંકાણ કીઓ"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "ઇનપુટ પદ્દતિને ફેરબદલી કરવાનું ચાલુ અથવા ા બંધ કરવા માટે ટૂંકાણ કીઓ"
@@ -298,11 +299,11 @@ msgstr "ભાષા પેનલ માટે વૈવિધેય ફોન
msgid "Use global input method"
msgstr "વૈશ્ર્વિક ઇનપુટ પદ્દતિને વાપરો"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "સિસ્ટમ કિબોર્ડ (XKB) લેઆઉટને વાપરો"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "સિસ્ટમ કિબોર્ડ લેઆઉટને વાપરો"
@@ -419,69 +420,68 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "સક્રિય થયેલ ઇનપુટ પદ્દતિઓ યાદીમાં પસંદ થયેલ ઇનપુટ પદ્દતિને ઉપર ખસેડો"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "કદી નહિં"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "પછીની ઇનપુટ પદ્દતિ:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "પહેલાંની ઇનપુટ પદ્દતિ:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "સક્રિય થયેલ ઇનપુટ પદ્દતિઓ માંથી પસંદ થયેલ ઇનપુટ પદ્દતિને દૂર કરો"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "ભાષા પેનલને કેવી રીતે બતાવવી અથવા છુપાડવી તે માટે ibus નાં વર્ણતૂકને સુયોજિત કરો"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "કોષ્ટક જોવામાં સભ્યોની દિશાને સુયોજિત કરો"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "પસંદ થયેલ ઇનપુટ પદ્દતિની જાણકારીને બતાવો"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "જ્યારે ચેકબોક્સને ચકાસતા હોય ત્યારે ભાષા પેનલ પર ઇનપુટ પદ્દતિનાં નામને બતાવો"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "ભાષા પેનલને બતાવો:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "પ્રવેશ પર ibus ને શરૂ કરો"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "યાદીમાં પહેલાંની ઇનપુટ પદ્દતિને ખસેડવા માટે ટૂંકાણ કીઓ"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "ઉંચે ડાબી બાજુનો ખૂણો"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "ઉંચે જમણી બાજુનો ખૂણો"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "વૈવિધ્ય ફોન્ટને વાપરો"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "ઊભું"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "જ્યારે સક્રિય હોય"
+#~ msgid "Never"
+#~ msgstr "કદી નહિં"
+
#~ msgid "Show in Status Icon menu"
#~ msgstr "પરિસ્થિતિ ચિહ્ન મેનુમાં બતાવો"
diff --git a/po/hi.po b/po/hi.po
index 48f4d9e..592aeb4 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2009-12-08 13:27+0530\n"
"Last-Translator: Rajesh Ranjan <rajesh672@gmail.com>\n"
"Language-Team: Hindi <hindi.sf.net>\n"
@@ -250,11 +250,11 @@ msgstr "ibus आरंभन के दौरान पहले से लो
msgid "Prev engine shortcut keys"
msgstr "पिछला इंजन शॉर्टकट कुंजी"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "तंत्र तश्तरी पर प्रतीक दिखाएँ"
@@ -262,14 +262,15 @@ msgstr "तंत्र तश्तरी पर प्रतीक दिख
msgid "Show input method name"
msgstr "इनपुट विधि नाम दिखाएँ"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "भाषा पट्टी पर इनपुट विधि नाम दिखाएँ"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr "भाषा पटल का आचरण. 0 = हमेशा छुपाएँ, 1 = स्वतः छुपाएँ, 2 = हमेशा दिखाएँ"
#: ../data/ibus.schemas.in.h:18
@@ -280,11 +281,11 @@ msgstr ""
"भाषा पटल की स्थिति. 0 = ऊपरी बायाँ कोना, 1 = ऊपरी दाहिना कोना, 2 = निचला बायां "
"कोना, 3 = निचला दाहिना कोना, 4 = पसंदीदा"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "सूची में अगली इनपुट विधि में जाने के लिए शॉर्टकट कुंजी"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "इनपुट विधि को चालू या बंद रखने के लिए शॉर्टकट कुंजी"
@@ -305,11 +306,11 @@ msgstr "भाषा पटल के लिए मनपसंद फ़ॉन
msgid "Use global input method"
msgstr "कोई इनपुट विधि चुनें"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "तंत्र कुंजीपट (XKB) लेआउट का प्रयोग करें"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "तंत्र कुंजीपट लेआउट का प्रयोग करें"
@@ -426,70 +427,69 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "सक्रिय की गई इनपुट विधि सूची में चुनी गई इनपुट विधियों को ले जाएँ"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "कभी नहीं"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "अगली इनपुट विधि :"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "पिछली इनपुट विधि:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "सक्रिय की गई इनपुट विधियों में चुनी गई इनपुट विधियों हटाएँ"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "ibus का आचरण सेट करें कि कैसे भाषा पट्टी को दिखाना या छिपाना है"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "लुकअप सारणी में कंडीडेट की दिशा सेट करें"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "चुनी गई इनपुट विधि की सूचना दिखाएँ"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "भाषा पट्टी पर इनपुट विधि नाम दिखाएँ जब जाँचपेटी जाँचा गया है"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "भाषा पैनल दिखाएँ:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "लॉगिन पर ibus आरंभ करें"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "सूची में पिछली इनपुट विधि में जाने के लिए शॉर्टकट कुंजी"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "ऊपरी बायां कोना"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "ऊपरी दाहिना कोना"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "मनपसंद फ़ॉन्ट का प्रयोग करें"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "लंबवत"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "जब सक्रिय हो"
+#~ msgid "Never"
+#~ msgstr "कभी नहीं"
+
#, fuzzy
#~ msgid "Use global engine"
#~ msgstr "पहले से लोड इंजन"
diff --git a/po/hu.po b/po/hu.po
index 46b5c88..acc1ab9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: IBus master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+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"
@@ -251,11 +251,11 @@ msgstr "Eljárások előre betöltése ibus indulásakor"
msgid "Prev engine shortcut keys"
msgstr "Előző eljárás gyorsbillentyű"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr ""
@@ -264,15 +264,16 @@ msgstr ""
msgid "Show input method name"
msgstr "Saját betű neve a nyelv panelen"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
#, fuzzy
msgid "Show input method name on language bar"
msgstr "Saját betű neve a nyelv panelen"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"A nyelv panel viselkedése. 0 = mindig rejtve, 1 = rejtőzködő, 2 = mindig "
"látható"
@@ -283,13 +284,13 @@ msgid ""
"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
msgstr ""
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
#, fuzzy
msgid "The shortcut keys for switching to next input method in the list"
msgstr ""
"A következő eljárás gyorsbillentyű a következő bevitel eljárásra kapcsol"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
#, fuzzy
msgid "The shortcut keys for turning input method on or off"
msgstr "Az előző eljárás gyorsbillentyű az előző bevitel eljárásra kapcsol"
@@ -312,11 +313,11 @@ msgstr "Saját betű használata a nyelv panelen"
msgid "Use global input method"
msgstr "Bevitel eljárás kiválasztása"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr ""
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr ""
@@ -437,70 +438,66 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr ""
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr ""
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Következő bevitel eljárás:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "Előző bevitel eljárás:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr ""
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
#, fuzzy
msgid "Set the orientation of candidates in lookup table"
msgstr "Kereső táblázat iránya"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr ""
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
#, fuzzy
msgid "Show input method's name on language bar when check the checkbox"
msgstr "Saját betű neve a nyelv panelen"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Nyelv panel mutatása:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Belépve ibus indítása"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
#, fuzzy
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "Az előző eljárás gyorsbillentyű az előző bevitel eljárásra kapcsol"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr ""
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr ""
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "Saját betű használata"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr ""
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
#, fuzzy
msgid "When active"
msgstr ""
diff --git a/po/it.po b/po/it.po
index fe23d03..089868e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2009-12-10 09:28+1000\n"
"Last-Translator: \n"
"Language-Team: <it@li.org>\n"
@@ -249,11 +249,11 @@ msgstr "Pre-carica i motori durante l'avvio di IBus"
msgid "Prev engine shortcut keys"
msgstr "Motore dei tasti di scelta rapida precedente"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "Mostrare l'icona nell'area di notifica"
@@ -261,14 +261,15 @@ msgstr "Mostrare l'icona nell'area di notifica"
msgid "Show input method name"
msgstr "Mostra il nome del metodo di input"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "Mostrare il nome del metodo di input nella barra della lingua"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"Il comportamento del pannello della lingua. 0 = Nasconde sempre, 1 = "
"Nasconde automaticamente, 2 = Mostra sempre"
@@ -282,12 +283,12 @@ msgstr ""
"Angolo in alto a destra, 2 = Angolo in basso a sinistra, 3 = Angolo in basso "
"a destra, 4 = Personalizzata"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr ""
"I tasti scorciatoia per passare al metodo di input successivo nell'elenco"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "I tasti scorciatoia per abilitare o disabilitare i metodi di input"
@@ -308,11 +309,11 @@ msgstr "Usa un tipo di carattere personalizzato per il pannello della lingua"
msgid "Use global input method"
msgstr "Seleziona un metodo di input"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "Usa la disposizione di tastiera del sistema (XKB)"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "Usa la disposizione di tastiera del sistema"
@@ -429,75 +430,74 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "Sposta in alto il metodo selezionato nei metodi di input abilitati"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "Mai"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Metodo di input successivo:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "Metodo di input precedente:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "Rimuove il metodo selezionato dai metodi di input abilitati"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr ""
"Imposta il comportamento di IBus su come mostrare o nascondere la barra "
"della lingua"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "Imposta l'orientamento dei candidati nella tabella di ricerca"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "Mostra le informazioni sul metodo di input selezionato"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr ""
"Quando la casella è spuntata mostra il nome del metodo di input nella barra "
"della lingua"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Mostrare pannello della lingua:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Avvia IBus all'accesso"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr ""
"I tasti scorciatoia per passare al metodo di input precedente nell'elenco"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "Angolo superiore sinistro"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "Angolo superiore destro"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "Usare carattere personalizzato"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "Verticale"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "Quando attivoB"
+#~ msgid "Never"
+#~ msgstr "Mai"
+
#, fuzzy
#~ msgid "Use global engine"
#~ msgstr "Pre-carica i motori"
diff --git a/po/ja.po b/po/ja.po
index 1e00cc9..d6ffaa9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2009-09-08 17:31+0900\n"
"Last-Translator: Hyu_gabaru Ryu_ichi <hyu_gabaru@yahoo.co.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -245,11 +245,11 @@ msgstr "ibus の開始中にエンジンをプリロード"
msgid "Prev engine shortcut keys"
msgstr "前のエンジンへのショートカットキー"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "すべてのアプリケーション間で同じインプットメソッドを共有する"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "システムトレイにアイコンを表示する"
@@ -257,14 +257,15 @@ msgstr "システムトレイにアイコンを表示する"
msgid "Show input method name"
msgstr "インプットメソッド名を表示する"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "言語バーにインプットメソッド名を表示する"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr "言語パネルの動作。0 = 常に隠す、1 = 自動的に隠す、2 = 常に表示"
#: ../data/ibus.schemas.in.h:18
@@ -275,11 +276,11 @@ msgstr ""
"言語パネルの位置。0 = 左上隅、1 = 右上隅、2 = 左下隅、3 = 右下隅、4 = カスタ"
"ム"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "リストの中で次のインプットメソッドに切り替えるためのショートカットキー"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "インプットメソッドをオン、オフするためのショートカットキーを設定します"
@@ -299,11 +300,11 @@ msgstr "言語パネル用にカスタムフォント名を使用する"
msgid "Use global input method"
msgstr "グローバルインプットメソッドを使用する"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "システムキーボード (XKB) レイアウトを使用する"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "システムキーボードレイアウトを使用する"
@@ -394,9 +395,8 @@ msgstr ""
"込みます"
#: ../setup/setup.ui.h:26
-#, fuzzy
msgid "Embedded in menu"
-msgstr "ステータスアイコンのメニューに表示する"
+msgstr "メニューに組み込む"
#: ../setup/setup.ui.h:27
msgid "Enable or disable:"
@@ -425,73 +425,71 @@ msgstr ""
"選択したインプットメソッドを有効なインプットメソッドの中で上へ移動します"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "表示しない"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "次のインプットメソッド:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "ひとつ前のインプットメソッド:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "選択したインプットメソッドを有効なインプットメソッドから削除します"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "言語バーをどのように表示するもしくは隠すかの ibus の動作を設定します"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "ルックアップテーブルの中で候補ウィンドウの向きを設定します"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "選択したインプットメソッドの情報を表示します"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr ""
"チェックボックスをチェックしたときに言語バー上でインプットメソッドの名前を表"
"示します"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "言語パネルの表示:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "ログイン時に IBus を起動"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr ""
"リストの中でひとつ前のインプットメソッドに切り替えるためのショートカットキー"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "左上隅"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "右上隅"
-#: ../setup/setup.ui.h:53
-#, fuzzy
+#: ../setup/setup.ui.h:52
msgid "Use custom font:"
-msgstr "カスタムフォントを使う"
+msgstr "カスタムフォントを使う:"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "縦"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "アクティブであるとき"
+#~ msgid "Never"
+#~ msgstr "表示しない"
+
#, fuzzy
#~ msgid "Langauge panel position"
#~ msgstr "言語パネルの表示:"
diff --git a/po/kn.po b/po/kn.po
index a4e70b4..674c1f7 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -2,15 +2,15 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
-# Shankar Prasad <svenkate@redhat.com>, 2009.
+# Shankar Prasad <svenkate@redhat.com>, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: ibus.master.kn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
-"PO-Revision-Date: 2009-12-08 11:27+0530\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
+"PO-Revision-Date: 2010-04-23 15:15+0530\n"
"Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
-"Language-Team: Kannada <kde-l10n-kn@kde.org>\n"
+"Language-Team: kn-IN <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -39,7 +39,7 @@ msgstr "ಇತರೆ"
#: ../ui/gtk/candidatepanel.py:267
msgid "Previous page"
-msgstr "ಹಿಂದಿನ ಪುಟ:"
+msgstr "ಹಿಂದಿನ ಪುಟ"
#: ../ui/gtk/candidatepanel.py:272
msgid "Next page"
@@ -50,16 +50,16 @@ msgid ""
"Some input methods have been installed, removed or updated. Please restart "
"ibus input platform."
msgstr ""
+"ಕೆಲವು ಇನ್ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿದೆ, ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಅಥವ ಅಪ್ಡೇಟ್ ಮಾಡಲಾಗಿದೆ. "
+"ದಯವಿಟ್ಟು ನಿಮ್ಮ ibus ಇನ್ಪುಟ್ ಪ್ಲಾಟ್ಫಾರ್ಮ್ ಅನ್ನು ಮರಳಿ ಆರಂಭಿಸಿ."
#: ../ui/gtk/main.py:62
-#, fuzzy
msgid "Restart Now"
-msgstr "ಪುನರಾರಂಭಿಸು"
+msgstr "ಮರಳಿ ಆರಂಭಿಸು"
#: ../ui/gtk/main.py:63
-#, fuzzy
msgid "Later"
-msgstr "ಇತರೆ"
+msgstr "ನಂತರ"
#: ../ui/gtk/panel.py:331
msgid "Restart"
@@ -82,7 +82,6 @@ msgid "translator-credits"
msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
#: ../ui/gtk/languagebar.py:107
-#, fuzzy
msgid "About the input method"
msgstr "ಇನ್ಪುಟ್ ವಿಧಾನದ ಬಗೆಗೆ"
@@ -196,7 +195,7 @@ msgstr "IBus ಆದ್ಯತೆಗಳು"
#: ../data/ibus.schemas.in.h:1
msgid "Auto hide"
-msgstr "ಸ್ವಯಂ ಅಡಗಿಸು"
+msgstr "ಸ್ವಯಂ ಅಡಗಿಸುವಿಕೆ"
#: ../data/ibus.schemas.in.h:2
msgid "Custom font"
@@ -208,15 +207,15 @@ msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿನ ಇಚ್ಛೆಯ ಅಕ
#: ../data/ibus.schemas.in.h:4
msgid "Embed Preedit Text"
-msgstr ""
+msgstr "Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
#: ../data/ibus.schemas.in.h:5
msgid "Embed Preedit Text in Application Window"
-msgstr ""
+msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
#: ../data/ibus.schemas.in.h:6
msgid "Language panel position"
-msgstr "ಭಾಷೆಯ ಫಲಕದ ಸ್ಥಳ"
+msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು"
#: ../data/ibus.schemas.in.h:7
msgid "Next engine shortcut keys"
@@ -227,16 +226,14 @@ msgid "Orientation of lookup table"
msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್ಅಪ್) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ"
#: ../data/ibus.schemas.in.h:9
-#, fuzzy
msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್ಅಪ್) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ. 0 = ಅಡ್ಡಲಾಗಿ, 1 = ಲಂಬವಾಗಿ"
#: ../data/ibus.schemas.in.h:10
msgid "Preload engines"
-msgstr "ಮೊದಲೆ ಲೋಡ್ ಮಾಡಲಾದ ಎಂಜಿನ್ಗಳು"
+msgstr "ಎಂಜಿನ್ಗಳನ್ನು ಮೊದಲೆ ಲೋಡ್ ಮಾಡು"
#: ../data/ibus.schemas.in.h:11
-#, fuzzy
msgid "Preload engines during ibus starts up"
msgstr "ibus ಆರಂಭಗೊಂಡಾಗ ಲೋಡ್ ಮಾಡಲಾದ ಎಂಜಿನ್ಗಳು"
@@ -244,26 +241,27 @@ msgstr "ibus ಆರಂಭಗೊಂಡಾಗ ಲೋಡ್ ಮಾಡಲಾದ ಎ
msgid "Prev engine shortcut keys"
msgstr "ಹಿಂದಿನ ಎಂಜಿನ್ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
-msgstr ""
+msgstr "ಒಂದೇ ಇನ್ಪುಟ್ ವಿಧಾನವನ್ನು ಎಲ್ಲಾ ಅನ್ವಯಗಳಲ್ಲೂ ಬಳಸು"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
-msgstr "ಚಿಹ್ನೆಯನ್ನು ವ್ಯವಸ್ಥೆಯ ಟ್ರೇಯಲ್ಲಿ ತೋರಿಸು"
+msgstr "ವ್ಯವಸ್ಥೆಯ ಟ್ರೇಯಲ್ಲಿ ಚಿಹ್ನೆಯನ್ನು ತೋರಿಸು"
#: ../data/ibus.schemas.in.h:15
msgid "Show input method name"
msgstr "ಇನ್ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "ಭಾಷೆಯ ಫಲಕದಲ್ಲಿನ ಇನ್ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"ಭಾಷೆಯ ಫಲಕದ ವರ್ತನೆ. 0 = ಯಾವಾಗಲೂ ಅಡಗಿಸು, 1 = ಸ್ವಯಂ ಅಡಗಿಸು, 2 = ಯಾವಾಗಲೂ ತೋರಿಸು"
@@ -272,14 +270,14 @@ msgid ""
"The position of the language panel. 0 = Top left corner, 1 = Top right "
"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
msgstr ""
-"ಭಾಷೆ ಫಲಕವು ಇರುವ ಸ್ಥಳ. 0 = ಮೇಲ್ಭಾಗದ ಎಡ ಮೂಲೆ, 1 = ಮೇಲ್ಭಾಗದ ಬಲ ಮೂಲೆ, 2 = ಕೆಳಗಿನ ಎಡ "
+"ಭಾಷೆಯ ಫಲಕವು ಇರುವ ಸ್ಥಳ. 0 = ಮೇಲಿನ ಎಡ ಮೂಲೆ, 1 = ಮೇಲಿನ ಬಲ ಮೂಲೆ, 2 = ಕೆಳಗಿನ ಎಡ "
"ಮೂಲೆ, 3 = ಕೆಳಗಿನ ಬಲ ಮೂಲೆ, 4 = ಇಚ್ಛೆಯ"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಮುಂದಿನ ಇನ್ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "ಇನ್ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಆಫ್ ಹಾಗು ಆನ್ ಮಾಡಲು ಶಾರ್ಟ್-ಕೀಲಿಗಳು"
@@ -296,15 +294,14 @@ msgid "Use custom font name for language panel"
msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
#: ../data/ibus.schemas.in.h:24
-#, fuzzy
msgid "Use global input method"
-msgstr "ಒಂದು ಇನ್ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+msgstr "ಜಾಗತಿಕ ಇನ್ಪುಟ್ ವಿಧಾನವನ್ನು ಬಳಸಿ"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
@@ -318,7 +315,7 @@ msgstr "<b>ಅಕ್ಷರಶೈಲಿ ಹಾಗು ವಿನ್ಯಾಸ</b>"
#: ../setup/setup.ui.h:3
msgid "<b>Global input methood settings</b>"
-msgstr ""
+msgstr "<b>ಜಾಗತಿಕ ಇನ್ಪುಟ್ ವಿಧಾನದ ಸಿದ್ಧತೆಗಳು</b>"
#: ../setup/setup.ui.h:4
msgid "<b>Keyboard Layout</b>"
@@ -370,15 +367,15 @@ msgstr "ಯಾವಾಗಲೂ"
#: ../setup/setup.ui.h:20
msgid "Bottom left corner"
-msgstr "ಕೆಳಗಿನ ಎಡ ಮೂಲೆ"
+msgstr "ಕೆಳಗಿನ ಎಡ ಮೂಲ"
#: ../setup/setup.ui.h:21
msgid "Bottom right corner"
-msgstr "ಕೆಳಗಿನ ಬಲ ಮೂಲೆ"
+msgstr "ಕೆಳಗಿನ ಬಲ ಮೂಲ"
#: ../setup/setup.ui.h:22
msgid "Candidates orientation:"
-msgstr "ಅಬ್ಯರ್ಥಿಗಳ ಹೊಂದಿಕೆ:"
+msgstr "ಅಭ್ಯರ್ಥಿಗಳ ಹೊಂದಿಕೆ:"
#: ../setup/setup.ui.h:23
msgid "Custom"
@@ -386,15 +383,15 @@ msgstr "ಇಚ್ಛೆಯ"
#: ../setup/setup.ui.h:24
msgid "Embed preedit text in application window"
-msgstr ""
+msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
#: ../setup/setup.ui.h:25
msgid "Embed the preedit text of input method in the application window"
-msgstr ""
+msgstr "ಅನ್ವಯ ವಿಂಡೊದಲ್ಲಿ ಇನ್ಪುಟ್ ವಿಧಾನದ Preedit ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸಿ"
#: ../setup/setup.ui.h:26
msgid "Embedded in menu"
-msgstr ""
+msgstr "ಮೆನುವನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾದ"
#: ../setup/setup.ui.h:27
msgid "Enable or disable:"
@@ -406,7 +403,7 @@ msgstr "ಸಾಮಾನ್ಯ"
#: ../setup/setup.ui.h:29
msgid "Horizontal"
-msgstr "ಅಡ್ಡವಾದ"
+msgstr "ಲಂಬ"
#: ../setup/setup.ui.h:32
msgid "Language panel position:"
@@ -423,75 +420,69 @@ msgstr ""
"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್ಪುಟ್ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಮೇಲಕ್ಕೆ ಜರುಗಿಸಿ"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "ಎಂದಿಗೂ ಬೇಡ"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "ಮುಂದಿನ ಇನ್ಪುಟ್ ವಿಧಾನ:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "ಹಿಂದಿನ ಇನ್ಪುಟ್ ವಿಧಾನ:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್ಪುಟ್ ವಿಧಾನವನ್ನು ಶಕ್ತಗೊಂಡಿರುವ ಇನ್ಪುಟ್ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದು ಹಾಕಿ"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr ""
"ಭಾಷಾ ಪಟ್ಟಿಕೆಯನ್ನು ಹೇಗೆ ತೋರಿಸಬೇಕು ಅಥವ ಅಡಗಿಸಬೇಕು ಎನ್ನುವ ibus ನ ವರ್ತನೆಯನ್ನು ಹೊಂದಿಸಿ"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್ಅಪ್) ಕೋಷ್ಟಕದ ವಾಲಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್ಪುಟ್ ವಿಧಾನದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "ಗುರುತುಚೌಕದಲ್ಲಿ ಗುರುತು ಹಾಕಿದಾಗ ಭಾಷಾ ಪಟ್ಟಿಯಲ್ಲಿ ಇನ್ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "ಪ್ರವೇಶಿಸಿದಾಗ ibus ಅನ್ನು ಆರಂಭಿಸು"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಹಿಂದಿನ ಇನ್ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
-msgstr "ಮೇಲ್ಭಾಗದ ಎಡ ಮೂಲೆ"
+msgstr "ಮೇಲಿನ ಎಡ ಮೂಲೆ"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
-msgstr "ಮೇಲ್ಭಾಗದ ಬಲ ಮೂಲೆ"
+msgstr "ಮೇಲಿನ ಬಲ ಮೂಲೆ"
-#: ../setup/setup.ui.h:53
-#, fuzzy
+#: ../setup/setup.ui.h:52
msgid "Use custom font:"
-msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಿ"
+msgstr "ಇಚ್ಛೆಯ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಿ:"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
-msgstr "ಲಂಬವಾಗಿ"
+msgstr "ಲಂಬ"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "ಸಕ್ರಿಯವಾಗಿದ್ದಾಗ"
-#, fuzzy
-#~ msgid "Use global engine"
-#~ msgstr "ಮೊದಲೆ ಲೋಡ್ ಮಾಡಲಾದ ಎಂಜಿನ್ಗಳು"
+#~ msgid "Never"
+#~ msgstr "ಎಂದಿಗೂ ಇಲ್ಲ"
#, fuzzy
#~ msgid "Langauge panel position"
diff --git a/po/ko.po b/po/ko.po
index 6120508..b76a3f1 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2010-03-31 14:16+1000\n"
"Last-Translator: Hyunsok Oh <hoh@redhat.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -245,11 +245,11 @@ msgstr "ibus 시작 시 엔진 미리로드 "
msgid "Prev engine shortcut keys"
msgstr "이전 엔진 단축키"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "모든 어플리케이션에서 동일한 입력 방식 공유"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "시스템 트레이에 아이콘 보여주기"
@@ -257,14 +257,15 @@ msgstr "시스템 트레이에 아이콘 보여주기"
msgid "Show input method name"
msgstr "입력 방식 이름 보여주기"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "언어 도구 모음에 입력 방식 이름 보여주기"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr "언어 패널의 동작 0 = 항상 숨기기, 1 = 자동 숨기기, 2 = 항상 표시 "
#: ../data/ibus.schemas.in.h:18
@@ -275,11 +276,11 @@ msgstr ""
"언어 패널의 위치. 0 = 왼쪽 위, 1 = 오른쪽 위, 2 = 왼쪽 아래, 3 = 오른쪽 아"
"래, 4 = 사용자 지정"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "목록에 있는 다음 입력 방식으로 전환하기 위한 단축키"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
@@ -299,11 +300,11 @@ msgstr "언어 패널 용 사용자 정의 글꼴 이름 사용"
msgid "Use global input method"
msgstr "전역 입력 방식 사용"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "시스템 키보드 (XKB) 레이아웃 사용 "
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "시스템 키보드 레이아웃 사용 "
@@ -420,69 +421,68 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 위로 이동합니다"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "하지않음"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "다음 입력 방식:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "이전 입력 방식:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "활성화된 입력 방식 목록에서 선택한 입력 방식을 제거"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "ibus가 입력 도구 모음을 표시하거나 숨기는 방법 설정"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "검색 테이블에서 후보 창의 방향 설정 "
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "선택한 입력 방식의 정보 보여주기"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "확인란을 선택하면 입력 방식의 이름을 입력 도구 모음에 표시"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "언어 패널 표시: "
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "로그인 시 ibus 시작 "
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "목록에 있는 이전 입력 방식으로 전환하기 위한 단축키 "
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "왼쪽 위"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "오른쪽 위"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "사용자 정의 글꼴 사용 "
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "세로"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "활성화 되었을 때"
+#~ msgid "Never"
+#~ msgstr "하지않음"
+
#~ msgid "Show in Status Icon menu"
#~ msgstr "상태 아이콘 메뉴에서 보여주기"
diff --git a/po/ml.po b/po/ml.po
index c34af32..4ea145d 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.master.ml\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2010-03-24 16:48+0530\n"
"Last-Translator: \n"
"Language-Team: <en@li.org>\n"
@@ -242,11 +242,11 @@ msgstr "ibus ആരംഭിക്കുമ്പോള് സംവിധാ
msgid "Prev engine shortcut keys"
msgstr "തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള എളുപ്പവഴികള്"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "സിസ്റ്റം ട്രേയില് ചിഹ്നം കാണിക്കുക"
@@ -254,14 +254,15 @@ msgstr "സിസ്റ്റം ട്രേയില് ചിഹ്നം
msgid "Show input method name"
msgstr "ഇന്പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "ഭാഷയുടെ പാനലില് ഇന്പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"ഭാഷയുടെ പാനലിന്റെ രീതി. 0 = എപ്പോഴും അദൃശ്യം, 1 = സ്വയം അദൃശ്യമാകുക, 2 = എപ്പോഴും കാണിക്കുക"
@@ -273,12 +274,12 @@ msgstr ""
"ഭാഷയുടെ പാനലിന്റെ സ്ഥാനം. 0 = മുകളില് ഇടതു് കോണ്, 1 = മുകളില് വലതു് കോണ്, 2 = താഴെ ഇടതു് "
"കോണ്, 3 = താഴെ വലതു് കോണ്, 4 = യഥേഷ്ടം"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr ""
"അടുത്ത ഇന്പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴി"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "ഇന്പുട്ട് മെഥേഡ് ഓണ് അല്ലെങ്കില് ഓഫ് ചെയ്യുന്നതിനുള്ള എളുപ്പവളികള് സജ്ജമാക്കുക"
@@ -298,11 +299,11 @@ msgstr "ഭാഷ്ക്കുള്ള പാനലില് നിങ്
msgid "Use global input method"
msgstr "ഗ്ലോബല് ഇന്പുട്ട് മെഥേഡ് ഉപയോഗിക്കുക"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "സിസ്റ്റം കീബോര്ഡ് (XKB) മാതൃക ഉപയോഗിക്കുക"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "സിസ്റ്റം കീബോര്ഡ് മാതൃക ഉപയോഗിക്കുക"
@@ -419,68 +420,67 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "സജ്ജമാക്കിയ ഇന്പുട്ട് മെഥേഡുകളില് നിന്നും തെരഞ്ഞെടുത്ത ഇന്പുട്ട് മെഥേഡ് മുകളിലേക്ക് നീക്കുക"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "ഒരിക്കലുമില്ല"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "അടുത്ത ഇന്പുട്ട് മെഥേഡ്:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "മുമ്പുള്ള ഇന്പുട്ട് മെഥേഡ്:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "സജ്ജമാക്കിയ ഇന്പുട്ട് മെഥേഡുകളില് നിന്നും തെരഞ്ഞെടുത്ത ഇന്പുട്ട് മെഥേഡ് നീക്കം ചെയ്യുക"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "ibus ഭാഷയുടെ പാനല് കാണിക്കണമോ വേണ്ടയോ എന്നതു് സജ്ജമാക്കുക"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "ലുക്കപ്പ് പട്ടികയില് ലഭ്യമായവയുടെ ക്രമീകരണം സജ്ജമാക്കുക"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "തെരഞ്ഞെടുത്ത ഇന്പുട്ട് മെഥേഡിനെപ്പറ്റിയുള്ള വിവരങ്ങള് കാണിക്കുക"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "ചെക്ക്ബോക്സ് ചെക്ക് ചെയ്യുമ്പോള് ഭാഷയുടെ പാനലില് ഇന്പുട്ട് മെഥേഡിന്റെ പേരു് കാണിക്കുക"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "ഭാഷയുടെ പാനല് കാണിക്കുക:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "പ്രവേശിക്കുമ്പോള് തന്നെ ibus ആരംഭിക്കുക"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr ""
"മുമ്പുള്ള ഇന്പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള "
"എളുപ്പവഴി"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "മുകളില് ഇടതു് കോണ് "
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "മുകളില് വലതു് കോണ് "
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "സജ്ജമാക്കിയ അക്ഷരസഞ്ചയം ഉപയോഗിക്കുക"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "നേരെയുള്ള"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "സജീവമാകുമ്പോള്"
+
+#~ msgid "Never"
+#~ msgstr "ഒരിക്കലുമില്ല"
diff --git a/po/mr.po b/po/mr.po
index d78be54..64910b8 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2010-04-09 14:48+0530\n"
"Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
"Language-Team: Marathi <maajhe-sanganak@freelists.org>\n"
@@ -244,11 +244,11 @@ msgstr "ibus सुरू होतेवेळी इंजीन आधिप
msgid "Prev engine shortcut keys"
msgstr "मागील इंजीनचे शॉर्टकट किज्"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "सर्व ऍप्लिकेशन्स् मध्ये एकसारखेच इंपुट पद्धत शेअर करा"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "चिन्ह प्रणाली ट्रेवर दाखवा"
@@ -256,14 +256,15 @@ msgstr "चिन्ह प्रणाली ट्रेवर दाखवा
msgid "Show input method name"
msgstr "इंपुट पद्धतीचे नाव दाखवा"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "भाषा पट्टीवरील इंपुट पद्धतीचे नाव दाखवा"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr "भाषा पटलाचे वर्तन. 0 = Always hide, 1 = Auto hide, 2 = Always show"
#: ../data/ibus.schemas.in.h:18
@@ -274,11 +275,11 @@ msgstr ""
"भाषा पटलाचे स्थान. 0 = Top left corner, 1 = Top right corner, 2 = Bottom left "
"corner, 3 = Bottom right corner, 4 = Custom"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "सूचीतील पुढची इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "इंपुट पद्धत सुरू किंवा बंद करण्यासाठी शार्टकट किज्"
@@ -298,11 +299,11 @@ msgstr "भाषा पटल करीत स्वपसंत फॉन्
msgid "Use global input method"
msgstr "ग्लोबल इंपुट पद्धत नीवडा"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "प्रणाली कळफलक (XKB) मांडणीचा वापर करा"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "प्रणाली कळफलक मांडणीचा वापर करा"
@@ -419,66 +420,65 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "कार्यक्षम इंपुट पद्धतींमध्ये नीवडलेली इंपुट पद्धत वर सरकवा"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "कधीच नाही"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "पुढची इंपुट पद्धत:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "मागील इंपुट पद्धत:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "कार्यक्षम इंपुट पद्धतीपासून नीवडलेली इंपुट पद्धत काढून टाका"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "भाषा पट्टी कसे दाखवायचे किंवा लपवायचे यासाठी ibus चे वर्तन ठरवा"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "लुकअप टेबल मधील घटकांचे निर्देशन ठरवा"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "नीवडलेल्या इंपुट पद्धत विषयी माहिती दाखवा"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "चेकबॉक्स नीवडल्यानंतर भाषा पट्टीवरील इंपुट पद्धतीचे नाव दाखवा"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "भाषा पटल दाखवा:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "प्रवेशवेळी ibus सुरू करा"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "सूचीतील मागील इंपुट पद्धत नीवडण्याकरीता वापरण्याजोगी शार्टकट किज्"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "वरील डावा कोपरा"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "वरील उजवा कोपरा"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "स्वपसंत फॉन्ट वापरा"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "उभे"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "सक्रीय असल्यावर"
+
+#~ msgid "Never"
+#~ msgstr "कधीच नाही"
diff --git a/po/or.po b/po/or.po
index d28f26a..1ae5e17 100644
--- a/po/or.po
+++ b/po/or.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.or\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2010-04-15 14:17+0530\n"
"Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
"Language-Team: Oriya <Translation-team-or@lists.sourceforge.net>\n"
@@ -250,11 +250,11 @@ msgstr "ibus ଆରମ୍ଭ ସମୟରେ ଯନ୍ତ୍ର ପ୍ରାକ
msgid "Prev engine shortcut keys"
msgstr "ପୂର୍ବ ଯନ୍ତ୍ରର ସଂକ୍ଷିପ୍ତ ପଥ କି'ଗୁଡ଼ିକ"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "ସମସ୍ତ ପ୍ରୟୋଗଗୁଡ଼ିକ ମଧ୍ଯରେ ଏକା ପ୍ରକାରର ନିବେଶ ପଦ୍ଧତିକୁ ସହଭାଗ କରନ୍ତୁ"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "ତନ୍ତ୍ର ଟ୍ରେରେ ଚିତ୍ରସଂକେତଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ"
@@ -262,14 +262,15 @@ msgstr "ତନ୍ତ୍ର ଟ୍ରେରେ ଚିତ୍ରସଂକେତଗ
msgid "Show input method name"
msgstr "ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "ଭାଷା ତାଲିକା ପାଇଁ ନିବେଶ ପଦ୍ଧତି ନାମ ଦର୍ଶାନ୍ତୁ"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"ଭାଷା ତାଲିକାର ଆଚରଣ। 0 = ସର୍ବଦା ଲୁଚାନ୍ତୁ, 1 = ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ, 2 = ସର୍ବଦା ଦର୍ଶାନ୍ତୁ"
@@ -281,11 +282,11 @@ msgstr ""
"ଭାଷା ଫଳକର ଅବସ୍ଥାନ। 0 = ଉପର ପାଖ ବାମ କୋଣ, 1 = ଉପର ପାଖ ଡାହାଣ କୋଣ, 2 = ତଳ ପାଖ ବାମ "
"କୋଣ, 3 = ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ, 4 = ଇଚ୍ଛାମୁତାବକ"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "ତାଲିକାରେ ପରବର୍ତ୍ତୀ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "ନିବେଶ ପଦ୍ଧତିକୁ ଅନ କିମ୍ବା ଅଫ କରିବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
@@ -305,11 +306,11 @@ msgstr "ଭାଷା ତାଲିକା ପାଇଁ ଇଚ୍ଛାମୁତା
msgid "Use global input method"
msgstr "ସର୍ବସାଧାରଣ ନିବେଶ ପ୍ରଣୀଳୀକୁ ବ୍ୟବହାର କରନ୍ତୁ"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ (XKB) ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ"
@@ -426,66 +427,65 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତି ତାଲିକାରେ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ ଉପରକୁ ଘୁଞ୍ଚାନ୍ତୁ"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "କଦାପି ନୁହଁ"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "ପରବର୍ତ୍ତି ନିବେଶ ପ୍ରଣାଳୀ:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "ସକ୍ରିୟ ନିବେଶ ପଦ୍ଧତିରୁ ବଚ୍ଛିତ ନିବେଶ ପ୍ରଣୀଳୀକୁ କାଢ଼ିଦିଅନ୍ତୁ"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "ଭାଷା ସୂଚକକୁ ଦର୍ଶାଇବା ଅଥବା ଲୁଚାଇବା ପାଇଁ ibus ର ଆଚରଣକୁ ସେଟକରନ୍ତୁ"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "ଅବଲୋକନ ସାରଣୀରେ ବ୍ୟକ୍ତିମାନଙ୍କର ଅନୁସ୍ଥାପନ ସେଟକରନ୍ତୁ"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "ବଚ୍ଛିତ ନିବେଶ ପଦ୍ଧତିର ସୂଚନା ଦର୍ଶାନ୍ତୁ"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "ନିବେଶ ପଦ୍ଧତି ନାମକୁ ଭାଷା ସୂଚକରେ ଦର୍ଶାନ୍ତୁ ଯେତେବେଳେ ଯାଞ୍ଚବାକ୍ସକୁ ଯାଞ୍ଚକରୁଛନ୍ତି"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "ଭାଷା ତାଲିକା ଦର୍ଶାନ୍ତୁ:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "ଲଗଇନ ସମୟରେ ibus କୁ ଆରମ୍ଭ କରନ୍ତୁ"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "ତାଲିକାରେ ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀକୁ ବଦଳାଇବା ପାଇଁ ସକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକ"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "ଉପର ପାଖ ବାମ କୋଣ"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "ଉପର ପାଖ ଡ଼ାହାଣ କୋଣ"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "ଇଚ୍ଛାମୁତାବକ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "ଭୂଲମ୍ବ"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "ସକ୍ରିୟ ଥିବା ସମୟରେ"
+
+#~ msgid "Never"
+#~ msgstr "କଦାପି ନୁହଁ"
diff --git a/po/pa.po b/po/pa.po
index 21538a9..2a39555 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2010-03-31 14:55+0530\n"
"Last-Translator: Jaswinder Singh <jsingh@redhat.com>\n"
"Language-Team: Punjabi/Panjabi <kde-i18n-doc@kde.org>\n"
@@ -246,11 +246,11 @@ msgstr "ibus ਸ਼ੁਰੂ ਹੋਣ ਸਮੇਂ ਪਹਿਲਾਂ ਲੋਡ
msgid "Prev engine shortcut keys"
msgstr "ਪਿਛਲਾ ਇੰਜਣ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨਾਂ ਵਿਚਕਾਰ ਕੁਝ ਇੰਪੁੱਟ ਸਾਂਝੀ ਕਰੋ"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "ਸਿਸਟਮ ਟਰੇਅ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖਾਓ"
@@ -258,14 +258,15 @@ msgstr "ਸਿਸਟਮ ਟਰੇਅ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖਾ
msgid "Show input method name"
msgstr "ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਵੇਖਾਓ"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਇੰਪੁੱਟ ਨਾਂ ਵੇਖੋ"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਦਾ ਰਵੱਈਆ: 0 = ਹਮੇਸ਼ਾ ਓਹਲੇ, 1 = ਆਟੋਮੈਟਿਕ ਓਹਲੇ, 2 = ਹਮੇਸ਼ਾ ਵੇਖੋ"
#: ../data/ibus.schemas.in.h:18
@@ -276,11 +277,11 @@ msgstr ""
"ਭਾਸ਼ਾ ਪੈਨਲ ਦੀ ਸਥਿਤੀ. 0 = ਉੱਪਰ ਖੱਬਾ ਕੋਨਾ, 1 = ਉੱਪਰ ਸੱਜਾ ਕੋਨਾ, 2 = ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ, 3 = "
"ਹੇਠਾਂ ਸੱਜਾ ਕੋਨਾ, 4 = ਪਸੰਦੀਦਾ"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "ਲਿਸਟ ਵਿੱਚ ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚ"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "ਇੰਪੁੱਟ ਢੰਗ ਬੰਦ ਕਰਨ ਜਾਂ ਚਾਲੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ"
@@ -300,11 +301,11 @@ msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਲਈ ਪਸੰਦੀਦਾ ਫੋਂਟ
msgid "Use global input method"
msgstr "ਗਲੋਬਲ ਇੰਪੁੱਟ ਢੰਗ ਵਰਤੋ"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ (XKB) ਲੇਆਉਟ ਵਰਤੋਂ"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ ਲੇਆਉਟ ਵਰਤੋਂ"
@@ -421,70 +422,69 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚ ਉੱਤੇ ਭੇਜੋ"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "ਕਦੇ ਨਹੀਂ"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "ਅਗਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "ਚੁਣਿਆ ਇੰਪੁੱਟ ਢੰਗ ਚਾਲੂ ਇੰਪੁੱਟ ਢੰਗਾਂ ਵਿੱਚੋਂ ਹਟਾਓ"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "ibus ਦਾ ਰਵੱਈਆ ਸੈੱਟ ਕਰੋ ਕਿ ਭਾਸ਼ਾ ਪੱਟੀ ਕਿਵੇਂ ਵੇਖਾਈ ਜਾਵੇ"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "ਖੋਜ ਟੇਬਲ ਵਿੱਚ ਉਮੀਦਵਾਰ ਦੀ ਸਥਿਤੀ ਸੈੱਟ ਕਰੋ"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "ਚੁਣੇ ਇੰਪੁੱਟ ਢੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "ਜਦੋਂ ਚੈੱਕ ਬਾਕਸ ਚੁਣਿਆ ਹੋਵੇ ਤਾਂ ਇੰਪੁੱਟ ਢੰਗ ਨਾਂ ਭਾਸ਼ਾ ਪੱਟੀ ਉੱਤੇ ਵੇਖੋ"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "ਭਾਸ਼ਾ ਪੈਨਲ ਵੇਖੋ:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "ਲਾਗਇਨ ਸਮੇਂ ibus ਚਲਾਉ"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "ਲਿਸਟ ਵਿੱਚ ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ ਬਦਲਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਸਵਿੱਚ"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "ਉੱਪਰ ਖੱਬਾ ਕੋਨਾ"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "ਉੱਪਰ ਸੱਜਾ ਕੋਨਾ"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "ਵਰਟੀਕਲ"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "ਜਦੋਂ ਐਕਟਿਵ"
+#~ msgid "Never"
+#~ msgstr "ਕਦੇ ਨਹੀਂ"
+
#~ msgid "Show in Status Icon menu"
#~ msgstr "ਸਥਿਤੀ ਆਈਕਾਨ ਮੇਨੂ ਵਿੱਚ ਵੇਖਾਓ"
diff --git a/po/pl.po b/po/pl.po
index 20e41a7..ea4fd03 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: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2010-02-28 03:12+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
@@ -240,11 +240,11 @@ msgstr "Wczytanie mechanizmów podczas uruchamiania programu iBus"
msgid "Prev engine shortcut keys"
msgstr "Klawisze skrótów poprzedniego mechanizmu"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "Używanie tej samej metody wprowadzania we wszystkich aplikacjach"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "Wyświetlanie ikony w obszarze powiadamiania"
@@ -252,14 +252,15 @@ msgstr "Wyświetlanie ikony w obszarze powiadamiania"
msgid "Show input method name"
msgstr "Wyświetlanie nazwy metody wprowadzania"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "Wyświetlanie nazwy metody wprowadzania na panelu języków"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"Zachowanie panela języków. 0 = zawsze ukrywany, 1 = automatycznie ukrywany, "
"2 = zawsze wyświetlany"
@@ -272,12 +273,12 @@ msgstr ""
"Pozycja panela języków. 0 = górny lewy róg, 1 = górny prawy róg, 2 = dolny "
"lewy róg, 3 = dolny prawy róg, 4 = własna"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr ""
"Klawisz skrótu do przełączenia na następną metodę wprowadzania na liście"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "Klawisze skrótów do włączania lub wyłączania metody wprowadzania"
@@ -297,11 +298,11 @@ msgstr "Nazwa własnej czcionki użytej w panelu języków"
msgid "Use global input method"
msgstr "Użycie globalnej metody wprowadzania"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "Użycie systemowego układu klawiatury (XKB)"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "Użycie systemowych ustawień układu klawiatury"
@@ -423,74 +424,73 @@ msgstr ""
"wprowadzania"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "Nigdy"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Następna metoda wprowadzania:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "Poprzednia metoda wprowadzania:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
"Usunięcie zaznaczonej metody wprowadzania we włączonych metodach wprowadzania"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr ""
"Ustawienie zachowania programu iBus wyświetlania lub ukrywania panela języków"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "Ustawienie orientacji kandydatów w tablicy wyszukiwania"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "Wyświetlanie informacji o wybranej metodzie wprowadzania"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr ""
"Wyświetlanie nazwy metody wprowadzania na panelu języków podczas zaznaczania "
"pola wyboru"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Wyświetlanie panelu języków:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Uruchamianie iBus podczas logowania"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr ""
"Klawisz skrótu do przełączenia na poprzednią metodę wprowadzania na liście"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "Górny lewy róg"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "Górny prawy róg"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "Użycie własnej czcionki"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "Pionowo"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "W czasie aktywności"
+#~ msgid "Never"
+#~ msgstr "Nigdy"
+
#~ msgid "Show in Status Icon menu"
#~ msgstr "Wyświetlanie w menu ikony w obszarze powiadamiania"
diff --git a/po/ru.po b/po/ru.po
index 476b440..2959adb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2010-04-09 12:45\n"
"Last-Translator: Yulia <ypoyarko@redhat.com>\n"
"Language-Team: Russian\n"
@@ -245,11 +245,11 @@ msgstr "Загружать методы ввода при запуске iBus"
msgid "Prev engine shortcut keys"
msgstr "Клавиши для предыдущего метода ввода"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "Использовать один метод ввода для всех приложений"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "Показать значок в области уведомлений"
@@ -257,14 +257,15 @@ msgstr "Показать значок в области уведомлений"
msgid "Show input method name"
msgstr "Показывать название метода ввода"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "Показывать название метода ввода на языковой панели"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"Поведение языковой панели. 0 = всегда скрывать, 1 = автоматически скрывать, "
"2 = всегда показывать"
@@ -277,11 +278,11 @@ msgstr ""
"Расположение языковой панели. 0 = левый верхний угол, 1 = правый верхний "
"угол, 2 = левый нижний угол, 3 = правый нижний угол, 4 = произвольно"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "Горячие клавиши для переключения на следующий метод ввода в списке:"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "Горячие клавиши для включения/выключения метода ввода"
@@ -301,11 +302,11 @@ msgstr "Использовать свой шрифт для языковой п
msgid "Use global input method"
msgstr "Использовать глобальный метод ввода"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "Использовать системную раскладку клавиатуры (XKB)"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "Использовать системную раскладку клавиатуры"
@@ -423,67 +424,66 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "Переместить выбранный метод ввода вверх в списке используемых"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "Никогда"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Следующий метод ввода:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "Предыдущий метод ввода:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "Удалить выбранный метод ввода из списка"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "Установить поведение iBus для показа или скрытия языковой панели"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "Установить ориентацию кандидатов в таблице поиска"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "Показать информацию о выбранном методе ввода"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr ""
"Показывать название метода ввода на языковой панели, когда пункт выбран"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Показывать языковую панель:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Запускать iBus при входе в систему:"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "Горячие клавиши для переключения на предыдущий метод ввода в списке:"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "Левый верхний угол"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "Правый верхний угол"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "Использовать свой шрифт"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "Вертикально"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "Когда активно"
+
+#~ msgid "Never"
+#~ msgstr "Никогда"
diff --git a/po/sr.po b/po/sr.po
index fd0e4ab..6ff3f96 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: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+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"
@@ -257,11 +257,11 @@ msgstr "Унапред учитај погоне током ibus покрета
msgid "Prev engine shortcut keys"
msgstr "Пречица претходног погона"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr ""
@@ -270,15 +270,16 @@ msgstr ""
msgid "Show input method name"
msgstr "Назив прилагођеног фонта за језички панел"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
#, fuzzy
msgid "Show input method name on language bar"
msgstr "Назив прилагођеног фонта за језички панел"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"Понашање језичког панела. 0 = увек сакривен, 1 = самостално сакривање, 2 = "
"увек приказан"
@@ -289,12 +290,12 @@ msgid ""
"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
msgstr ""
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
#, fuzzy
msgid "The shortcut keys for switching to next input method in the list"
msgstr "Пречица следећег погона за пребацивање на следећи погон методе уноса"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
#, fuzzy
msgid "The shortcut keys for turning input method on or off"
msgstr ""
@@ -318,11 +319,11 @@ msgstr "Користи прилагођени фонт за језички па
msgid "Use global input method"
msgstr "Изаберите методу уноса"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr ""
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr ""
@@ -443,72 +444,68 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr ""
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr ""
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Следећа метода уноса:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
#, fuzzy
msgid "Previous input method:"
msgstr "Претходна метода уноса:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr ""
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
#, fuzzy
msgid "Set the orientation of candidates in lookup table"
msgstr "Оријентација референтне табеле"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr ""
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
#, fuzzy
msgid "Show input method's name on language bar when check the checkbox"
msgstr "Назив прилагођеног фонта за језички панел"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Прикажи језички панел:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Покрени ibus при пријави"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
#, fuzzy
msgid "The shortcut keys for switching to previous input method in the list"
msgstr ""
"Пречица претходног погона за пребацивање на претходни погон методе уноса"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr ""
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr ""
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "Употреби прилагођени фонт"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr ""
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
#, fuzzy
msgid "When active"
msgstr ""
diff --git a/po/sr@latin.po b/po/sr@latin.po
index a0f8ce1..50bbcef 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: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+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"
@@ -257,11 +257,11 @@ msgstr "Unapred učitaj pogone tokom ibus pokretanja"
msgid "Prev engine shortcut keys"
msgstr "Prečica prethodnog pogona"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr ""
@@ -270,15 +270,16 @@ msgstr ""
msgid "Show input method name"
msgstr "Naziv prilagođenog fonta za jezički panel"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
#, fuzzy
msgid "Show input method name on language bar"
msgstr "Naziv prilagođenog fonta za jezički panel"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"Ponašanje jezičkog panela. 0 = uvek sakriven, 1 = samostalno sakrivanje, 2 = "
"uvek prikazan"
@@ -289,12 +290,12 @@ msgid ""
"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
msgstr ""
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
#, fuzzy
msgid "The shortcut keys for switching to next input method in the list"
msgstr "Prečica sledećeg pogona za prebacivanje na sledeći pogon metode unosa"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
#, fuzzy
msgid "The shortcut keys for turning input method on or off"
msgstr ""
@@ -318,11 +319,11 @@ msgstr "Koristi prilagođeni font za jezički panel"
msgid "Use global input method"
msgstr "Izaberite metodu unosa"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr ""
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr ""
@@ -443,72 +444,68 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr ""
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr ""
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Sledeća metoda unosa:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
#, fuzzy
msgid "Previous input method:"
msgstr "Prethodna metoda unosa:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr ""
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
#, fuzzy
msgid "Set the orientation of candidates in lookup table"
msgstr "Orijentacija referentne tabele"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr ""
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
#, fuzzy
msgid "Show input method's name on language bar when check the checkbox"
msgstr "Naziv prilagođenog fonta za jezički panel"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Prikaži jezički panel:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Pokreni ibus pri prijavi"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
#, fuzzy
msgid "The shortcut keys for switching to previous input method in the list"
msgstr ""
"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr ""
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr ""
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "Upotrebi prilagođeni font"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr ""
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
#, fuzzy
msgid "When active"
msgstr ""
diff --git a/po/ta.po b/po/ta.po
index f2dbcfa..0b9ff0a 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.master.ta\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2009-12-08 22:26+0530\n"
"Last-Translator: I Felix <ifelix@redhat.com>\n"
"Language-Team: Tamil <fedora-trans-ta@redhat.com>\n"
@@ -244,11 +244,11 @@ msgstr "ibus துவங்கும் போது முன்னேற்
msgid "Prev engine shortcut keys"
msgstr "முந்தைய இயந்திர குறுக்குவிசைகள்"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "கணினி தட்டில் சின்னத்தை காட்டு"
@@ -256,14 +256,15 @@ msgstr "கணினி தட்டில் சின்னத்தை கா
msgid "Show input method name"
msgstr "உள்ளீடு முறையின் பெயரை காட்டு"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "மொழி பட்டையில் உள்ளீடு முறையின் பெயரை காட்டு"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr "மொழி பலகத்தின் பண்புகள். 0 = எப்போதும் மறை, 1 = தானாக மறை, 2 = எப்போதும் காட்டு"
#: ../data/ibus.schemas.in.h:18
@@ -274,11 +275,11 @@ msgstr ""
"மொழி பேனலின் இடம். 0 = மேல் இடது ஓரம், 1 = மேல் வலது ஓரம், 2 = கீழ் இடது ஓரம், 3 = கீழ் "
"வலது ஓரம், 4 = தனிபயன்"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "பட்டியலில் அடுத்த உள்ளீடு முறையை மாற்றுவதற்கான குறுக்குவழி விசைகள்"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "உள்ளீடு முறைமை துவக்க அல்லது நிறுத்த குறுக்குவிசைகளை அமை"
@@ -299,11 +300,11 @@ msgstr "மொழி பலகத்தில் தனிபயன் எழு
msgid "Use global input method"
msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "கணினி விசைப்பலகை (XKB) அமைப்பை பயன்படுத்து"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "கணினி விசைப்பலகை அமைப்பை பயன்படுத்து"
@@ -421,70 +422,69 @@ msgstr ""
"செயல்படுத்தப்பட்ட உள்ளீடு முறைகள் பட்டியலில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை மேலே நகர்த்து"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "ஒருபோதும்"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "அடுத்த உள்ளீடு முறை:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "முந்தைய உள்ளீடு முறை:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகளிலிருந்து தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை நீக்கு"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "மொழி பட்டையை எவ்வாறு காட்ட அல்லது மறைக்க வேண்டும் என ibus பண்பினை அமை"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "காணும் அட்டவணையில் நபர்களின் திசையமைப்பை அமை"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையின் தகவலை காட்டு"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "சோதனை பெட்டியை சோதிக்கும் போது உள்ளீடு முறை பெயரை மொழி பட்டையில் காட்டு "
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "மொழி பலகத்தை காட்டு:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "புகுபதிவில் ibusஐ துவக்கு"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "பட்டியலில் முந்தைய உள்ளீடு முறையை மாற்றுவதற்கான குறுக்குவழி விசைகள்"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "மேல் இடது ஓரம்"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "மேல் வலது ஓரம்"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "தனிபயன் எழுத்துருவை பயன்படுத்து"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "செங்குத்து"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "செயலிலிருக்கும் போது"
+#~ msgid "Never"
+#~ msgstr "ஒருபோதும்"
+
#, fuzzy
#~ msgid "Use global engine"
#~ msgstr "முன்ஏற்றப்பட்ட இயந்திரங்கள்"
diff --git a/po/te.po b/po/te.po
index ad45b05..8111255 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus.master.te\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2009-12-08 15:31+0530\n"
"Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
"Language-Team: Telugu <en@li.org>\n"
@@ -250,11 +250,11 @@ msgstr "ibus ప్రారంభమునందు ముందుగా ల
msgid "Prev engine shortcut keys"
msgstr "మునుపటి యింజన్ లఘువులు"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "సిస్టమ్ ట్రే నందు ప్రతిమను చూపుము"
@@ -262,14 +262,15 @@ msgstr "సిస్టమ్ ట్రే నందు ప్రతిమను
msgid "Show input method name"
msgstr "యిన్పుట్ పద్దతి నామమును చూపుము"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "భాషా పట్టీపై యిన్పుట్ పద్దతి నామము చూపుము"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"భాషా ప్యానల్ యొక్క ప్రవర్తన. 0 = ఎల్లప్పుడూ మరుగునవుంచు, 1 = స్వయంచాలకంగా మరుగునవుంచు, 2 = "
"ఎల్లప్పుడూ "
@@ -282,11 +283,11 @@ msgstr ""
"భాషా ప్యానల్ యొక్క స్థానము. 0 = పై ఎడమ మూల, 1 = పై కుడి మూల, 2 = క్రింది ఎడమ మూల, 3 = క్రింది "
"కుడి మూల, 4 = మలచుకొనిన"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "జాబితానందలి తరువాతి యిన్పుట్ పద్దతినకు మారుటకు లఘువులు"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "ఇన్పుట్ పద్దతిని ఆన్ చేయుటకు లేదా ఆఫ్ చేయుటకు లఘువులు"
@@ -307,11 +308,11 @@ msgstr "భాషా ప్యానల్ కొరకు మలచుకొన
msgid "Use global input method"
msgstr "ఇన్పుట్ పద్దతిని యెంపికచేయుము"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "సిస్టమ్ కీబోర్డు (XKB) నమూనా వుపయోగించుము"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "సిస్టమ్ కీబోర్డు నమూనా వుపయోగించుము"
@@ -428,70 +429,69 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "చేతనమైన యిన్పుట్ పద్దతులలో యెంపికైన యిన్పుట్ పద్దతిని పైకి కదుపుము"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "ఎప్పటికివద్దు"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "తరువాతి ఇన్పుట్ పద్దతి:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "మునుపటి ఇన్పుట్ పద్దతి:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "చేతనమైన యిన్పుట్ పద్దతులలో యెంపికైన యిన్పుట్ పద్దతిని తీసివేయుము"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "భాషా పట్టీని యెలా చూపాలి మరియు దాయాలి అనేదానికి ibus ప్రవర్తనను అమర్చుము"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "లుకప్ పట్టికనందు కాండిడేట్ల సర్దుబాటును అమర్చుము"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "ఎంపికచేసిన యిన్పుట్ పద్దతి యొక్క సమాచారమును చూపుము"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "చెక్బాక్సు చెక్ చేసినప్పుడు భాషా పట్టీపై యిన్పుట్ పద్దతి నామము చూపుము"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "భాషా ప్యానల్ చూపుము:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "లాగిన్నందు ibus ప్రారంభించుము"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "జాబితానందలి ముందరి యిన్పుట్ పద్దతినకు మారుటకు లఘువులు"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "పై ఎడమ మూల"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "పై కుడి మూల"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "మలచుకొనిన ఫాంటు వుపయోగించుము"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "వెర్టికల్"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "క్రియాశీలముగా వున్నప్పుడు"
+#~ msgid "Never"
+#~ msgstr "ఎప్పటికివద్దు"
+
#, fuzzy
#~ msgid "Use global engine"
#~ msgstr "ముందుగా లోడైన యింజన్లు"
diff --git a/po/vi.po b/po/vi.po
index b706909..ac0f479 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: data 1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2009-12-08 16:55+0700\n"
"Last-Translator: Lê Quốc Tuấn <mr.lequoctuan@gmail.com>\n"
"Language-Team: Vietnamese\n"
@@ -244,11 +244,11 @@ msgstr "Nạp trước các kiểu gõ khi khởi động ibus"
msgid "Prev engine shortcut keys"
msgstr "Phím tắt cho kiểu gõ trước"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "Hiển thị biểu tượng trên khay hệ thống"
@@ -256,14 +256,15 @@ msgstr "Hiển thị biểu tượng trên khay hệ thống"
msgid "Show input method name"
msgstr "Hiển thị tên kiểu gõ"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "Hiển thị tên kiểu gõ trên thanh ngôn ngữ"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr ""
"Cách hiển thị thanh ngôn ngữ. 0 = Luôn ẩn, 1 = Tự động ẩn, 2 = Luôn hiện"
@@ -275,11 +276,11 @@ msgstr ""
"Vị trí của thanh ngôn ngữ. 0 = góc trên bên trái, 1 = góc trên bên phải, 2 = "
"góc dưới bên trái, 3 = góc dưới bên phái, 4 = Tùy chọn"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "Phím tắt dùng để chuyển đến kiểu gõ kế tiếp trong danh sách"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "Phím tắt để bật hoặc tắt kiểu gõ"
@@ -300,11 +301,11 @@ msgstr "Dùng phông tùy biến cho thanh ngôn ngữ"
msgid "Use global input method"
msgstr "Chọn một kiểu gõ"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "Dùng kiểu bố trí bàn phím hệ thống (XKB)"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "Dùng kiểu bố trí bàn phím của hệ thống"
@@ -423,70 +424,69 @@ msgstr ""
"Di chuyển kiểu gõ đã chọn lên trên trong những kiểu gõ cho phép sử dụng"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "Không bao giờ"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "Kiểu gõ kế tiếp:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "Kiểu gõ trước:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "Xóa kiểu gõ đã chọn ra khỏi những kiểu gõ cho phép sử dụng"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "Thiết lập việc ẩn hay hiển thị thanh ngôn ngữ"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "Đặt hướng của từ gợi ý trong bảng tra cứu"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "Hiển thị thông tin về kiểu gõ đã chọn"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "Hiển thị tên của kiểu gõ trên thanh ngôn ngữ khi đánh dấu vào ô kiểm"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "Hiển thị thanh ngôn ngữ:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "Khởi động ibus khi đăng nhập"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "Phím tắt dùng để chuyển về kiểu gõ trước trong danh sách"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "Góc trên bên trái"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "Góc trên bên phải"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "Dùng phông chữ tùy biến"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "Dọc"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "Khi hoạt động"
+#~ msgid "Never"
+#~ msgstr "Không bao giờ"
+
#, fuzzy
#~ msgid "Use global engine"
#~ msgstr "Nạp trước các kiểu gõ"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7a4bb86..de15896 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: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2008-08-13 21:59+0800\n"
"Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
"Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n"
@@ -238,11 +238,11 @@ msgstr "ibus启动时预加载的引擎"
msgid "Prev engine shortcut keys"
msgstr "上一个引擎快捷键"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "在所有应用程序中共享同一个输入法"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "在系统托盘上显示图标"
@@ -250,15 +250,15 @@ msgstr "在系统托盘上显示图标"
msgid "Show input method name"
msgstr "在语言栏上显示输入法名字"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "在语言栏上显示输入法名字"
#: ../data/ibus.schemas.in.h:17
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
-msgstr "语言栏行为。0 = 总是隐藏，1 = 自动隐藏，2 = 总是显示。"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
+msgstr "语言栏行为。0 = 嵌入菜单，1 = 自动隐藏，2 = 总是显示。"
#: ../data/ibus.schemas.in.h:18
msgid ""
@@ -266,11 +266,11 @@ msgid ""
"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
msgstr "语言栏位置"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "切换下一个输入法快捷键"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "打开关闭输入法的快捷键"
@@ -290,11 +290,11 @@ msgstr "语言栏是否使用自定义字体"
msgid "Use global input method"
msgstr "使用全局输入法"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "使用系统键盘（XKB）布局"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "使用系统键盘布局"
@@ -411,65 +411,64 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "上移选中的输入法"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "从不"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "下一输入法："
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "上一输入法："
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "删除选中的输入法"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "设置显示隐藏语言栏的方式"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "设置候选词表方向"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "显示选中输入法的信息"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "在语言栏上显示输入法的名字"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "显示语言栏："
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "启动桌面时自动启动IBus"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "切换上一个输入法快捷键"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "左上角"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "右上角"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
msgid "Use custom font:"
msgstr "使用自定义字体："
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "竖直"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "活动时"
+
+#~ msgid "Never"
+#~ msgstr "从不"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index dde192b..9bc1902 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: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+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"
@@ -251,11 +251,11 @@ msgstr "ibus啟動時預先載入引擎"
msgid "Prev engine shortcut keys"
msgstr "切換到上一個引擎捷徑鍵"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr ""
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr ""
@@ -264,15 +264,16 @@ msgstr ""
msgid "Show input method name"
msgstr "自訂語言面板字體"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
#, fuzzy
msgid "Show input method name on language bar"
msgstr "自訂語言面板字體"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr "語言面板行為。0 = 永遠隱藏，1 = 自動隱藏，2 = 永遠顯示。"
#: ../data/ibus.schemas.in.h:18
@@ -281,12 +282,12 @@ msgid ""
"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
msgstr ""
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
#, fuzzy
msgid "The shortcut keys for switching to next input method in the list"
msgstr "下一個引擎捷徑鍵"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
#, fuzzy
msgid "The shortcut keys for turning input method on or off"
msgstr "切換到上一個引擎捷徑鍵"
@@ -309,11 +310,11 @@ msgstr "語言面板是否使用自訂字體"
msgid "Use global input method"
msgstr "選擇輸入法"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr ""
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr ""
@@ -434,70 +435,66 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr ""
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr ""
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "下一個輸入法:"
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "上一個輸入法:"
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr ""
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr ""
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
#, fuzzy
msgid "Set the orientation of candidates in lookup table"
msgstr "候選字詞表排列方向"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr ""
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
#, fuzzy
msgid "Show input method's name on language bar when check the checkbox"
msgstr "自訂語言面板字體"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "顯示語言面板:"
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "登入時自動啟動IBus"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
#, fuzzy
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "切換到上一個引擎捷徑鍵"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr ""
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr ""
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "使用自訂字體"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr ""
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
#, fuzzy
msgid "When active"
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ef43282..3ebd69f 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: 2010-04-21 10:58+0800\n"
+"POT-Creation-Date: 2010-04-26 08:54+0800\n"
"PO-Revision-Date: 2010-02-25 21:50+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: chinese-l10n <chinese-l10n@googlegroups.com>\n"
@@ -246,11 +246,11 @@ msgstr "當 ibus 啟動時預先載入引擎"
msgid "Prev engine shortcut keys"
msgstr "「上一個引擎」快捷鍵"
-#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:41
+#: ../data/ibus.schemas.in.h:13 ../setup/setup.ui.h:40
msgid "Share the same input method among all applications"
msgstr "在所有的應用程式中共享同一個輸入法"
-#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:42
+#: ../data/ibus.schemas.in.h:14 ../setup/setup.ui.h:41
msgid "Show icon on system tray"
msgstr "在系統匣內顯示圖示"
@@ -258,14 +258,15 @@ msgstr "在系統匣內顯示圖示"
msgid "Show input method name"
msgstr "顯示輸入法名稱"
-#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:44
+#: ../data/ibus.schemas.in.h:16 ../setup/setup.ui.h:43
msgid "Show input method name on language bar"
msgstr "在語言列上顯示輸入法名稱"
#: ../data/ibus.schemas.in.h:17
+#, fuzzy
msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
msgstr "語言面板行為。0 = 永遠隱藏，1 = 自動隱藏，2 = 永遠顯示。"
#: ../data/ibus.schemas.in.h:18
@@ -274,11 +275,11 @@ msgid ""
"corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
msgstr "語言列的位置。0 = 左上角, 1 = 右上角, 2 = 左下角, 3 = 右下角, 4 = 自訂"
-#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:48
+#: ../data/ibus.schemas.in.h:19 ../setup/setup.ui.h:47
msgid "The shortcut keys for switching to next input method in the list"
msgstr "用來切換到清單內下一個輸入法的快捷鍵"
-#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:50
+#: ../data/ibus.schemas.in.h:20 ../setup/setup.ui.h:49
msgid "The shortcut keys for turning input method on or off"
msgstr "用來開啟或關閉輸入法的快捷鍵"
@@ -298,11 +299,11 @@ msgstr "語言面板是否使用自訂字體"
msgid "Use global input method"
msgstr "使用全域輸入法"
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:54
+#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:53
msgid "Use system keyboard (XKB) layout"
msgstr "使用系統鍵盤 (XKB) 配置"
-#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:55
+#: ../data/ibus.schemas.in.h:26 ../setup/setup.ui.h:54
msgid "Use system keyboard layout"
msgstr "使用系統鍵盤配置"
@@ -419,70 +420,69 @@ msgid "Move up the selected input method in the enabled input methods list"
msgstr "上移所選取的輸入法"
#: ../setup/setup.ui.h:35
-msgid "Never"
-msgstr "從不"
-
-#: ../setup/setup.ui.h:36
msgid "Next input method:"
msgstr "下一個輸入法："
-#: ../setup/setup.ui.h:37
+#: ../setup/setup.ui.h:36
msgid "Previous input method:"
msgstr "上一個輸入法："
-#: ../setup/setup.ui.h:38
+#: ../setup/setup.ui.h:37
msgid "Remove the selected input method from the enabled input methods"
msgstr "從已啟用的輸入法中移除所選的輸入法"
-#: ../setup/setup.ui.h:39
+#: ../setup/setup.ui.h:38
msgid "Set the behavior of ibus how to show or hide language bar"
msgstr "設置 ibus 如何顯示或隱藏語言列的行為"
-#: ../setup/setup.ui.h:40
+#: ../setup/setup.ui.h:39
msgid "Set the orientation of candidates in lookup table"
msgstr "設置查詢表單內候選字詞的排列方向"
-#: ../setup/setup.ui.h:43
+#: ../setup/setup.ui.h:42
msgid "Show information of the selected input method"
msgstr "顯示所選取的輸入法資訊"
-#: ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:44
msgid "Show input method's name on language bar when check the checkbox"
msgstr "當選取時在語言列上輸入法名稱"
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
msgid "Show language panel:"
msgstr "顯示語言面板："
-#: ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:46
msgid "Start ibus on login"
msgstr "在登入時啟動 IBus"
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
msgid "The shortcut keys for switching to previous input method in the list"
msgstr "用來切換到清單內上一個輸入法的快捷鍵"
-#: ../setup/setup.ui.h:51
+#: ../setup/setup.ui.h:50
msgid "Top left corner"
msgstr "左上角"
-#: ../setup/setup.ui.h:52
+#: ../setup/setup.ui.h:51
msgid "Top right corner"
msgstr "右上角"
-#: ../setup/setup.ui.h:53
+#: ../setup/setup.ui.h:52
#, fuzzy
msgid "Use custom font:"
msgstr "使用自訂字體"
-#: ../setup/setup.ui.h:56
+#: ../setup/setup.ui.h:55
msgid "Vertical"
msgstr "垂直"
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
msgid "When active"
msgstr "當啟用時"
+#~ msgid "Never"
+#~ msgstr "從不"
+
#~ msgid "Show in Status Icon menu"
#~ msgstr "在狀態圖示選單內顯示"
diff --git a/setup/main.py b/setup/main.py
index 8de4f42..4d8a328 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -137,7 +137,7 @@ class Setup(object):
# auto hide
self.__combobox_panel_show = self.__builder.get_object("combobox_panel_show")
self.__combobox_panel_show.set_active(
- self.__config.get_value("panel", "show", 1))
+ self.__config.get_value("panel", "show", 0))
self.__combobox_panel_show.connect("changed", self.__combobox_panel_show_changed_cb)
# panel position
diff --git a/setup/setup.ui b/setup/setup.ui
index a64a4cc..1c7df92 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -23,7 +23,7 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Never</col>
+ <col id="0" translatable="yes">Embedded in menu</col>
</row>
<row>
<col id="0" translatable="yes">When active</col>
@@ -31,9 +31,6 @@
<row>
<col id="0" translatable="yes">Always</col>
</row>
- <row>
- <col id="0" translatable="yes">Embedded in menu</col>
- </row>
</data>
</object>
<object class="GtkListStore" id="model_panel_position">
diff --git a/src/ibusengine.c b/src/ibusengine.c
index c367f14..494f7a3 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -456,6 +456,9 @@ ibus_engine_class_init (IBusEngineClass *klass)
/**
* IBusEngine::candidate-clicked:
* @engine: An IBusEngine.
+ * @index: Index of candidate be clicked.
+ * @button: Mouse button.
+ * @state: Keyboard state.
*
* Emitted when candidate on lookup table is clicked.
* Implement the member function candidate_clicked() in extended class to receive this signal.
@@ -478,6 +481,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
/**
* IBusEngine::property-activate:
* @engine: An IBusEngine.
+ * @name: Property name.
+ * @state: Property state.
*
* Emitted when a property is activated or change changed.
* Implement the member function property_activate() in extended class to receive this signal.
@@ -499,6 +504,7 @@ ibus_engine_class_init (IBusEngineClass *klass)
/**
* IBusEngine::property-show:
* @engine: An IBusEngine.
+ * @name: Property name.
*
* Emitted when a property is shown.
* Implement the member function property_side() in extended class to receive this signal.
@@ -519,6 +525,7 @@ ibus_engine_class_init (IBusEngineClass *klass)
/**
* IBusEngine::property-hide:
* @engine: An IBusEngine.
+ * @name: Property name.
*
* Emitted when a property is hidden.
* Implement the member function property_hide() in extended class to receive this signal.
diff --git a/src/ibusshare.c b/src/ibusshare.c
index f66a2d3..194b510 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -281,7 +281,6 @@ ibus_free_strv (gchar **strv)
g_free (strv);
}
-
void
ibus_init (void)
{
diff --git a/src/ibusshare.h b/src/ibusshare.h
index 26677a3..c33a372 100644
--- a/src/ibusshare.h
+++ b/src/ibusshare.h
@@ -258,8 +258,11 @@ guint ibus_keyval_from_name (const gchar *keyval_name);
* @strv: List of strings.
*
* Free a list of strings.
+ * Deprecated: This function has been deprecated and should
+ * not be used in newly written code.
*/
-void ibus_free_strv (gchar **strv);
+void ibus_free_strv (gchar **strv)
+ G_GNUC_DEPRECATED;
/**
* ibus_key_event_to_string:
diff --git a/src/ibustypes.h b/src/ibustypes.h
index 100eafa..583b534 100644
--- a/src/ibustypes.h
+++ b/src/ibustypes.h
@@ -87,7 +87,7 @@ typedef enum
IBUS_RELEASE_MASK = 1 << 30,
- IBUS_MODIFIER_MASK = 0x5c001fff
+ IBUS_MODIFIER_MASK = 0x5f001fff
} IBusModifierType;
/**
diff --git a/ui/gtk/languagebar.py b/ui/gtk/languagebar.py
index 0eea1fa..f22080f 100644
--- a/ui/gtk/languagebar.py
+++ b/ui/gtk/languagebar.py
@@ -66,7 +66,7 @@ class LanguageBar(gtk.Toolbar):
def __init__ (self):
super(LanguageBar, self).__init__()
- self.__show = 1
+ self.__show = 0
self.__enabled = False
self.__has_focus = False
self.__show_im_name = False
@@ -236,8 +236,8 @@ class LanguageBar(gtk.Toolbar):
return self.__enabled
def set_show(self, show):
- if show not in (0, 1, 2, 3):
- show = 1
+ if show not in (0, 1, 2):
+ show = 0
self.__show = show
if self.__has_focus:
self.focus_in()
@@ -263,8 +263,9 @@ class LanguageBar(gtk.Toolbar):
def register_properties(self, props):
self.__props = props
- if self.__show == 3:
+ if self.__show == 0:
return
+ # refresh items on labguage bar
self.__remove_properties()
# create new properties
for i, prop in enumerate(props):
@@ -295,7 +296,7 @@ class LanguageBar(gtk.Toolbar):
self.insert(item, i + 2)
def update_property(self, prop):
- if self.__show == 3 and self.__props:
+ if self.__show == 0 and self.__props:
list = self.__props.get_properties()
for i, p in enumerate(list):
if p.key == prop.key and p.type == prop.type:
@@ -324,24 +325,23 @@ class LanguageBar(gtk.Toolbar):
def focus_in(self):
self.__has_focus = True
self.__im_menu.set_sensitive(True)
- if self.__enabled:
- if self.__show in (1, 2):
- self.show_all()
- else:
- self.hide_all()
+ if (self.__show == 1 and self.__enabled) or self.__show == 2:
+ self.show_all()
+ else:
+ self.hide_all()
def focus_out(self):
self.__has_focus = False
self.__im_menu.set_sensitive(False)
- if self.__show in (0, 1, 3):
- self.hide_all()
- else:
+ if self.__show == 2:
self.show_all()
+ else:
+ self.hide_all()
def create_im_menu(self, menu):
if not self.__enabled:
return
- if self.__show != 3:
+ if self.__show != 0:
return
if not menu:
assert False
diff --git a/ui/gtk/panel.py b/ui/gtk/panel.py
index 87a45d6..0efc85b 100644
--- a/ui/gtk/panel.py
+++ b/ui/gtk/panel.py
@@ -263,7 +263,7 @@ class Panel(ibus.PanelBase):
self.__candidate_panel.set_orientation(orientation)
def __config_load_show(self):
- show = self.__config.get_value("panel", "show", 1)
+ show = self.__config.get_value("panel", "show", 0)
self.__language_bar.set_show(show)
def __config_load_position(self):