rpms/ibus/F-11 ibus-HEAD.patch,1.16,1.17 ibus.spec,1.76,1.77

Tue May 26 12:02:31 UTC 2009

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31571

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Update ibus-HEAD.patch

ibus-HEAD.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -p -N -r 1.16 -r 1.17 ibus-HEAD.patch
Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus-HEAD.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17

--- ibus-HEAD.patch	25 May 2009 08:31:29 -0000	1.16
+++ ibus-HEAD.patch	26 May 2009 12:02:27 -0000	1.17
@@ -85,6 +85,4701 @@ index 8c9805d..b26797f 100644
      if (priv->capabilities & IBUS_CAP_PROPERTY) {
          bus_input_context_send_signal (context,
                                         "UpdateProperty",
+diff --git a/po/ar.po b/po/ar.po
+index 15c31e8..f59ac97 100644
+--- a/po/ar.po
++++ b/po/ar.po
+@@ -8,7 +8,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-04-06 11:45+0800\n"
++"POT-Creation-Date: 2009-05-26 07:38+0800\n"
+ "PO-Revision-Date: 2009-04-06 11:45+0800\n"
+ "Last-Translator: Muayyad Alsadi <alsadi at ojuba.org>\n"
+ "Language-Team: Arabic <AR at li.org>\n"
+@@ -50,23 +50,23 @@ msgstr "Muayyad Alsadi <alsadi at ojuba.org>"
+ msgid "Switch input method"
+ msgstr "ØªØ¨Ø¯ÙŠÙ„ Ø·Ø±ÙŠÙ‚Ø© Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„"
+ 
+-#: ../setup/main.py:103
++#: ../setup/main.py:104
+ msgid "trigger"
+ msgstr "Ø²Ù†Ø§Ø¯"
+ 
+-#: ../setup/main.py:113
++#: ../setup/main.py:114
+ msgid "next input method"
+ msgstr "Ø·Ø±ÙŠÙ‚Ø© Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„ Ø§Ù„ØªØ§Ù„ÙŠØ©"
+ 
+-#: ../setup/main.py:123
++#: ../setup/main.py:124
+ msgid "previous input method"
+ msgstr "Ø·Ø±ÙŠÙ‚Ø© Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„ Ø§Ù„Ø³Ø§Ø¨Ù‚Ø©"
+ 
+-#: ../setup/main.py:204
++#: ../setup/main.py:205
+ msgid "IBus daemon is not started. Do you want to start it now?"
+ msgstr "Ø®Ø§Ø¯Ù… IBUS Ù„Ù… ÙŠØ¨Ø¯Ø£ Ù…Ù† Ù‚Ø¨Ù„. Ù‡Ù„ ØªØ±ÙŠØ¯ ØªØ´ØºÙŠÙ„Ù‡ Ø§Ù„Ø¢Ù†ØŸ"
+ 
+-#: ../setup/main.py:219
++#: ../setup/main.py:220
+ msgid ""
+ "IBus has been started! If you can not use IBus, please add below lines in "
+ "$HOME/.bashrc, and relogin your desktop.\n"
+@@ -75,24 +75,24 @@ msgid ""
+ "  export QT_IM_MODULE=ibus"
+ msgstr ""
+ 
+-#: ../setup/main.py:234
++#: ../setup/main.py:235
+ #, python-format
+ msgid "Select keyboard shortcut for %s"
+ msgstr "Ø§Ø®ØªØ± Ø§Ù„Ø§Ø®ØªØµØ§Ø± Ù„ %s"
+ 
+-#: ../setup/keyboardshortcut.py:53
++#: ../setup/keyboardshortcut.py:54
+ msgid "Keyboard shortcuts"
+ msgstr "Ø§Ø®ØªØµØ§Ø±Ø§Øª Ù„ÙˆØØ© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
+ 
+-#: ../setup/keyboardshortcut.py:61
++#: ../setup/keyboardshortcut.py:65
+ msgid "Key code:"
+ msgstr "ÙƒÙˆØ¯ Ø§Ù„Ù…ÙØªØ§Ø"
+ 
+-#: ../setup/keyboardshortcut.py:76
++#: ../setup/keyboardshortcut.py:80
+ msgid "Modifiers:"
+ msgstr ""
+ 
+-#: ../setup/keyboardshortcut.py:206
++#: ../setup/keyboardshortcut.py:222
+ msgid ""
+ "Please press a key (or a key combination).\n"
+ "The dialog will be closed when the key is released."
+@@ -100,7 +100,7 @@ msgstr ""
+ "ÙØ¶Ù„Ø§ Ø§Ø¶ØºØ· Ù…ÙØªØ§Ø Ø£Ùˆ (Ø¹Ø¯Ø© Ù…ÙØ§ØªÙŠØ).\n"
+ "ØµÙ†Ø¯ÙˆÙ‚ Ø§Ù„ØÙˆØ§Ø± Ø³ÙŠØºÙ„Ù‚ Ø¹Ù†Ø¯ ØªØ±Ùƒ Ø§Ù„Ù…ÙØªØ§Ø."
+ 
+-#: ../setup/keyboardshortcut.py:208
++#: ../setup/keyboardshortcut.py:224
+ msgid "Please press a key (or a key combination)"
+ msgstr "ÙØ¶Ù„Ø§ Ø§Ø¶ØºØ· Ù…ÙØªØ§Ø Ø£Ùˆ Ø¹Ø¯Ø© Ù…ÙØ§ØªÙŠØ"
+ 
+@@ -141,26 +141,32 @@ msgstr ""
+ "\n"
+ 
+ #: ../setup/setup.glade.h:12
++msgid ""
++"<small><i>The default input method is the top one in the list.\n"
++"You may use up/down buttons to change it.</i></small>"
++msgstr ""
++
++#: ../setup/setup.glade.h:14
+ msgid "About"
+ msgstr "ØÙˆÙ„"
+ 
+-#: ../setup/setup.glade.h:13
++#: ../setup/setup.glade.h:15
+ msgid "Candidates orientation:"
+ msgstr "Ø§Ù„Ø§ØªØ¬Ø§Ù‡Ø§Øª Ø§Ù„Ù…Ø±Ø´ØØ©:"
+ 
+-#: ../setup/setup.glade.h:14
++#: ../setup/setup.glade.h:16
+ msgid "Custom font:"
+ msgstr "Ø®Ø· Ù…Ø®ØµØµ:"
+ 
+-#: ../setup/setup.glade.h:15
++#: ../setup/setup.glade.h:17
+ msgid "Enable or disable:"
+ msgstr "ØªÙØ¹ÙŠÙ‘Ù„ Ø£Ùˆ ØªØ«Ø¨ÙŠØ·:"
+ 
+-#: ../setup/setup.glade.h:16
++#: ../setup/setup.glade.h:18
+ msgid "General"
+ msgstr "Ø¹Ø§Ù…"
+ 
+-#: ../setup/setup.glade.h:17
++#: ../setup/setup.glade.h:19
+ msgid ""
+ "Horizontal\n"
+ "Vertical"
+@@ -168,15 +174,15 @@ msgstr ""
+ "Ø£ÙÙ‚ÙŠ\n"
+ "Ø¹Ù…ÙˆØ¯ÙŠ"
+ 
+-#: ../setup/setup.glade.h:19 ../setup/ibus-setup.desktop.in.h:1
++#: ../setup/setup.glade.h:21 ../setup/ibus-setup.desktop.in.h:1
+ msgid "IBus Preferences"
+ msgstr "ØªÙØ¶ÙŠÙ„Ø§Øª IBus"
+ 
+-#: ../setup/setup.glade.h:20
++#: ../setup/setup.glade.h:22
+ msgid "Input Methods"
+ msgstr "Ø·Ø±Ù‚ Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„"
+ 
+-#: ../setup/setup.glade.h:21
++#: ../setup/setup.glade.h:23
+ msgid ""
+ "Never\n"
+ "When active\n"
+@@ -186,23 +192,23 @@ msgstr ""
+ "Ø¹Ù†Ø¯ Ø§Ù„ØªÙØ¹ÙŠÙ„\n"
+ "Ø¯Ø§Ø¦Ù…Ø§"
+ 
+-#: ../setup/setup.glade.h:24
++#: ../setup/setup.glade.h:26
+ msgid "Next input method:"
+ msgstr "Ø·Ø±ÙŠÙ‚Ø© Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„ Ø§Ù„ØªØ§Ù„ÙŠØ©"
+ 
+-#: ../setup/setup.glade.h:25
++#: ../setup/setup.glade.h:27
+ msgid "Previous input method:"
+ msgstr "Ø·Ø±ÙŠÙ‚Ø© Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„ Ø§Ù„Ø³Ø§Ø¨Ù‚Ø©"
+ 
+-#: ../setup/setup.glade.h:26
++#: ../setup/setup.glade.h:28
+ msgid "Show language panel:"
+ msgstr "Ø¥Ø¸Ù‡Ø§Ø± Ù„ÙˆØØ© Ø§Ù„Ù„ØºØ§Øª:"
+ 
+-#: ../setup/setup.glade.h:27
++#: ../setup/setup.glade.h:29
+ msgid "Start ibus on login"
+ msgstr "Ø¨Ø¯Ø¡ ibus Ø¹Ù†Ø¯ Ø§Ù„ÙˆÙ„ÙˆØ¬"
+ 
+-#: ../setup/setup.glade.h:28
++#: ../setup/setup.glade.h:30
+ msgid "Use custom font"
+ msgstr "Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ø®Ø· Ù…Ø®ØµØµ"
+ 
+@@ -272,6 +278,5 @@ msgstr "Ø§Ø³ØªØ®Ø¯Ù… Ø®Ø· Ù…Ø®ØµØµ"
+ msgid "Use custom font name for language panel"
+ msgstr "Ø§Ø³ØªØ®Ø¯Ù… Ø®Ø· Ù…Ø®ØµØµ ÙÙŠ Ù„ÙˆØØ© Ø§Ù„Ù„ØºØ©"
+ 
+-#: ../data/ibus.schemas.in.h:17
+-msgid "[Control+space]"
+-msgstr "[Control+space]"
++#~ msgid "[Control+space]"
++#~ msgstr "[Control+space]"
+diff --git a/po/as.po b/po/as.po
+index 9b81669..b9ff58c 100644
+--- a/po/as.po
++++ b/po/as.po
+@@ -6,7 +6,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: ibus.master.ibus.as\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-04-06 11:45+0800\n"
++"POT-Creation-Date: 2009-05-26 07:38+0800\n"
+ "PO-Revision-Date: 2009-04-09 19:03+0530\n"
+ "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
[...4805 lines suppressed...]
++                                <child>
++                                  <widget class="GtkButton" id="button_engine_up">
++                                    <property name="label">gtk-go-up</property>
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">True</property>
++                                    <property name="use_stock">True</property>
++                                  </widget>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">2</property>
++                                  </packing>
++                                </child>
+                                 <child>
+-                                  <placeholder/>
++                                  <widget class="GtkButton" id="button_engine_down">
++                                    <property name="label">gtk-go-down</property>
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">True</property>
++                                    <property name="use_stock">True</property>
++                                  </widget>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">3</property>
++                                  </packing>
+                                 </child>
+                               </widget>
+-                              <packing>
+-                                <property name="position">1</property>
+-                              </packing>
+                             </child>
+                           </widget>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="position">1</property>
++                          </packing>
+                         </child>
+                       </widget>
++                      <packing>
++                        <property name="position">0</property>
++                      </packing>
+                     </child>
+                     <child>
+-                      <widget class="GtkAlignment" id="alignment2">
++                      <widget class="GtkAlignment" id="alignment8">
+                         <property name="visible">True</property>
+-                        <property name="left_padding">12</property>
++                        <property name="top_padding">6</property>
+                         <child>
+-                          <widget class="GtkVButtonBox" id="vbuttonbox1">
++                          <widget class="GtkHBox" id="hbox8">
+                             <property name="visible">True</property>
+-                            <property name="spacing">5</property>
+-                            <property name="layout_style">GTK_BUTTONBOX_START</property>
+-                            <child>
+-                              <widget class="GtkButton" id="button_engine_add">
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="label">gtk-add</property>
+-                                <property name="use_stock">True</property>
+-                                <property name="response_id">0</property>
+-                              </widget>
+-                            </child>
+-                            <child>
+-                              <widget class="GtkButton" id="button_engine_remove">
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="label">gtk-remove</property>
+-                                <property name="use_stock">True</property>
+-                                <property name="response_id">0</property>
+-                              </widget>
+-                              <packing>
+-                                <property name="position">1</property>
+-                              </packing>
+-                            </child>
++                            <property name="spacing">6</property>
+                             <child>
+-                              <widget class="GtkButton" id="button_engine_up">
++                              <widget class="GtkImage" id="image1">
+                                 <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="label">gtk-go-up</property>
+-                                <property name="use_stock">True</property>
+-                                <property name="response_id">0</property>
++                                <property name="stock">gtk-info</property>
++                                <property name="icon-size">2</property>
+                               </widget>
+                               <packing>
+-                                <property name="position">2</property>
++                                <property name="expand">False</property>
++                                <property name="position">0</property>
+                               </packing>
+                             </child>
+                             <child>
+-                              <widget class="GtkButton" id="button_engine_down">
++                              <widget class="GtkLabel" id="label11">
+                                 <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="label">gtk-go-down</property>
+-                                <property name="use_stock">True</property>
+-                                <property name="response_id">0</property>
++                                <property name="xalign">0</property>
++                                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;The default input method is the top one in the list.
++You may use up/down buttons to change it.&lt;/i&gt;&lt;/small&gt;</property>
++                                <property name="use_markup">True</property>
+                               </widget>
+                               <packing>
+-                                <property name="position">3</property>
++                                <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </widget>
+@@ -465,9 +547,9 @@ Always</property>
+                 <property name="label" translatable="yes">Input Methods</property>
+               </widget>
+               <packing>
+-                <property name="type">tab</property>
+                 <property name="position">1</property>
+                 <property name="tab_fill">False</property>
++                <property name="type">tab</property>
+               </packing>
+             </child>
+             <child>
+@@ -487,7 +569,7 @@ Homepage: http://code.google.com/p/ibus
+ 
+ </property>
+                     <property name="use_markup">True</property>
+-                    <property name="justify">GTK_JUSTIFY_CENTER</property>
++                    <property name="justify">center</property>
+                   </widget>
+                   <packing>
+                     <property name="position">1</property>
+@@ -497,7 +579,7 @@ Homepage: http://code.google.com/p/ibus
+                   <widget class="GtkFrame" id="frame1">
+                     <property name="no_show_all">True</property>
+                     <property name="label_xalign">0</property>
+-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
++                    <property name="shadow_type">none</property>
+                     <child>
+                       <widget class="GtkAlignment" id="alignment7">
+                         <property name="visible">True</property>
+@@ -505,11 +587,11 @@ Homepage: http://code.google.com/p/ibus
+                         <property name="left_padding">12</property>
+                         <child>
+                           <widget class="GtkCheckButton" id="checkbutton_auto_start">
++                            <property name="label" translatable="yes">Start ibus on login</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">Start ibus on login</property>
++                            <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                         </child>
+@@ -543,26 +625,34 @@ Homepage: http://code.google.com/p/ibus
+                 <property name="label" translatable="yes">About</property>
+               </widget>
+               <packing>
+-                <property name="type">tab</property>
+                 <property name="position">2</property>
+                 <property name="tab_fill">False</property>
++                <property name="type">tab</property>
+               </packing>
+             </child>
+           </widget>
++          <packing>
++            <property name="position">0</property>
++          </packing>
+         </child>
+         <child>
+           <widget class="GtkHButtonBox" id="hbuttonbox1">
+             <property name="visible">True</property>
+             <property name="spacing">12</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <property name="layout_style">end</property>
+             <child>
+               <widget class="GtkButton" id="button_close">
++                <property name="label">gtk-close</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="label">gtk-close</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">0</property>
+               </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
+             </child>
+           </widget>
+           <packing>
 diff --git a/ui/gtk/panel.py b/ui/gtk/panel.py
 index 2640c65..534a394 100644
 --- a/ui/gtk/panel.py


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- ibus.spec	25 May 2009 08:38:10 -0000	1.76
+++ ibus.spec	26 May 2009 12:02:28 -0000	1.77
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090508
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -228,6 +228,11 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue May 26 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090508-5
+- Update ibus-HEAD.patch.
+- Show the default input method with bold text
+- Add information text below input methods list
+
 * Mon May 25 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090508-4
 - Update ibus-HEAD.patch.
 - Fix bug 501211 - ibus-setup window should be raised if running or just stay on top/grab focus


