Fix make distcheck errors.

diff --git a/Makefile.am b/Makefile.am
index bb588e3..742f258 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,21 +29,11 @@ SUBDIRS =       \
        m4          \
        po          \
        docs        \
-       $(NULL)
-
-if ENABLE_PYTHON
-SUBDIRS +=      \
        ibus        \
        ui          \
        setup       \
-       $(NULL)
-endif
-
-if ENABLE_GCONF
-SUBDIRS +=      \
        gconf       \
        $(NULL)
-endif
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/configure.ac b/configure.ac
index 35a1cbe..134064f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -259,29 +259,19 @@ docs/Makefile
 docs/reference/Makefile
 docs/reference/ibus/Makefile
 m4/Makefile
+ibus/_config.py
+ibus/Makefile
+ibus/interface/Makefile
+ui/Makefile
+ui/gtk/Makefile
+ui/gtk/ibus-ui-gtk
+ui/gtk/gtkpanel.xml.in
+setup/Makefile
+setup/ibus-setup
+gconf/Makefile
+gconf/gconf.xml.in
 ])
 
-if test x"$enable_python" != x"no"; then
-    AC_CONFIG_FILES([
-    ibus/_config.py
-    ibus/Makefile
-    ibus/interface/Makefile
-    ui/Makefile
-    ui/gtk/Makefile
-    ui/gtk/ibus-ui-gtk
-    ui/gtk/gtkpanel.xml.in
-    setup/Makefile
-    setup/ibus-setup
-    ])
-fi
-
-if test x"$enable_gconf" != x"no"; then
-    AC_CONFIG_FILES([
-    gconf/Makefile
-    gconf/gconf.xml.in
-    ])
-fi
-
 AC_OUTPUT
 AC_MSG_RESULT([
 Build options:

diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 65de4ef..85ab66d 100644 (file)
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -22,45 +22,42 @@
 
 libibus = $(top_builddir)/src/libibus.la
 
-INCLUDES = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src \
+if ENABLE_GCONF
+libexec_PROGRAMS = \
+       ibus-gconf \
        $(NULL)
+endif
 
-AM_CFLAGS = \
+ibus_gconf_SOURCES = \
+       main.c \
+       config.c \
+       config.h \
+       $(NULL)
+ibus_gconf_CFLAGS = \
        @GLIB2_CFLAGS@ \
        @GCONF_CFLAGS@ \
        @DBUS_CFLAGS@ \
        -DG_LOG_DOMAIN=\"IBUS\" \
-       $(INCLUDES) \
+       -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
        $(NULL)
-AM_LDADD = \
+ibus_gconf_LDADD = \
        @GOBJECT2_LIBS@ \
        @GLIB2_LIBS@ \
        @GCONF_LIBS@ \
        @DBUS_LIBS@ \
        $(libibus) \
        $(NULL)
-
-libexec_PROGRAMS = \
-       ibus-gconf \
-       $(NULL)
-
-ibus_gconf_SOURCES = \
-       main.c \
-       config.c \
-       config.h \
-       $(NULL)
-ibus_gconf_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(NULL)
-ibus_gconf_LDADD = \
-       $(AM_LDADD) \
+ibus_gconf_DEPENDENCIES = \
+       $(libibus) \
        $(NULL)
 
+if ENABLE_GCONF
 component_DATA = \
        gconf.xml \
        $(NULL)
+endif
+
 componentdir = $(pkgdatadir)/component
 
 CLEANFILES = \

diff --git a/ibus/Makefile.am b/ibus/Makefile.am
index d1cd750..8fb8c58 100644 (file)
--- a/ibus/Makefile.am
+++ b/ibus/Makefile.am
@@ -23,6 +23,7 @@ SUBDIRS = \
        interface \
        $(NULL)
 
+if ENABLE_PYTHON
 ibus_PYTHON = \
        ascii.py \
        application.py \
@@ -57,6 +58,7 @@ nodist_ibus_PYTHON = \
        $(NULL)
 
 ibusdir = @pkgpythondir@
+endif
 
 EXTRA_DIST = \
        _config.py.in \

diff --git a/ibus/interface/Makefile.am b/ibus/interface/Makefile.am
index 49871ed..6a8db39 100644 (file)
--- a/ibus/interface/Makefile.am
+++ b/ibus/interface/Makefile.am
@@ -20,6 +20,7 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
+if ENABLE_PYTHON
 ibus_interface_PYTHON = \
        iconfig.py \
        ienginefactory.py \
@@ -32,6 +33,7 @@ ibus_interface_PYTHON = \
        $(NULL)
 
 ibus_interfacedir = @pkgpythondir@/interface
+endif
 
 CLEANFILES = \
        *.pyc \

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f0c45ea..cfa9c7c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,6 +14,7 @@ bus/dbusimpl.c
 bus/engineproxy.c
 bus/inputcontext.c
 bus/panelproxy.c
+bus/registry.c
 ibus/bus.py
 ibus/__init__.py
 ibus/_config.py.in

diff --git a/po/ar.po b/po/ar.po
index 339082c..acf4d20 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/as.po b/po/as.po
index 8737e15..5fd1031 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+0800\n"
 "PO-Revision-Date: 2009-12-11 12:13+0530\n"
 "Last-Translator: \n"
 "Language-Team: Assamese <>\n"

diff --git a/po/bn_IN.po b/po/bn_IN.po
index 3262fc1..85637b3 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/ca.po b/po/ca.po
index dc05ea3..8c8a86b 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/da.po b/po/da.po
index fcda6a3..25384f2 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/de.po b/po/de.po
index f4d231a..6735290 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+0800\n"
 "PO-Revision-Date: 2009-12-10 09:44+1000\n"
 "Last-Translator: Hedda Peters <hpeters@redhat.com>\n"
 "Language-Team: \n"

diff --git a/po/es.po b/po/es.po
index 56574bd..4a260a7 100644 (file)
--- 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-09 08:52+0000\n"
+"POT-Creation-Date: 2010-04-09 18:43+0800\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,8 +21,7 @@ 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"
 
@@ -47,8 +46,12 @@ 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"
@@ -86,10 +89,8 @@ 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"
 
@@ -97,26 +98,22 @@ 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"
 
@@ -138,12 +135,14 @@ 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"
@@ -182,8 +181,7 @@ 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"
 
@@ -191,8 +189,7 @@ 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"
 
@@ -244,13 +241,11 @@ 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:41
 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:42
 msgid "Show icon on system tray"
 msgstr "Mostrar un ícono en el área de notificación"
 
@@ -258,26 +253,33 @@ 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:44
 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 = Always hide, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+"El comportamiento del panel de idioma. 0 = Siempre oculto, 1 = Auto ocultar, "
+"2 = mostrar 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:48
 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:50
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Atajo de teclado para encender o apagar el método de entrada"
 
@@ -285,8 +287,7 @@ msgstr "Atajo de teclado para encender o apagar el método de entrada"
 msgid "Trigger shortcut keys"
 msgstr "Activadora de los Atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:22
-#: ../setup/setup.ui.h:53
+#: ../data/ibus.schemas.in.h:22 ../setup/setup.ui.h:53
 msgid "Use custom font"
 msgstr "Usar fuente personalizada"
 
@@ -298,13 +299,11 @@ 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:54
 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:55
 msgid "Use system keyboard layout"
 msgstr "Usar el diseño del teclado del sistema"
 
@@ -358,7 +357,9 @@ 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"
@@ -390,7 +391,9 @@ 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"
@@ -414,11 +417,15 @@ 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"
@@ -434,11 +441,15 @@ msgstr "Método de entrada anterior:"
 
 #: ../setup/setup.ui.h:38
 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
 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
 msgid "Set the orientation of candidates in lookup table"
@@ -450,7 +461,9 @@ msgstr "Mostrar información sobre el método de entrada seleccionado"
 
 #: ../setup/setup.ui.h:45
 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
 msgid "Show language panel:"
@@ -462,7 +475,8 @@ msgstr "Iniciar ibus al ingresar"
 
 #: ../setup/setup.ui.h:49
 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
 msgid "Top left corner"
@@ -490,18 +504,24 @@ 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 2e13f77..4959def 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+0800\n"
 "PO-Revision-Date: 2010-01-30 18:22+0100\n"
 "Last-Translator: Julien <julroy67@gmail.com>\n"
 "Language-Team: French <kde-i18n-doc@kde.org>\n"

diff --git a/po/gu.po b/po/gu.po
index 35ccf50..f8394fe 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+0800\n"
 "PO-Revision-Date: 2010-03-23 12:09+0530\n"
 "Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
 "Language-Team: Gujarati\n"

diff --git a/po/hi.po b/po/hi.po
index 1089d05..e9e2f46 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/hu.po b/po/hu.po
index 909d3b2..56939a4 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/it.po b/po/it.po
index 54e2c2f..dc96d6e 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+0800\n"
 "PO-Revision-Date: 2009-12-10 09:28+1000\n"
 "Last-Translator: \n"
 "Language-Team:  <it@li.org>\n"

diff --git a/po/ja.po b/po/ja.po
index 6df6a37..1fe9021 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/kn.po b/po/kn.po
index 751e778..969ca7e 100644 (file)
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+0800\n"
 "PO-Revision-Date: 2009-12-08 11:27+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: Kannada <kde-l10n-kn@kde.org>\n"

diff --git a/po/ko.po b/po/ko.po
index 907a59f..e22d86a 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/ml.po b/po/ml.po
index ffab3ca..117f71e 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+0800\n"
 "PO-Revision-Date: 2010-03-24 16:48+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"

diff --git a/po/or.po b/po/or.po
index 5281f73..2e60915 100644 (file)
--- a/po/or.po
+++ b/po/or.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus.master.or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+0800\n"
 "PO-Revision-Date: 2009-11-14 15:22+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <oriya-it@googlegroups.com>\n"

diff --git a/po/pa.po b/po/pa.po
index 964d55f..56233c5 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/pl.po b/po/pl.po
index 1a89115..7980055 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/ru.po b/po/ru.po
index a35d900..96e8e96 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+0800\n"
 "PO-Revision-Date: 2010-04-09 12:45\n"
 "Last-Translator: Yulia <ypoyarko@redhat.com>\n"
 "Language-Team: Russian\n"

diff --git a/po/sr.po b/po/sr.po
index fa05aff..fe0ae3a 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/sr@latin.po b/po/sr@latin.po
index cbe22ba..591de45 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/ta.po b/po/ta.po
index 79f88f1..15a6f2c 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/te.po b/po/te.po
index 1526b1e..cd7e4cb 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/vi.po b/po/vi.po
index 96cfdde..a95ff0f 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 761594e..c5c448f 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/zh_HK.po b/po/zh_HK.po
index 89246fc..b3f2bb6 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 92a5b58..31d8fab 100644 (file)
--- 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-09 11:19+0800\n"
+"POT-Creation-Date: 2010-04-09 18:43+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"

diff --git a/setup/Makefile.am b/setup/Makefile.am
index cd06e87..643bf48 100644 (file)
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -20,6 +20,7 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
+if ENABLE_PYTHON
 ibussetup_PYTHON = \
        main.py \
        icon.py \
@@ -36,10 +37,11 @@ ibussetup_DATA = \
 bin_SCRIPTS = ibus-setup
 ibussetupdir = $(pkgdatadir)/setup
 
-desktopdir = $(datadir)/applications
 desktop_in_files = ibus-setup.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktopdir = $(datadir)/applications
 @INTLTOOL_DESKTOP_RULE@
+endif
 
 CLEANFILES = \
        *.pyc \
@@ -49,7 +51,7 @@ CLEANFILES = \
 EXTRA_DIST = \
        ibus-setup.in \
        setup.ui \
-       $(desktop_in_files) \
+       ibus-setup.desktop.in \
        $(NULL)
 
 DISTCLEANFILES = \

diff --git a/src/test-bus.c b/src/test-bus.c
index 30e82bd..ff5301c 100644 (file)
--- a/src/test-bus.c
+++ b/src/test-bus.c
@@ -55,6 +55,7 @@ int main()
        g_debug ("Test ibusbus.c: passed.");
 
        /* Test ibusinputcontext.c */
+#if 0
        context = ibus_bus_create_input_context (bus, "test");
        ibus_input_context_set_capabilities (context, 0);
        ibus_input_context_disable (context);
@@ -70,6 +71,7 @@ int main()
        g_free (active_engine_name);
        g_object_unref (engine_desc);
        g_object_unref (context);
+#endif
        g_object_unref (bus);
 
        return 0;

diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index c78fcae..dccc755 100644 (file)
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -20,6 +20,7 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
+if ENABLE_PYTHON
 ui_gtk_PYTHON = \
        candidatepanel.py \
        handle.py \
@@ -43,6 +44,7 @@ component_DATA = \
        gtkpanel.xml \
        $(NULL)
 componentdir = $(pkgdatadir)/component
+endif
 
 CLEANFILES = \
        gtkpanel.xml \