diff -Nru ibus-1.5.4/ChangeLog ibus-1.5.5/ChangeLog --- ibus-1.5.4/ChangeLog 2013-09-20 12:22:01.000000000 +0900 +++ ibus-1.5.5/ChangeLog 2014-01-14 13:03:43.000000000 +0900 @@ -1,3 +1,292 @@ +commit 4e860c1ef4d056c91e63f3c39a67800ed3e8e5bc +Author: fujiwarat +Date: 2014-01-14 12:50:34 +0900 + + Release 1.5.5 + + Review URL: https://codereview.appspot.com/41200044 + +M configure.ac + +commit 7587b8e6a2f690dd52fcabc2e0da31062fb02128 +Author: fujiwarat +Date: 2014-01-08 16:36:47 +0900 + + Hide Property Panel when input cursor or preedit text is changed. + + BUG=http://code.google.com/p/ibus/issues/detail?id=1659 + TEST=ui/gtk3/ibus-ui-gtk3 + + Review URL: https://codereview.appspot.com/45510043 + +M data/ibus.schemas.in +M ui/gtk3/panel.vala +M ui/gtk3/propertypanel.vala + +commit 8ce7ac6088e440ee539ed3299d9a219aac1c8089 +Author: fujiwarat +Date: 2013-12-18 11:39:40 +0900 + + Hide Property Panel if engines have no properties. + + If engines have no properites, Property Panel does not have to be shown. + Also resize the topdevel window when engines are switched. + + TEST=ui/gtk3/ibus-ui-gtk3 + + Review URL: https://codereview.appspot.com/43260043 + +M ui/gtk3/propertypanel.vala + +commit dddd29edaf32d31e1c98047288c54a23edb5979b +Author: fujiwarat +Date: 2013-12-17 12:02:56 +0900 + + Add Property Panel to show IME properties. + + Currently GtkStatusIcon can show one icon only while GtkApplet shows + multiple icons. IBus GTK Panel icon shows the IBus engine icon + however each IBus engine provides the properties and currently it can + be show only when users click the panel icon and show the activate menu. + Users wish to know the some of the properties without clicking the icon. + + Property Panel offers a window which shows engine properties' icon + at input cursor. It's similar to Language Panel in IBus 1.4. + + Property Panel is shown in only 3 seconds whenever client applications + get focus-in event or any of engine properties are changed, + e.g. InputMode is changed from Hiragana to Eisu, + in case gsettings panel.show is AUTO_HIDE (by default). + Property Panel is always hidden in case panel.show is DO_NOT_SHOW. + Property Panel is always shown in case panel.show is ALWAYS. + + BUG=http://code.google.com/p/ibus/issues/detail?id=1659 + TEST=ui/gtk3/ibus-ui-gtk3 + + Review URL: https://codereview.appspot.com/40870046 + +M data/ibus.schemas.in +M setup/setup.ui +M src/ibusattrlist.c +M ui/gtk3/Makefile.am +M ui/gtk3/panel.vala +M ui/gtk3/property.vala +A ui/gtk3/propertypanel.vala + +commit e0ca43cb4e72e1390750addf6407074ee32a955a +Author: fujiwarat +Date: 2013-12-13 11:56:41 +0900 + + Remove -Werror in autogen.sh since the build still have errors. + + Review URL: https://codereview.appspot.com/38250043 + +M autogen.sh + +commit e99a1b0fda7214ff9332a7619b02772a8ae38602 +Author: fujiwarat +Date: 2013-12-11 12:30:46 +0900 + + Update translations. + + Update po/bn.po po/bn_IN.po po/da.po po/de.po po/es.po po/fr.po + po/ja.po po/kn.po po/ko.po po/nl.po po/pl.po po/ru.po po/ta.po + po/te.po po/uk.po po/zh_CN.po + + Review URL: https://codereview.appspot.com/35340043 + +M po/LINGUAS +A po/bn.po +M po/bn_IN.po +M po/da.po +M po/de.po +M po/es.po +M po/fr.po +M po/ja.po +M po/kn.po +M po/ko.po +M po/nl.po +M po/pl.po +M po/ru.po +M po/ta.po +M po/te.po +M po/uk.po +M po/zh_CN.po + +commit bf18adb00f2e6f656c35ab2ee169db6f38be5fbe +Author: fujiwarat +Date: 2013-12-06 11:45:04 +0900 + + Fix candidate panel not to be out of screen. + + BUG=http://code.google.com/p/ibus/issues/detail?id=1676 + TEST=ui/gtk3/ibus-ui-gtk3 + + Review URL: https://codereview.appspot.com/35800045 + +M ui/gtk3/candidatepanel.vala + +commit 291bacf99d6da1e7f3952784e83d45400254b15b +Author: fujiwarat +Date: 2013-11-27 11:29:58 +0900 + + Delete the up/down button message on ibus-setup. + + BUG=http://code.google.com/p/ibus/issues/detail?id=1675 + TEST=ibus-setup + + Review URL: https://codereview.appspot.com/32630043 + +M setup/setup.ui + +commit 4b20ca1b98265fde358a2863a954b49f61d79921 +Author: Maroš Zaťko +Date: 2013-11-26 14:10:03 +0900 + + simple.xml.in: add Slovak qwerty layout variant + + Review URL: https://codereview.appspot.com/32030043 + Patch from Maroš Zaťko . + +M engine/simple.xml.in + +commit f35184a187b787e8507cb1e34b24dc0575fad838 +Author: fujiwarat +Date: 2013-11-05 18:12:41 +0900 + + Fix gir annotations. + + TEST=g-ir-scanner@src + + Review URL: https://codereview.appspot.com/18100044 + +M engine/Makefile.am +M src/ibusattribute.h +M src/ibusattrlist.h +M src/ibuscomponent.h +M src/ibusconfig.h +M src/ibusconfigservice.h +M src/ibusdebug.h +M src/ibusengine.h +M src/ibusenginedesc.h +M src/ibusenumtypes.h.template +M src/ibuserror.h +M src/ibusfactory.h +M src/ibushotkey.h +M src/ibusinputcontext.c +M src/ibuskeymap.h +M src/ibuskeysyms-compat.h +M src/ibuskeyuni.c +M src/ibuslookuptable.h +M src/ibusobject.c +M src/ibusobject.h +M src/ibusobservedpath.h +M src/ibuspanelservice.c +M src/ibusproplist.h +M src/ibusproxy.h +M src/ibusserializable.h +M src/ibusservice.h +M src/ibusshare.h +M src/ibustext.h +M src/ibustypes.h +M src/ibusutil.h +M src/ibusversion.h.in +M src/ibusxml.h + +commit 6488b87792b81d20ceeb5f3f69381887e12bf4c7 +Author: Eduardo Lima (Etrunko) +Date: 2013-11-05 18:07:33 +0900 + + Wayland: Fix Small typo + + BUG=http://code.google.com/p/ibus/issues/detail?id=1671 + TEST=client/wayland/ibus-wayland + + Review URL: https://codereview.appspot.com/18780044 + Patch from Eduardo Lima (Etrunko) . + +M client/wayland/main.c + +commit e64b25c0ab8fadeae97fe78dcfcbc3a5d0869c6b +Author: fujiwarat +Date: 2013-11-01 11:19:39 +0900 + + Update en-us compose table and add locale tables for xkb engines. + + BUG=RH#1013651 + TEST=engine/ibus-engine-simple, src/libibus.so + + Review URL: https://codereview.appspot.com/14465046 + +M bindings/vala/Makefile.am +A bindings/vala/ibus-private.vapi +M engine/Makefile.am +M engine/main.vala +A engine/test-compose.vala +M src/Makefile.am +A src/gencomposetable.c +M src/gtkimcontextsimpleseqs.h +A src/ibuscomposetable.h +M src/ibusenginesimple.c +M src/ibusenginesimple.h +M src/ibuskeysyms.h +M tools/main.vala + +commit 9596aea2e2df4cd3ac9b795ad9f354723cf83317 +Author: fujiwarat +Date: 2013-10-02 10:58:36 +0900 + + Always save the content-type cache for gnome-shell password. + + GDBusProxy updates the cache immediatelly with the first call only + and has to save the next call in the cache by manual. + + BUG=RH#1013948 + TEST=password on gnome-shell 3.10. + + Review URL: https://codereview.appspot.com/14196043 + +M bus/engineproxy.c + +commit b8f36164d9b405d95bdcb76e38daca6c531e7da5 +Author: fujiwarat +Date: 2013-10-02 10:55:09 +0900 + + Implement lookup-table-orientation in ibus-ui-gtk3. + + BUG=RH#1012781 + TEST=ui/gtk3/ibus-ui-gtk3 + + Review URL: https://codereview.appspot.com/14198043 + +M ui/gtk3/panel.vala + +commit d41791da67ac66665868f18fc447f2fc2a6ce75a +Author: fujiwarat +Date: 2013-10-02 10:49:47 +0900 + + Replace datadir/man with mandir. + + BUG=http://code.google.com/p/ibus/issues/detail?id=1660 + TEST=make install + + Review URL: https://codereview.appspot.com/14119043 + +M bus/Makefile.am +M setup/Makefile.am +M tools/Makefile.am + +commit a3f47e6509f19c6f11fca0328d63e973daec48ab +Author: Julien Humbert +Date: 2013-10-02 10:45:32 +0900 + + Add french layout variant oss to simple engine + + Review URL: https://codereview.appspot.com/14115044 + Patch from Julien Humbert . + +M engine/simple.xml.in + commit f4b09140783834cb19e3bd7dcf63671ec304b9dd Author: fujiwarat Date: 2013-09-20 11:39:25 +0900 diff -Nru ibus-1.5.4/aclocal.m4 ibus-1.5.5/aclocal.m4 --- ibus-1.5.4/aclocal.m4 2013-09-20 12:17:15.000000000 +0900 +++ ibus-1.5.5/aclocal.m4 2014-01-14 13:00:16.000000000 +0900 @@ -552,7 +552,6 @@ dnl glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl GLIB_LC_MESSAGES GLIB_WITH_NLS @@ -989,6 +988,21 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru ibus-1.5.4/autogen.sh ibus-1.5.5/autogen.sh --- ibus-1.5.4/autogen.sh 2013-09-20 12:15:51.000000000 +0900 +++ ibus-1.5.5/autogen.sh 2014-01-14 12:59:14.000000000 +0900 @@ -22,7 +22,7 @@ touch $srcdir/ChangeLog } -CFLAGS=${CFLAGS-"-Wall -Werror -Wformat -Werror=format-security"} +CFLAGS=${CFLAGS-"-Wall -Wformat -Werror=format-security"} # need --enable-gtk-doc for gnome-autogen.sh to make dist ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.11 CFLAGS="$CFLAGS" . gnome-autogen.sh "$@" diff -Nru ibus-1.5.4/bindings/vala/Makefile.am ibus-1.5.5/bindings/vala/Makefile.am --- ibus-1.5.4/bindings/vala/Makefile.am 2013-09-20 12:15:50.000000000 +0900 +++ ibus-1.5.5/bindings/vala/Makefile.am 2014-01-14 12:59:14.000000000 +0900 @@ -49,6 +49,7 @@ IBus-1.0.metadata \ IBus-1.0-custom.vala \ ibus-1.0.deps \ + ibus-private.vapi \ config.vapi \ xi.vapi \ $(NULL) diff -Nru ibus-1.5.4/bindings/vala/Makefile.in ibus-1.5.5/bindings/vala/Makefile.in --- ibus-1.5.4/bindings/vala/Makefile.in 2013-09-20 12:17:23.000000000 +0900 +++ ibus-1.5.5/bindings/vala/Makefile.in 2014-01-14 13:00:21.000000000 +0900 @@ -431,6 +431,7 @@ IBus-1.0.metadata \ IBus-1.0-custom.vala \ ibus-1.0.deps \ + ibus-private.vapi \ config.vapi \ xi.vapi \ $(NULL) diff -Nru ibus-1.5.4/bindings/vala/ibus-1.0.vapi ibus-1.5.5/bindings/vala/ibus-1.0.vapi --- ibus-1.5.4/bindings/vala/ibus-1.0.vapi 2013-09-20 12:19:54.000000000 +0900 +++ ibus-1.5.5/bindings/vala/ibus-1.0.vapi 2014-01-14 13:02:11.000000000 +0900 @@ -1,4 +1,4 @@ -/* ibus-1.0.vapi generated by vapigen-0.20, do not modify. */ +/* ibus-1.0.vapi generated by vapigen-0.22, do not modify. */ [CCode (cprefix = "IBus", gir_namespace = "IBus", gir_version = "1.0", lower_case_cprefix = "ibus_")] namespace IBus { @@ -281,6 +281,7 @@ [CCode (has_construct_function = false)] protected EngineSimple (); public void add_table ([CCode (array_length = false)] uint16[] data, int max_seq_len, int n_seqs); + public bool add_table_by_locale (string? locale); } [CCode (cheader_filename = "ibus.h", type_id = "ibus_factory_get_type ()")] public class Factory : IBus.Service { @@ -346,7 +347,7 @@ public signal void show_auxiliary_text (); public signal void show_lookup_table (); public signal void show_preedit_text (); - public signal void update_auxiliary_text (IBus.Text object, bool p0); + public signal void update_auxiliary_text (IBus.Text text, bool visible); public signal void update_lookup_table (IBus.LookupTable table, bool visible); public signal void update_preedit_text (IBus.Text text, uint cursor_pos, bool visible); public signal void update_property (IBus.Property prop); @@ -358,6 +359,7 @@ public weak string name; [CCode (has_construct_function = false)] public Keymap (string name); + public static IBus.Keymap @get (string name); public uint lookup_keysym (uint16 keycode, uint32 state); } [CCode (cheader_filename = "ibus.h", type_id = "ibus_lookup_table_get_type ()")] @@ -412,6 +414,7 @@ public ObservedPath (string path, bool fill_stat); public bool check_modification (); public void output (GLib.StringBuilder output, int indent); + public GLib.List traverse (bool dir_only); } [CCode (cheader_filename = "ibus.h", type_id = "ibus_panel_service_get_type ()")] public class PanelService : IBus.Service { @@ -719,7 +722,7 @@ [CCode (cheader_filename = "ibus.h", has_target = false)] public delegate void FreeFunc (void* object); [CCode (cheader_filename = "ibus.h", has_target = false)] - public delegate void ObjectDestroyFunc (IBus.Object arg0); + public delegate void ObjectDestroyFunc (IBus.Object object); [CCode (cheader_filename = "ibus.h", has_target = false)] public delegate bool SerializableCopyFunc (IBus.Serializable dest, IBus.Serializable src); [CCode (cheader_filename = "ibus.h", has_target = false)] @@ -2984,6 +2987,8 @@ public const int KEY_ENG; [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_ETH")] public const int KEY_ETH; + [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_EZH")] + public const int KEY_EZH; [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_Eabovedot")] public const int KEY_Eabovedot; [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_Eacute")] @@ -5394,6 +5399,8 @@ public const int KEY_dead_e; [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_dead_grave")] public const int KEY_dead_grave; + [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_dead_greek")] + public const int KEY_dead_greek; [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_dead_hook")] public const int KEY_dead_hook; [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_dead_horn")] @@ -5544,6 +5551,8 @@ public const int KEY_exclam; [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_exclamdown")] public const int KEY_exclamdown; + [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_ezh")] + public const int KEY_ezh; [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_f")] public const int KEY_f; [CCode (cheader_filename = "ibus.h", cname = "IBUS_KEY_fabovedot")] diff -Nru ibus-1.5.4/bindings/vala/ibus-private.vapi ibus-1.5.5/bindings/vala/ibus-private.vapi --- ibus-1.5.4/bindings/vala/ibus-private.vapi 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.5.5/bindings/vala/ibus-private.vapi 2014-01-14 12:59:14.000000000 +0900 @@ -0,0 +1,22 @@ +[CCode (cprefix = "IBusCompose", gir_namespace = "IBus", gir_version = "1.0", lower_case_cprefix = "ibus_compose_")] +namespace IBusCompose { + [Compact] + [CCode (cname = "IBusComposeTable", destroy_function = "", cheader_filename = "ibuscomposetable.h")] + public struct Table { + public const uint16[] data; + public int max_seq_len; + public int n_seqs; + } + [CCode (cname = "ibus_compose_seqs_el_gr", cheader_filename = "ibuscomposetable.h")] + public const uint16[] seqs_el_gr; + [CCode (cname = "ibus_compose_table_el_gr", cheader_filename = "ibuscomposetable.h")] + public const Table table_el_gr; + [CCode (cname = "ibus_compose_seqs_fi_fi", cheader_filename = "ibuscomposetable.h")] + public const uint16[] seqs_fi_fi; + [CCode (cname = "ibus_compose_table_fi_fi", cheader_filename = "ibuscomposetable.h")] + public const Table table_fi_fi; + [CCode (cname = "ibus_compose_seqs_pt_br", cheader_filename = "ibuscomposetable.h")] + public const uint16[] seqs_pt_br; + [CCode (cname = "ibus_compose_table_pt_br", cheader_filename = "ibuscomposetable.h")] + public const Table table_pt_br; +} diff -Nru ibus-1.5.4/bus/Makefile.am ibus-1.5.5/bus/Makefile.am --- ibus-1.5.4/bus/Makefile.am 2013-09-20 12:15:51.000000000 +0900 +++ ibus-1.5.5/bus/Makefile.am 2014-01-14 12:59:14.000000000 +0900 @@ -166,7 +166,7 @@ man_one_in_files = ibus-daemon.1.in man_one_files = $(man_one_in_files:.1.in=.1) man_one_DATA =$(man_one_files:.1=.1.gz) -man_onedir = $(datadir)/man/man1 +man_onedir = $(mandir)/man1 %.1: %.1.in $(AM_V_GEN) sed \ -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ diff -Nru ibus-1.5.4/bus/Makefile.in ibus-1.5.5/bus/Makefile.in --- ibus-1.5.4/bus/Makefile.in 2013-09-20 12:17:23.000000000 +0900 +++ ibus-1.5.5/bus/Makefile.in 2014-01-14 13:00:21.000000000 +0900 @@ -811,7 +811,7 @@ man_one_in_files = ibus-daemon.1.in man_one_files = $(man_one_in_files:.1.in=.1) man_one_DATA = $(man_one_files:.1=.1.gz) -man_onedir = $(datadir)/man/man1 +man_onedir = $(mandir)/man1 all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am diff -Nru ibus-1.5.4/bus/engineproxy.c ibus-1.5.5/bus/engineproxy.c --- ibus-1.5.4/bus/engineproxy.c 2013-09-20 12:15:51.000000000 +0900 +++ ibus-1.5.5/bus/engineproxy.c 2014-01-14 12:59:14.000000000 +0900 @@ -1159,6 +1159,11 @@ NULL, NULL, NULL); + + /* Need to update the cache by manual since there is a timing issue. */ + g_dbus_proxy_set_cached_property ((GDBusProxy *) engine, + "ContentType", + content_type); } if (cached_content_type != NULL) diff -Nru ibus-1.5.4/client/wayland/main.c ibus-1.5.5/client/wayland/main.c --- ibus-1.5.4/client/wayland/main.c 2013-09-20 12:15:51.000000000 +0900 +++ ibus-1.5.5/client/wayland/main.c 2014-01-14 12:59:14.000000000 +0900 @@ -538,8 +538,8 @@ wlim->modifiers |= IBUS_META_MASK; wl_input_method_context_modifiers (context, serial, - mods_depressed, mods_depressed, - mods_latched, group); + mods_depressed, mods_latched, + mods_locked, group); } static const struct wl_keyboard_listener keyboard_listener = { diff -Nru ibus-1.5.4/config.guess ibus-1.5.5/config.guess --- ibus-1.5.4/config.guess 2013-09-20 12:17:22.000000000 +0900 +++ ibus-1.5.5/config.guess 2014-01-14 13:00:21.000000000 +0900 @@ -1,8 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2012-12-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,7 +26,7 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD @@ -50,7 +52,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,27 +136,6 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - ;; -esac - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -874,21 +857,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -901,54 +884,59 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo ${UNAME_MACHINE}-unknown-linux-gnueabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -967,63 +955,54 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-gnu exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1256,21 +1235,19 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) diff -Nru ibus-1.5.4/config.sub ibus-1.5.5/config.sub --- ibus-1.5.4/config.sub 2013-09-20 12:17:22.000000000 +0900 +++ ibus-1.5.5/config.sub 2014-01-14 13:00:21.000000000 +0900 @@ -1,8 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2013-04-24' +timestamp='2012-12-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +70,9 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -252,7 +256,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arceb \ + | arc \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ @@ -286,17 +290,16 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ + | nios | nios2 \ | ns16k | ns32k \ | open8 \ - | or1k | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -366,7 +369,7 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -404,13 +407,12 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -1352,7 +1354,7 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1498,6 +1500,9 @@ -aros*) os=-aros ;; + -kaos*) + os=-kaos + ;; -zvmoe) os=-zvmoe ;; @@ -1589,9 +1594,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -Nru ibus-1.5.4/configure ibus-1.5.5/configure --- ibus-1.5.4/configure 2013-09-20 12:17:17.000000000 +0900 +++ ibus-1.5.5/configure 2014-01-14 13:00:18.000000000 +0900 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ibus 1.5.4. +# Generated by GNU Autoconf 2.69 for ibus 1.5.5. # # Report bugs to . # @@ -650,8 +650,8 @@ # Identity of this package. PACKAGE_NAME='ibus' PACKAGE_TARNAME='ibus' -PACKAGE_VERSION='1.5.4' -PACKAGE_STRING='ibus 1.5.4' +PACKAGE_VERSION='1.5.5' +PACKAGE_STRING='ibus 1.5.5' PACKAGE_BUGREPORT='http://code.google.com/p/ibus/issues/entry' PACKAGE_URL='' @@ -1640,7 +1640,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ibus 1.5.4 to adapt to many kinds of systems. +\`configure' configures ibus 1.5.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1710,7 +1710,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ibus 1.5.4:";; + short | recursive ) echo "Configuration of ibus 1.5.5:";; esac cat <<\_ACEOF @@ -1924,7 +1924,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ibus configure 1.5.4 +ibus configure 1.5.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2293,7 +2293,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ibus $as_me 1.5.4, which was +It was created by ibus $as_me 1.5.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3174,7 +3174,7 @@ # Define the identity of the package. PACKAGE='ibus' - VERSION='1.5.4' + VERSION='1.5.5' cat >>confdefs.h <<_ACEOF @@ -4735,13 +4735,13 @@ # Define sustituted variables: IBUS_MAJOR_VERSION=1 IBUS_MINOR_VERSION=5 -IBUS_MICRO_VERSION=4 +IBUS_MICRO_VERSION=5 IBUS_ABI_CURRENT=5 -IBUS_ABI_REVISION=504 +IBUS_ABI_REVISION=505 IBUS_ABI_AGE=0 -IBUS_VERSION=1.5.4 +IBUS_VERSION=1.5.5 IBUS_API_VERSION=1.0 -IBUS_BINARY_VERSION=1.5.0.504 +IBUS_BINARY_VERSION=1.5.0.505 @@ -4763,7 +4763,7 @@ -LT_VERSION_INFO="5:504:0" +LT_VERSION_INFO="5:505:0" LT_CURRENT_MINUS_AGE=5 @@ -5509,7 +5509,7 @@ # For dislpay date. -DATE_DISPLAY="Fri Sep 20 2013" +DATE_DISPLAY="Tue Jan 14 2014" @@ -9892,7 +9892,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -9910,7 +9910,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -9929,7 +9932,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -20070,7 +20076,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ibus $as_me 1.5.4, which was +This file was extended by ibus $as_me 1.5.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20136,7 +20142,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ibus config.status 1.5.4 +ibus config.status 1.5.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru ibus-1.5.4/configure.ac ibus-1.5.5/configure.ac --- ibus-1.5.4/configure.ac 2013-09-20 12:15:58.000000000 +0900 +++ ibus-1.5.5/configure.ac 2014-01-14 12:59:31.000000000 +0900 @@ -26,7 +26,7 @@ m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [5]) -m4_define([ibus_micro_version], [4]) +m4_define([ibus_micro_version], [5]) m4_define([ibus_abi_current], [5]) m4_define([ibus_abi_revision], [m4_eval(100 * ibus_minor_version + ibus_micro_version)]) diff -Nru ibus-1.5.4/data/dconf/00-upstream-settings ibus-1.5.5/data/dconf/00-upstream-settings --- ibus-1.5.4/data/dconf/00-upstream-settings 2013-09-20 12:20:01.000000000 +0900 +++ ibus-1.5.5/data/dconf/00-upstream-settings 2014-01-14 13:02:16.000000000 +0900 @@ -28,9 +28,10 @@ triggers=['space'] [desktop/ibus/panel] +auto-hide-timeout=10000 custom-font='Sans 10' lookup-table-orientation=1 -show=0 +show=1 show-icon-on-systray=true show-im-name=false use-custom-font=false diff -Nru ibus-1.5.4/data/dconf/org.freedesktop.ibus.gschema.xml.in ibus-1.5.5/data/dconf/org.freedesktop.ibus.gschema.xml.in --- ibus-1.5.4/data/dconf/org.freedesktop.ibus.gschema.xml.in 2013-09-20 12:20:00.000000000 +0900 +++ ibus-1.5.5/data/dconf/org.freedesktop.ibus.gschema.xml.in 2014-01-14 13:02:16.000000000 +0900 @@ -1 +1,141 @@ -[]Preload enginesPreload engines during ibus starts up[]Engines orderSaved engines order in input method list400Popup delay milliseconds for IME switcher windowSet popup delay milliseconds to show IME switcher window. The default is 400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show the window and switch prev/next engines.''Saved version numberThe saved version number will be used to check the difference between the version of the previous installed ibus and one of the current ibus.falseUse system keyboard layoutUse system keyboard (XKB) layouttrueEmbed Preedit TextEmbed Preedit Text in Application WindowtrueUse global input methodShare the same input method among all applicationsfalseEnable input method by defaultEnable input method by default when the application gets input focus[ '/desktop/ibus/engine/pinyin', '/desktop/ibus/engine/bopomofo', '/desktop/ibus/engine/hangul' ]DConf preserve name prefixesPrefixes of DConf keys to stop name conversion[ 'Control+space', 'Zenkaku_Hankaku', 'Alt+Kanji', 'Alt+grave', 'Hangul', 'Alt+Release+Alt_R' ]Trigger shortcut keysThe shortcut keys for turning input method on or off[ '<Super>space' ]Trigger shortcut keys for gtk_accelerator_parseThe shortcut keys for turning input method on or off[]Enable shortcut keysThe shortcut keys for turning input method on[]Disable shortcut keysThe shortcut keys for turning input method off[ 'Alt+Shift_L' ]Next engine shortcut keysThe shortcut keys for switching to the next input method in the list[ 'Alt+Shift_L' ]Next engine shortcut keysThe shortcut keys for switching to the next input method in the list[]Prev engine shortcut keysThe shortcut keys for switching to the previous input method[]Prev engine shortcut keysThe shortcut keys for switching to the previous input method0Auto hideThe behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = Always show-1Language panel position-1Language panel position1Orientation of lookup tableOrientation of lookup table. 0 = Horizontal, 1 = VerticaltrueShow icon on system trayShow icon on system trayfalseShow input method nameShow input method name on language barfalseUse custom fontUse custom font name for language panel'Sans 10'Custom fontCustom font name for language panel \ ファイル末尾に改行がありません + + + + + + + + [] + Preload engines + Preload engines during ibus starts up + + + [] + Engines order + Saved engines order in input method list + + + 400 + Popup delay milliseconds for IME switcher window + Set popup delay milliseconds to show IME switcher window. The default is 400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show the window and switch prev/next engines. + + + '' + Saved version number + The saved version number will be used to check the difference between the version of the previous installed ibus and one of the current ibus. + + + false + Use system keyboard layout + Use system keyboard (XKB) layout + + + true + Embed Preedit Text + Embed Preedit Text in Application Window + + + true + Use global input method + Share the same input method among all applications + + + false + Enable input method by default + Enable input method by default when the application gets input focus + + + [ '/desktop/ibus/engine/pinyin', '/desktop/ibus/engine/bopomofo', '/desktop/ibus/engine/hangul' ] + DConf preserve name prefixes + Prefixes of DConf keys to stop name conversion + + + + + + [ 'Control+space', 'Zenkaku_Hankaku', 'Alt+Kanji', 'Alt+grave', 'Hangul', 'Alt+Release+Alt_R' ] + Trigger shortcut keys + The shortcut keys for turning input method on or off + + + [ '<Super>space' ] + Trigger shortcut keys for gtk_accelerator_parse + The shortcut keys for turning input method on or off + + + [] + Enable shortcut keys + The shortcut keys for turning input method on + + + [] + Disable shortcut keys + The shortcut keys for turning input method off + + + [ 'Alt+Shift_L' ] + Next engine shortcut keys + The shortcut keys for switching to the next input method in the list + + + [ 'Alt+Shift_L' ] + Next engine shortcut keys + The shortcut keys for switching to the next input method in the list + + + [] + Prev engine shortcut keys + The shortcut keys for switching to the previous input method + + + [] + Prev engine shortcut keys + The shortcut keys for switching to the previous input method + + + + + 1 + Auto hide + The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show + + + -1 + Language panel position + + + -1 + Language panel position + + + 10000 + The milliseconds to show property panel + The milliseconds to show property panel after focus-in or properties are changed. + + + 1 + Orientation of lookup table + Orientation of lookup table. 0 = Horizontal, 1 = Vertical + + + true + Show icon on system tray + Show icon on system tray + + + false + Show input method name + Show input method name on language bar + + + false + Use custom font + Use custom font name for language panel + + + 'Sans 10' + Custom font + Custom font name for language panel + + + diff -Nru ibus-1.5.4/data/ibus.schemas.in ibus-1.5.5/data/ibus.schemas.in --- ibus-1.5.4/data/ibus.schemas.in 2013-09-20 12:15:50.000000000 +0900 +++ ibus-1.5.5/data/ibus.schemas.in 2014-01-14 12:59:14.000000000 +0900 @@ -161,10 +161,10 @@ /desktop/ibus/panel/show ibus int - 0 + 1 Auto hide - The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = Always show + The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show @@ -201,6 +201,18 @@ --> + /schemas/desktop/ibus/panel/auto-hide-timeout + /desktop/ibus/panel/auto-hide-timeout + ibus + int + 10000 + + The milliseconds to show property panel + The milliseconds to show property panel after focus-in or + properties are changed. + + + /schemas/desktop/ibus/panel/lookup_table_orientation /desktop/ibus/panel/lookup_table_orientation ibus diff -Nru ibus-1.5.4/debian/README.Debian ibus-1.5.5/debian/README.Debian --- ibus-1.5.4/debian/README.Debian 2013-09-12 00:07:44.000000000 +0900 +++ ibus-1.5.5/debian/README.Debian 2014-01-26 16:24:26.000000000 +0900 @@ -1,8 +1,13 @@ ibus for Debian Osamu Aoki ========================================================================= -! Keyboard mode switching is now changed to SUPER-space. +! +! Keyboard mode switching is now changed to SUPER-space. ! The SUPER-key is commonly called windows-key. +! +! X and ibus should be run under the UTF-8 locale +! to have stable behavior. Set it via /etc/default/locale . +! ========================================================================= ========================================================================= @@ -54,5 +59,5 @@ - Relogin to the user account to refresh X session. - -- Osamu Aoki , Fri, 06 Sep 2013 14:22:14 +0000 + -- Osamu Aoki , Sun, 26 Jan 2014 07:24:19 +0000 diff -Nru ibus-1.5.4/debian/changelog ibus-1.5.5/debian/changelog --- ibus-1.5.4/debian/changelog 2014-01-08 05:21:29.000000000 +0900 +++ ibus-1.5.5/debian/changelog 2014-02-04 22:11:09.000000000 +0900 @@ -1,14 +1,29 @@ -ibus (1.5.4-1ubuntu1) trusty; urgency=medium +ibus (1.5.5-1ubuntu1) trusty; urgency=medium - * Merge with Debian; remaining changes: + * Merge with Debian (LP: #1276143); remaining changes: - debian/rules: + Build with dh_translations. Add dh-translations build dependency. - Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input Methods" - debian/patches/ibus-no-notification.patch: Don't show the notification if not actually upgrading from a previous version. (LP: #1255542). + * debian/patches/03_dont_run_dconf_update.patch: added + - Don't run "dconf update" if $(DESTDIR) is set + + https://github.com/ibus/ibus/commit/e6ec45d64a32d16245770f8b80e795a63e6ad553 - -- Matthias Klose Tue, 07 Jan 2014 21:08:21 +0100 + -- Ikuya Awashiro Mon, 03 Feb 2014 22:34:56 +0900 + +ibus (1.5.5-1) unstable; urgency=medium + + * New upstream release. + - CVE-2013-4509 (also with FC19 patch). Closes: #729065 + - Update ibus-setup message. Closes: #729472 + * Sync with ibus-1.5.5-1.fc19.src.rpm + * Update debian/rules using DEB_*_MAINT_APPEND (compat=9). + * Update README.Debian. Closes: #732434 + * Update Standards-Version: 3.9.5 + + -- Osamu Aoki Sun, 26 Jan 2014 16:28:28 +0900 ibus (1.5.4-1) unstable; urgency=low @@ -27,36 +42,6 @@ -- Osamu Aoki Sat, 14 Sep 2013 01:50:04 +0900 -ibus (1.5.3-6ubuntu4) trusty; urgency=low - - * debian/patches/ibus-no-notification.patch: Don't show the notification - if not actually upgrading from a previous version. (LP: #1255542) - - -- Marc Deslauriers Wed, 27 Nov 2013 09:07:43 -0500 - -ibus (1.5.3-6ubuntu3) trusty; urgency=low - - * Use Space as the shortcut of switching IME forward in ibus, - avoiding the conflict with g-s-d shortcut handling (LP: #1249208). - - -- Aron Xu Fri, 08 Nov 2013 14:32:13 +0800 - -ibus (1.5.3-6ubuntu2) saucy; urgency=low - - * Really run dh_translations - - -- Jeremy Bicha Wed, 11 Sep 2013 16:35:29 -0400 - -ibus (1.5.3-6ubuntu1) saucy; urgency=low - - * Sync with Debian. Remaining changes: - - debian/rules: - + Build with dh_translations. Add dh-translations build dependency. - - Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input - Methods" - - -- Jeremy Bicha Wed, 11 Sep 2013 16:28:00 -0400 - ibus (1.5.3-6) unstable; urgency=low * debian/control: diff -Nru ibus-1.5.4/debian/control ibus-1.5.5/debian/control --- ibus-1.5.4/debian/control 2014-01-08 05:10:10.000000000 +0900 +++ ibus-1.5.5/debian/control 2014-02-03 22:29:27.000000000 +0900 @@ -1,8 +1,7 @@ Source: ibus Section: utils Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: IME Packaging Team +Maintainer: IME Packaging Team Uploaders: Aron Xu , Asias He , Daiki Ueno , @@ -34,7 +33,7 @@ python-dbus (>= 0.83.0), python-dev (>= 2.6.6-3~), valac (>= 0.16) -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://code.google.com/p/ibus/ Vcs-Git: git://anonscm.debian.org/pkg-ime/ibus.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ime/ibus.git diff -Nru ibus-1.5.4/debian/libibus-1.0-5.symbols ibus-1.5.5/debian/libibus-1.0-5.symbols --- ibus-1.5.4/debian/libibus-1.0-5.symbols 2013-10-20 00:44:53.000000000 +0900 +++ ibus-1.5.5/debian/libibus-1.0-5.symbols 2014-01-26 13:13:40.000000000 +0900 @@ -167,6 +167,7 @@ ibus_engine_show_lookup_table@Base 1.2.99.20100202 ibus_engine_show_preedit_text@Base 1.2.99.20100202 ibus_engine_simple_add_table@Base 1.5.1 + ibus_engine_simple_add_table_by_locale@Base 1.5.5 ibus_engine_simple_get_type@Base 1.5.1 ibus_engine_update_auxiliary_text@Base 1.2.99.20100202 ibus_engine_update_lookup_table@Base 1.2.99.20100202 diff -Nru ibus-1.5.4/debian/patches/02_title_update.patch ibus-1.5.5/debian/patches/02_title_update.patch --- ibus-1.5.4/debian/patches/02_title_update.patch 2014-01-08 05:10:10.000000000 +0900 +++ ibus-1.5.5/debian/patches/02_title_update.patch 2014-02-03 22:34:21.000000000 +0900 @@ -18,7 +18,7 @@ Terminal=false --- a/setup/main.py +++ b/setup/main.py -@@ -329,7 +329,7 @@ +@@ -381,7 +381,7 @@ if self.__bus.is_connected(): return @@ -27,7 +27,7 @@ dlg = Gtk.MessageDialog(type = Gtk.MessageType.QUESTION, buttons = Gtk.ButtonsType.YES_NO, text = message) -@@ -351,10 +351,7 @@ +@@ -403,10 +403,7 @@ if self.__bus.is_connected(): message = _("IBus has been started! " diff -Nru ibus-1.5.4/debian/patches/03_dont_run_dconf_update.patch ibus-1.5.5/debian/patches/03_dont_run_dconf_update.patch --- ibus-1.5.4/debian/patches/03_dont_run_dconf_update.patch 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.5.5/debian/patches/03_dont_run_dconf_update.patch 2014-02-03 22:33:58.000000000 +0900 @@ -0,0 +1,42 @@ +From e6ec45d64a32d16245770f8b80e795a63e6ad553 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 16 Jan 2014 13:22:12 +0900 +Subject: [PATCH] data/dconf: Don't run "dconf update" if $(DESTDIR) is set + +dconf changed as of +https://git.gnome.org/browse/dconf/commit/?id=c211fc46496597c7ddabd73d623bae4037754916 +to actually emit an error if /etc/dconf/db is empty. When building +ibus in a system such as dpkg/rpm or gnome-continuous, there may +actually be nothing in that directory in the buildroot. + +This will now cause "dconf update" as executed by this Makefile to +fail. The fix is to just check $(DESTDIR), like we should do for all +triggers (e.g. gtk-update-icon-cache too). It's never useful to +execute these from per-component Makefiles if $(DESTDIR) is set. + +Instead, these meta-build systems (dpkg/rpm/jhbuild/Continuous) all +take care of execution of triggers on their own. + +Review URL: https://codereview.appspot.com/51730044 +Patch from Colin Walters . +--- + data/dconf/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index c841a34..62c20a3 100644 +--- a/data/dconf/Makefile.am ++++ b/data/dconf/Makefile.am +@@ -61,6 +61,8 @@ org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in + { rc=$$?; $(RM) -rf $@; exit $$rc; } + + install-data-hook: +- dconf update ++ if test -z "$(DESTDIR)"; then \ ++ dconf update; \ ++ fi + + -include $(top_srcdir)/git.mk +-- +1.8.5.1 + diff -Nru ibus-1.5.4/debian/patches/10_shortcut_ctrl_space.patch ibus-1.5.5/debian/patches/10_shortcut_ctrl_space.patch --- ibus-1.5.4/debian/patches/10_shortcut_ctrl_space.patch 2014-01-08 05:10:10.000000000 +0900 +++ ibus-1.5.5/debian/patches/10_shortcut_ctrl_space.patch 1970-01-01 09:00:00.000000000 +0900 @@ -1,26 +0,0 @@ -Index: ibus-1.5.3/ui/gtk3/panel.c -=================================================================== ---- ibus-1.5.3.orig/ui/gtk3/panel.c 2013-07-26 16:32:53.000000000 +0800 -+++ ibus-1.5.3/ui/gtk3/panel.c 2013-11-08 14:31:59.197490082 +0800 -@@ -206,7 +206,7 @@ - static void panel_unbind_switch_shortcut (Panel* self); - static void _panel_keybinding_unref0_ (gpointer var); - static void _g_list_free__panel_keybinding_unref0_ (GList* self); --#define PANEL_ACCELERATOR_SWITCH_IME_FOREWARD "space" -+#define PANEL_ACCELERATOR_SWITCH_IME_FOREWARD "space" - Panel* panel_new (IBusBus* bus); - Panel* panel_construct (GType object_type, IBusBus* bus); - static void panel_status_icon_popup_menu_cb (Panel* self, GtkStatusIcon* status_icon, guint button, guint activate_time); -Index: ibus-1.5.3/ui/gtk3/panel.vala -=================================================================== ---- ibus-1.5.3.orig/ui/gtk3/panel.vala 2013-11-08 14:29:04.000000000 +0800 -+++ ibus-1.5.3/ui/gtk3/panel.vala 2013-11-08 14:31:11.301488377 +0800 -@@ -56,7 +56,7 @@ - private int m_fallback_lock_id = -1; - private bool m_changed_xkb_option = false; - private GLib.Timer m_changed_layout_timer; -- private const string ACCELERATOR_SWITCH_IME_FOREWARD = "space"; -+ private const string ACCELERATOR_SWITCH_IME_FOREWARD = "space"; - - private GLib.List m_keybindings = new GLib.List(); - diff -Nru ibus-1.5.4/debian/patches/999-update-po.patch ibus-1.5.5/debian/patches/999-update-po.patch --- ibus-1.5.4/debian/patches/999-update-po.patch 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.5.5/debian/patches/999-update-po.patch 2014-01-26 14:30:40.000000000 +0900 @@ -0,0 +1,14636 @@ +--- a/po/ar.po ++++ b/po/ar.po +@@ -527,6 +527,220 @@ + msgid "Restart" + msgstr "إعادة تشغيل" + ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "اختر طريقة الإدخال" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "اختر طريقة الإدخال" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++#, fuzzy ++msgid "Preload engine mode" ++msgstr "المحركات المحملة مسبقا" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++#, fuzzy ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "مفتاح الزناد" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "اسم الخط المخصص للوحة اللغة" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "اسم الخط المخصص للوحة اللغة" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#. Translators: %d == 5 currently ++#: ../setup/main.py:413 ++#, python-format ++msgid "IBus daemon could not be started in %d seconds" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "تبديل طريقة الإدخال" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "اختر الاختصار ل %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "اختصارات لوحة المفاتيح" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "فضلا اضغط مفتاح أو عدة مفاتيح" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ + #, fuzzy + #~ msgid "Previous page" + #~ msgstr "طريقة الإدخال السابقة" +--- a/po/as.po ++++ b/po/as.po +@@ -2,7 +2,7 @@ + # Assamese translation of ibus. + # Copyright (C) 2008-2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Amitakhya Phukan , 2009 + # Amitakhya Phukan , 2010 +@@ -186,7 +186,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "অবিকল্পিত ইনপুট পদ্ধতি তালিকাৰ ওপৰৰ প্ৰথমত।\nতাক সলনি কৰিবলৈ আপুনি ওপৰ/তল বুটাম ব্যৱহাৰ কৰিব পাৰে।" ++msgstr "" ++"অবিকল্পিত ইনপুট পদ্ধতি তালিকাৰ ওপৰৰ প্ৰথমত।\n" ++"তাক সলনি কৰিবলৈ আপুনি ওপৰ/তল বুটাম ব্যৱহাৰ কৰিব পাৰে।" + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -225,7 +227,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nবুদ্ধিমান ইনপুট bus\nঘৰৰ পৃষ্ঠা: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"বুদ্ধিমান ইনপুট bus\n" ++"ঘৰৰ পৃষ্ঠা: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -264,7 +272,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME চুইচাৰ উইন্ডো দেখুৱাবলে মিলিছেকেণ্ডত পপআপ বিলম্ব দেখুৱাওক। অবিকল্পিত হল 400. 0 = উইন্ডো তৎক্ষনাত দেখুৱাওক। 0 < মিলিছেকেণ্ডত বিলম্ব। 0 > উইন্ডো নেদেখুৱাব আৰু পূৰ্বৱৰ্তী/পৰৱৰ্তী ইঞ্জিন চুইচ নকৰিব।" ++msgstr "" ++"IME চুইচাৰ উইন্ডো দেখুৱাবলে মিলিছেকেণ্ডত পপআপ বিলম্ব দেখুৱাওক। অবিকল্পিত হল 400. 0 " ++"= উইন্ডো তৎক্ষনাত দেখুৱাওক। 0 < মিলিছেকেণ্ডত বিলম্ব। 0 > উইন্ডো নেদেখুৱাব আৰু " ++"পূৰ্বৱৰ্তী/পৰৱৰ্তী ইঞ্জিন চুইচ নকৰিব।" + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -274,7 +285,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "সংৰক্ষিত সংস্কৰণ সংখ্যাক পূৰ্বতে ইনস্টল কৰা ibus আৰু বৰ্তমান ibus ৰ মাজত পাৰ্থক্য নিৰীক্ষণ কৰিবলৈ ব্যৱহাৰ কৰা হব।" ++msgstr "" ++"সংৰক্ষিত সংস্কৰণ সংখ্যাক পূৰ্বতে ইনস্টল কৰা ibus আৰু বৰ্তমান ibus ৰ মাজত পাৰ্থক্য " ++"নিৰীক্ষণ কৰিবলৈ ব্যৱহাৰ কৰা হব।" + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -324,7 +337,8 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "ভাষাৰ পেনেলৰ আচৰণ। ০ = মেনুত প্ৰোথিত, ১ = স্বচালিতভাৱে লুকাওক, ২ = সদায় দেখুৱাওক" ++msgstr "" ++"ভাষাৰ পেনেলৰ আচৰণ। ০ = মেনুত প্ৰোথিত, ১ = স্বচালিতভাৱে লুকাওক, ২ = সদায় দেখুৱাওক" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -334,7 +348,9 @@ + 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 = তলৰ বাওঁফালৰ কোণত, 3 = তলৰ সোঁফালৰ কোণত, 4 = স্বনিৰ্বাচিত" ++msgstr "" ++"ভাষাৰ পেনেলৰ স্থান। 0 = ওপৰৰ বাওঁফালৰ কোণত, 1 = ওপৰৰ সোঁফালৰ কোণত, 2 = তলৰ " ++"বাওঁফালৰ কোণত, 3 = তলৰ সোঁফালৰ কোণত, 4 = স্বনিৰ্বাচিত" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -382,7 +398,9 @@ + + #: ../data/ibus.schemas.in.h:40 + msgid "Enable input method by default when the application gets input focus" +-msgstr "যেতিয়া এপ্লিকেচনে ইনপুট ফকাচ প্ৰাপ্ত কৰে তেতিয়া অবিকল্পিতভাৱে ইনপুট পদ্ধতি সামৰ্থবান কৰক" ++msgstr "" ++"যেতিয়া এপ্লিকেচনে ইনপুট ফকাচ প্ৰাপ্ত কৰে তেতিয়া অবিকল্পিতভাৱে ইনপুট পদ্ধতি সামৰ্থবান " ++"কৰক" + + #: ../data/ibus.schemas.in.h:41 + msgid "DConf preserve name prefixes" +@@ -396,7 +414,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "স্বত্বাধিকাৰ (c) ২০০৭-২০১০ পেং হুৱাং\nস্বত্বাধিকাৰ (c) ২০০৭-২০১০ Red Hat, Inc." ++msgstr "" ++"স্বত্বাধিকাৰ (c) ২০০৭-২০১০ পেং হুৱাং\n" ++"স্বত্বাধিকাৰ (c) ২০০৭-২০১০ Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -449,7 +469,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "অনুগ্ৰহ কৰি এটা কি' টিপক (বা এটা কি'ৰ মিশ্ৰণ)।\nকি' এৰিলে ডাইলগ বন্ধ হ'ব।" ++msgstr "" ++"অনুগ্ৰহ কৰি এটা কি' টিপক (বা এটা কি'ৰ মিশ্ৰণ)।\n" ++"কি' এৰিলে ডাইলগ বন্ধ হ'ব।" + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -465,11 +487,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus আৰম্ভ কৰা হৈছে! যদি আপুনি IBus ব্যৱহাৰ কৰিব নোৱাৰে, নিম্নলিখিত শাৰীসমূহ " ++"আপোনাৰ $HOME/.bashrc লে যোগ কৰক; তাৰ পিছত আপোনাৰ ডেস্কটপত পুনৰ লগ কৰক।\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus আৰম্ভ কৰা হৈছে! যদি আপুনি IBus ব্যৱহাৰ কৰিব নোৱাৰে, নিম্নলিখিত শাৰীসমূহ আপোনাৰ $HOME/.bashrc লে যোগ কৰক; তাৰ পিছত আপোনাৰ ডেস্কটপত পুনৰ লগ কৰক।\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -581,7 +609,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "ব্যৱহাৰ: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"ব্যৱহাৰ: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -611,8 +641,220 @@ + + #: ../ui/gtk3/panel.vala:666 + msgid "translator-credits" +-msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami@redhat.com)" ++msgstr "" ++"অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami@redhat." ++"com)" + + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "পুনাৰম্ভ" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "সক্ৰিয় ইনপুট পদ্ধতিসমূহ স্বনিৰ্বাচিত কৰক (_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "সক্ৰিয় ইনপুট পদ্ধতিসমূহ স্বনিৰ্বাচিত কৰক" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "পূৰ্বল'ড ইঞ্জিন অৱস্থা" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"পূৰ্বল'ড ইঞ্জিনসমূহ এই অৱস্থাৰ সৈতে ল'ড কৰা হয়। 0 = ব্যৱহাৰকাৰী স্বনিৰ্বাচিত " ++"ইঞ্জিনসমূহ। 1 = ভাষা সম্বন্ধিত ইঞ্জিনসমূহ।" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "মূখ্য পূৰ্বল'ড ইঞ্জিনসমূহ আৰম্ভ কৰা হৈছে (_e)" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap ব্যৱহাৰ কৰক" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "যদি .xmodmap/.Xmodmap ইতিমধ্যে অস্তিত্ববান থাকে, xmodmap চলাওক।" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "লেটিন বিন্যাস যাৰ কোনো ASCII নাই" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "us বিন্যাসক লেটিন বিন্যাসসমূহলৈ সংযোজন কৰা হয়। অপৰৰ প্ৰয়োজন নাই।" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "XKB বিন্যাস তালিকা যি ibus-setup ত দেখুৱা হয়" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"XKB বিন্যাস তালিকা যি ibus-setup ত দেখুৱা হয়। বিন্যাস \"layout\" অথবা " ++"\"layout(variant)\"" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "পৰিবৰ্তক কি'সমূহৰ বাহিৰে চৰ্টকাট কি'সমূহ আৰম্ভ কৰক" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"পৰিবৰ্তক কি'সমূহৰ বাহিৰে চৰ্টকাট কি'সমূহ আৰম্ভ কৰক। তালিকাক ibus-gjs দ্বাৰা ব্যৱহাৰ " ++"কৰা হয়।" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup ত চিস্টেম কি'বৰ্ড বিন্যাসমূহৰ তালিকা" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"অবিকল্পিতভাৱে সকলো চিস্টেম কি'বৰ্ড বিন্যাস নেদেখুৱাবলৈ দল তালিকা ব্যৱহাৰ কৰা হয়। " ++"তালিকা বস্তুক gconf কিৰ শেষত সংযোজন কৰা হব। উদাহৰণস্বৰূপ .../xkblayoutconfig/" ++"item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup ত ইউৰোপিয়ান ভাষাসমূহৰ তালিকা" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup এ ভাষাসমূহক কেৱল ইনপুট পদ্ধতি তালিকাত দেখুৱায় যেতিয়া আপুনি যিকোনো এটা " ++"ভাষাত ibus-setup চলাই। অন্য ভাষাসমূহ এটা প্ৰসাৰিত বুটামৰ অন্তৰ্গত থাকে।" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup ত এছিয়ান ভাষাসমূহৰ তালিকা" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "সকলো ইনপুট পদ্ধতি দেখুৱাওক" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "কেৱল আপোনাৰ অঞ্চলৰ বাবে ইনপুট পদ্ধতিসমূহ দেখুৱাওক" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"আপোনাৰ সংৰক্ষিত ইনপুট পদ্ধতিসমূহৰ তালিকাক তৎক্ষনাত পৰিষ্কাৰ কৰা হব আৰু তালিকাক " ++"প্ৰতিবাৰ লগিন ভাষাৰ সহায়ত সংৰূপণ কৰা হব। আপুনি ইয়াৰ সৈতে সন্মত নে?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s ৰ কাৰণে কিবৰ্ডৰ চৰ্টকাট বাছক" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "কিবৰ্ডৰ বিন্যাস: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"অবিকল্পিত ইনপুট পদ্ধতি তালিকাৰ ওপৰৰ প্ৰথমত।\n" ++"তাক সলনি কৰিবলৈ আপুনি ওপৰ/তল বুটাম ব্যৱহাৰ কৰিব পাৰে।" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "অনুগ্ৰহ কৰি এটা কি' টিপক (বা এটা কি'ৰ মিশ্ৰণ)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "স্বত্বাধিকাৰ (c) 2007-2012 পেং হুৱাং\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "চিস্টেম কিবৰ্ড বিন্যাস ব্যৱহাৰ কৰক" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" +--- a/po/bg.po ++++ b/po/bg.po +@@ -2,7 +2,7 @@ + # Bulgarian translation of ibus. + # Copyright (C) 2008 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Valentin Laskov , 2012. + msgid "" +@@ -65,7 +65,8 @@ + + #: ../setup/setup.ui.h:12 + msgid "The shortcut keys for switching to next input method in the list" +-msgstr "Клавишна комбинация за превключване към следващ в списъка метод за писане" ++msgstr "" ++"Клавишна комбинация за превключване към следващ в списъка метод за писане" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -73,7 +74,8 @@ + + #: ../setup/setup.ui.h:14 + msgid "The shortcut keys for switching to previous input method in the list" +-msgstr "Клавишна комбинация за превключване към предишен в списъка метод за писане" ++msgstr "" ++"Клавишна комбинация за превключване към предишен в списъка метод за писане" + + #: ../setup/setup.ui.h:15 + msgid "Previous input method:" +@@ -133,7 +135,8 @@ + + #: ../setup/setup.ui.h:29 + msgid "Show input method's name on language bar when check the checkbox" +-msgstr "Показва името на метода за писане на лентата за език при поставена отметка" ++msgstr "" ++"Показва името на метода за писане на лентата за език при поставена отметка" + + #: ../setup/setup.ui.h:30 + msgid "Embed preedit text in application window" +@@ -141,7 +144,8 @@ + + #: ../setup/setup.ui.h:31 + msgid "Embed the preedit text of input method in the application window" +-msgstr "Вгражда редактирания текст от метода за писане в прозореца на приложението" ++msgstr "" ++"Вгражда редактирания текст от метода за писане в прозореца на приложението" + + #: ../setup/setup.ui.h:32 + msgid "Use custom font:" +@@ -183,7 +187,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "Подразбиращият се метод е най-горният в списъка.\nМожете да промените реда с бутоните нагоре/надолу." ++msgstr "" ++"Подразбиращият се метод е най-горният в списъка.\n" ++"Можете да промените реда с бутоните нагоре/надолу." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64 +@@ -222,7 +228,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nИнтелигентен организатор на методите за писане\nСтраница на проекта: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"Интелигентен организатор на методите за писане\n" ++"Страница на проекта: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -290,7 +302,8 @@ + + #: ../data/ibus.schemas.in.h:12 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "Клавишна комбинация за превключване към следващия в списъка метод за писане" ++msgstr "" ++"Клавишна комбинация за превключване към следващия в списъка метод за писане" + + #: ../data/ibus.schemas.in.h:13 + msgid "Prev engine shortcut keys" +@@ -298,7 +311,8 @@ + + #: ../data/ibus.schemas.in.h:14 + msgid "The shortcut keys for switching to the previous input method" +-msgstr "Клавишна комбинация за превключване към предишния в списъка метод за писане" ++msgstr "" ++"Клавишна комбинация за превключване към предишния в списъка метод за писане" + + #: ../data/ibus.schemas.in.h:15 + msgid "Auto hide" +@@ -308,7 +322,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "Поведение на панела с езици. 0 = Вграден в менюто, 1 = Скриващ се автоматично, 2 = Видим винаги" ++msgstr "" ++"Поведение на панела с езици. 0 = Вграден в менюто, 1 = Скриващ се " ++"автоматично, 2 = Видим винаги" + + #: ../data/ibus.schemas.in.h:17 + msgid "Language panel position" +@@ -318,7 +334,9 @@ + 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 = Долен ляв ъгъл, 3 = Долен десен ъгъл, 4 = По избор" ++msgstr "" ++"Позиция на панела с езици. 0 = Горен ляв ъгъл, 1 = Горен десен ъгъл, 2 = " ++"Долен ляв ъгъл, 3 = Долен десен ъгъл, 4 = По избор" + + #: ../data/ibus.schemas.in.h:19 + msgid "Orientation of lookup table" +@@ -366,7 +384,8 @@ + + #: ../data/ibus.schemas.in.h:35 + msgid "Enable input method by default when the application gets input focus" +-msgstr "Разрешава метод за писане по подразбиране, когато приложението е на фокус" ++msgstr "" ++"Разрешава метод за писане по подразбиране, когато приложението е на фокус" + + #: ../data/ibus.schemas.in.h:36 + msgid "DConf preserve name prefixes" +@@ -380,7 +399,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -433,7 +454,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Моля, натиснете клавиш (или комбинация клавиши).\nДиалогът ще се затвори при отпускането на клавиша." ++msgstr "" ++"Моля, натиснете клавиш (или комбинация клавиши).\n" ++"Диалогът ще се затвори при отпускането на клавиша." + + #: ../setup/keyboardshortcut.py:253 + msgid "Please press a key (or a key combination)" +@@ -457,11 +480,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus беше стартиран! Ако не можете да използвате IBus, добавете следните " ++"редове във файла $HOME/.bashrc; след което излезте и влезте отново.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus беше стартиран! Ако не можете да използвате IBus, добавете следните редове във файла $HOME/.bashrc; след което излезте и влезте отново.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -517,7 +546,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Употреба: %s КОМАНДА [ОПЦИЯ...]\n\n" ++msgstr "" ++"Употреба: %s КОМАНДА [ОПЦИЯ...]\n" ++"\n" + + #: ../tools/main.vala:186 + #, c-format +@@ -535,7 +566,9 @@ + + #: ../ui/gtk3/panel.vala:366 + msgid "IBus is an intelligent input bus for Linux/Unix." +-msgstr "IBus е интелигентен начин за избор на метод за въвеждане на информация за Linux/Unix." ++msgstr "" ++"IBus е интелигентен начин за избор на метод за въвеждане на информация за " ++"Linux/Unix." + + #: ../ui/gtk3/panel.vala:370 + msgid "translator-credits" +@@ -544,3 +577,218 @@ + #: ../ui/gtk3/panel.vala:402 + msgid "Restart" + msgstr "Рестартиране" ++ ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Използва глобалния метод за писане" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Използва глобалния метод за писане" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++#, fuzzy ++msgid "Preload engine mode" ++msgstr "Предв. заредени механизми" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++#, fuzzy ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Превключващи клавишни комбинации" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++#, fuzzy ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Използване на системната клавиатурна подредба" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Показва името на метода за писане" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "Показва името на метода за писане" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++#, fuzzy ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "" ++"Клавишна комбинация за превключване към предишния в списъка метод за писане" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "Следващ метод:" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Изберете клавишна комбинация за %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Клавиатурна подредба: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"Подразбиращият се метод е най-горният в списъка.\n" ++"Можете да промените реда с бутоните нагоре/надолу." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Моля, натиснете клавиш (или комбинация клавиши)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2007-2012 Peng Huang\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "Използване на системната клавиатурна подредба" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" +--- a/po/bn_IN.po ++++ b/po/bn_IN.po +@@ -186,7 +186,10 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\nডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।" ++msgstr "" ++"তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\n" ++"ডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।" + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -225,7 +228,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nবুদ্ধিবিশিষ্ট ইনপুট বাস\nহোম-পেজ: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"বুদ্ধিবিশিষ্ট ইনপুট বাস\n" ++"হোম-পেজ: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -264,7 +273,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME স্যুইচার উইন্ডো দেখাতে পপ-অাপ বিলম্ব মিলিসেকেন্ড সেট করুন। ডিফল্ট হল 400. 0 = উইন্ডো সংগে সংগে দেখান। 0 < মিলিসেকেন্ড বিলম্ব। 0 > উইন্ডো দেখাবেন না এবং পূর্ববর্তী এবং পরবর্তী ইঞ্জিনে পাল্টান।" ++msgstr "" ++"IME স্যুইচার উইন্ডো দেখাতে পপ-অাপ বিলম্ব মিলিসেকেন্ড সেট করুন। ডিফল্ট হল 400. 0 = " ++"উইন্ডো সংগে সংগে দেখান। 0 < মিলিসেকেন্ড বিলম্ব। 0 > উইন্ডো দেখাবেন না এবং " ++"পূর্ববর্তী এবং পরবর্তী ইঞ্জিনে পাল্টান।" + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -274,7 +286,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "পূর্বে ইনস্টল করা ibus এবং বর্তমান ibus এর একটির মধ্যে পার্থক্য যাচাই করতে সংরক্ষিত সংস্করণ নম্বর ব্যবহৃত হবে।" ++msgstr "" ++"পূর্বে ইনস্টল করা ibus এবং বর্তমান ibus এর একটির মধ্যে পার্থক্য যাচাই করতে সংরক্ষিত " ++"সংস্করণ নম্বর ব্যবহৃত হবে।" + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -324,7 +338,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "ভাষা প্রদর্শনের প্যানেলের আচরণ। 0 (০) = মেনুর মধ্যে সন্নিবেশ করা হবে, 1 (১) = স্বয়ংক্রিয়ভাবে আড়াল করা হবে, 2 (২) = সর্বদা প্রদর্শন করা হবে" ++msgstr "" ++"ভাষা প্রদর্শনের প্যানেলের আচরণ। 0 (০) = মেনুর মধ্যে সন্নিবেশ করা হবে, 1 (১) = " ++"স্বয়ংক্রিয়ভাবে আড়াল করা হবে, 2 (২) = সর্বদা প্রদর্শন করা হবে" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -334,7 +350,9 @@ + 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 = নীচে বাঁদিকের কোণায়, 3 = নীচে ডানদিকের কোণায়, 4 = স্বনির্ধারিত" ++msgstr "" ++"ভাষার প্যানেলের অবস্থান। 0 = উপরে বাঁদিকের কোণায়, 1 = উপরে ডানদিকের কোণায়, 2 = " ++"নীচে বাঁদিকের কোণায়, 3 = নীচে ডানদিকের কোণায়, 4 = স্বনির্ধারিত" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -382,7 +400,9 @@ + + #: ../data/ibus.schemas.in.h:40 + msgid "Enable input method by default when the application gets input focus" +-msgstr "ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি সক্রিয় করা হবে" ++msgstr "" ++"ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি " ++"সক্রিয় করা হবে" + + #: ../data/ibus.schemas.in.h:41 + msgid "DConf preserve name prefixes" +@@ -396,7 +416,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "স্বত্বাধিকার (c) ২০০৭-২০০৯ পেং হুয়াং\nস্বত্বাধিকার (c) ২০০৭-২০০৯ Red Hat, Inc." ++msgstr "" ++"স্বত্বাধিকার (c) ২০০৭-২০০৯ পেং হুয়াং\n" ++"স্বত্বাধিকার (c) ২০০৭-২০০৯ Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -449,7 +471,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "অনুগ্রহ করে কোনো কি (অথবা কি সংকলন) টিপুন।\nকি মুক্ত করা হলে এই ডায়লগ বক্সটি বন্ধ করা হবে।" ++msgstr "" ++"অনুগ্রহ করে কোনো কি (অথবা কি সংকলন) টিপুন।\n" ++"কি মুক্ত করা হলে এই ডায়লগ বক্সটি বন্ধ করা হবে।" + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -465,11 +489,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus আরম্ভ করা হয়েছে! IBus ব্যবহার করা সম্ভব না হলে $HOME/.bashrc ফাইলের মধ্যে " ++"নিম্নলিখিত পংক্তিগুলি যোগ করে ডেস্কটপে পুনরায় লগ-ইন করুন।\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus আরম্ভ করা হয়েছে! IBus ব্যবহার করা সম্ভব না হলে $HOME/.bashrc ফাইলের মধ্যে নিম্নলিখিত পংক্তিগুলি যোগ করে ডেস্কটপে পুনরায় লগ-ইন করুন।\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -581,7 +611,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "ব্যবহারপ্রণালী: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"ব্যবহারপ্রণালী: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -616,3 +648,237 @@ + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "পুনরারম্ভ" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "সক্রিয় ইনপুট পদ্ধতিগুলি কাস্টোমাইজ করুন (_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "সক্রিয় ইনপুট পদ্ধতিগুলি কাস্টোমাইজ করুন" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "ইঞ্জিন মোড পূর্বে লোড করুন" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"প্রিলোড ইঞ্জিনগুলি এই মোড দিয়ে লোড হয়। 0 = ব্যবহারকারীর জন্য কাস্টোমাইজ করা ইঞ্জিন। " ++"1 = ভাষা ভিত্তিক ইঞ্জিন।" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "প্রধান প্রিলোড ইঞ্জিনের সূচনা করা হয়েছে" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap ব্যবহার করুন" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr ".xmodmap/.Xmodmap উপস্থিত থাকলে, xmodmap চালান।" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "ল্যাটিন লেঅাউট যার কোনো ASCII নেই" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "লেঅাউট ল্যাটিন লেঅাউটে প্রয়োগ হয়েছে তাই বিভিন্নতার কোনো প্রয়োজন নেই।" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "XKB সজ্জা তালিকা যা ibus-setup এ দেখানো হয়" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"XKB লেঅাউট তালিকা যা ibus-setup এ দেখানো হয়। ফর্ম্যাট হল \"লেঅাউট\" বা " ++"\"লেঅাউট(বিভিন্নতা)\"।" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "মডিফায়ার কী ছাড়াই শর্টকাট কী ট্রিগার করুন" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"মডিফায়ার কী ছাড়াই শর্টকাট কী ট্রিগার করুন। তালিকা ibus-gjs দ্বারা ব্যবহৃত হয়।" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup এ সিস্টেম কীবোর্ড লেঅাউট গ্রুপের তালিকা" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"ডিফল্ট ভাবে সমস্ত সিস্টেম কীবোর্ড লেঅাউট না দেখানোর জন্য গ্রুপ তালিকা ব্যবহার করা " ++"হয়। gconf কী'র শেষে তালিকা অাইটেম প্রয়োগ করা হবে। উদাঃ .../xkblayoutconfig/" ++"item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup এ ইউরোপীয় ভাষাগুলির তালিকা" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ভাষাগুলির কোনো একটিতে অাপনি ibus-setup চালালে, ibus-setup ভাষাগুলিকে শুধুমাত্র " ++"ইনপুট পদ্ধতি তালিকায় দেখায়। অন্যান্য ভাষাগুলি এক বিস্তৃত বোতামের তলায় লুকানো থাকে।" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup এ এশিয় ভাষাগুলির তালিকা" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "সকল ইনপুট পদ্ধতি দেখান" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "শুধুমাত্র অাপনার অঞ্চলের জন্য ইনপুট পদ্ধতি দেখান" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"অাপনার সংরক্ষিত ইনপুট পদ্ধতিগুলির তালিকা সংগে সংগে সাফ করা হবে এবং প্রত্যেকবার " ++"লগিন ভাষা দিয়ে তালিকা কনফিগার করা হবে। অাপনার এতে অাপত্তি নেই তো?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "কি-বোর্ড বিন্যাস: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\n" ++"ডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "স্বত্বাধিকার (c) ২০০৭-২০১২ পেং হুয়াং\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "ইনপুট পদ্ধতির পরিকাঠামো" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus ইনপুট পদ্ধতির পরিকাঠামো আরম্ভ করা হবে" ++ ++#~ msgid "trigger" ++#~ msgstr "ট্রিগার" ++ ++#~ msgid "enable" ++#~ msgstr "সক্রিয় করুন" ++ ++#~ msgid "disable" ++#~ msgstr "নিষ্ক্রিয় করুন" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "command [OPTIONS]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "xkb বিন্যাসকে %s-এ পরিবর্তন করতে ব্যর্থ।" +--- a/po/ca.po ++++ b/po/ca.po +@@ -539,6 +539,229 @@ + msgid "Restart" + msgstr "Reinicia" + ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Quant al mètode d'entrada" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Quant al mètode d'entrada" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++#, fuzzy ++msgid "Preload engine mode" ++msgstr "Precarrega els motors" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++#, fuzzy ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Dreceres de teclat de l'activador" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++#, fuzzy ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Utilitza la disposició de teclat del sistema" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Mostra el nom del mètode d'entrada" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "Mostra el nom del mètode d'entrada" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++#, fuzzy ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "" ++"Les dreceres de teclat per commutar al mètode d'entrada anterior de la llista" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#. Translators: %d == 5 currently ++#: ../setup/main.py:413 ++#, python-format ++msgid "IBus daemon could not be started in %d seconds" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "Commuta el mètode d'entrada" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Seleccioneu la drecera de teclat per a %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Disposició del teclat: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"El mètode d'entrada predeterminat és el primer de la llista.\n" ++"Podeu utilitzar els botons de pujar i baixar per canviar-lo." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Premeu una tecla (o una combinació de tecles)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "Utilitza la disposició de teclat del sistema" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ + #~ msgid "Previous page" + #~ msgstr "Pàgina anterior" + +--- a/po/da.po ++++ b/po/da.po +@@ -183,7 +183,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "Standard inputmetoden er den øverste i listen.\nDu kan bruge op/ned-knapperne for at ændre det." ++msgstr "" ++"Standard inputmetoden er den øverste i listen.\n" ++"Du kan bruge op/ned-knapperne for at ændre det." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -222,7 +224,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nDen intelligente inddatabus\nNetsted: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"Den intelligente inddatabus\n" ++"Netsted: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -321,7 +329,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "Sprogpanelets opførsel. 0 = Indlejret i menu, 1 = Skjul automatisk, 2 = Vis altid" ++msgstr "" ++"Sprogpanelets opførsel. 0 = Indlejret i menu, 1 = Skjul automatisk, 2 = Vis " ++"altid" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -331,7 +341,10 @@ + 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 "Placering af sprogpanelet. 0 = Øverste venstre hjørne, 1 = Øverste højre hjørne, 2 = Nederste venstre hjørne, 3 = Nederste højre hjørne, 4 = Brugertilpasset" ++msgstr "" ++"Placering af sprogpanelet. 0 = Øverste venstre hjørne, 1 = Øverste højre " ++"hjørne, 2 = Nederste venstre hjørne, 3 = Nederste højre hjørne, 4 = " ++"Brugertilpasset" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -393,7 +406,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Ophavsret (c) 2007-2010 Peng Huang\nOphavsret (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Ophavsret (c) 2007-2010 Peng Huang\n" ++"Ophavsret (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -446,7 +461,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Tryk venligst på en tast (eller en tastekombination).\nDialogen bliver lukket, når tasten slippes." ++msgstr "" ++"Tryk venligst på en tast (eller en tastekombination).\n" ++"Dialogen bliver lukket, når tasten slippes." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -462,7 +479,8 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +@@ -608,8 +626,276 @@ + + #: ../ui/gtk3/panel.vala:666 + msgid "translator-credits" +-msgstr "Kris Thomsen\n\nDansk-gruppen \nMere info: http://www.dansk-gruppen.dk" ++msgstr "" ++"Kris Thomsen\n" ++"\n" ++"Dansk-gruppen \n" ++"Mere info: http://www.dansk-gruppen.dk" + + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "Genstart" ++ ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Om inputmetoden" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Om inputmetoden" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++#, fuzzy ++msgid "Preload engine mode" ++msgstr "Forindlæs motorer" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++#, fuzzy ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Udløser tastaturgenveje" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++#, fuzzy ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Brug tastaturlayout for system" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Vis navn på inputmetode" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "Vis navn på inputmetode" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Vælg tastaturgenveje til %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Tastaturlayout: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"Standard inputmetoden er den øverste i listen.\n" ++"Du kan bruge op/ned-knapperne for at ændre det." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Tryk venligst på en tast (eller en tastekombination)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"Ophavsret (c) 2007-2010 Peng Huang\n" ++"Ophavsret (c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "Brug tastaturlayout for system" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "Framework for inputmetode" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "Start IBus, framework for inputmetode" ++ ++#~ msgid "trigger" ++#~ msgstr "udløser" ++ ++#~ msgid "enable" ++#~ msgstr "aktivér" ++ ++#~ msgid "disable" ++#~ msgstr "deaktivér" ++ ++#~ msgid "Previous page" ++#~ msgstr "Forrige side" ++ ++#~ msgid "Next page" ++#~ msgstr "Næste side" ++ ++#~ msgid "" ++#~ "Some input methods have been installed, removed or updated. Please " ++#~ "restart ibus input platform." ++#~ msgstr "" ++#~ "Nogen inputmetoder er blevet installeret, fjernet eller opdateret. " ++#~ "Genstart inputplatformen IBus." ++ ++#~ msgid "Restart Now" ++#~ msgstr "Genstart nu" ++ ++#~ msgid "Later" ++#~ msgstr "Senere" ++ ++#~ msgid "IBus Panel" ++#~ msgstr "IBus-panel" ++ ++#~ msgid "IBus input method framework" ++#~ msgstr "IBus-ramme for inddatametode" ++ ++#~ msgid "Turn off input method" ++#~ msgstr "Sluk for inputmetode" ++ ++#~ msgid "No input window" ++#~ msgstr "Intet inputvindue" ++ ++#~ msgid "About the Input Method" ++#~ msgstr "Om inputmetoden" ++ ++#~ msgid "next input method" ++#~ msgstr "næste inddatametode" ++ ++#~ msgid "previous input method" ++#~ msgstr "forrige inddatametode" +--- a/po/de.po ++++ b/po/de.po +@@ -69,7 +69,8 @@ + + #: ../setup/setup.ui.h:12 + msgid "The shortcut keys for switching to next input method in the list" +-msgstr "Tastenkombination zum Wechseln zur nächsten Eingabemethode in der Liste" ++msgstr "" ++"Tastenkombination zum Wechseln zur nächsten Eingabemethode in der Liste" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -77,7 +78,8 @@ + + #: ../setup/setup.ui.h:14 + msgid "The shortcut keys for switching to previous input method in the list" +-msgstr "Tastenkombination zum Wechseln zur vorherigen Eingabemethode in der Liste" ++msgstr "" ++"Tastenkombination zum Wechseln zur vorherigen Eingabemethode in der Liste" + + #: ../setup/setup.ui.h:15 + msgid "Previous input method:" +@@ -117,7 +119,8 @@ + + #: ../setup/setup.ui.h:24 + 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" ++msgstr "" ++"Verhalten von IBus einstellen, das Sprach-Panel anzuzeigen oder zu verstecken" + + #: ../setup/setup.ui.h:25 + msgid "Show language panel:" +@@ -137,7 +140,9 @@ + + #: ../setup/setup.ui.h:29 + msgid "Show input method's name on language bar when check the checkbox" +-msgstr "Name der gewählten Eingabemethode auf Sprach-Panel anzeigen, wenn Ankreuzfeld aktiviert" ++msgstr "" ++"Name der gewählten Eingabemethode auf Sprach-Panel anzeigen, wenn " ++"Ankreuzfeld aktiviert" + + #: ../setup/setup.ui.h:30 + msgid "Embed preedit text in application window" +@@ -161,19 +166,26 @@ + + #: ../setup/setup.ui.h:35 + msgid "Add the selected input method into the enabled input methods" +-msgstr "Fügen Sie die gewählte Eingabemethode zu den aktivierten Eingabemethoden hinzu" ++msgstr "" ++"Fügen Sie die gewählte Eingabemethode zu den aktivierten Eingabemethoden " ++"hinzu" + + #: ../setup/setup.ui.h:36 + msgid "Remove the selected input method from the enabled input methods" +-msgstr "Entfernen Sie die gewählte Eingabemethode aus den aktivierten Eingabemethoden" ++msgstr "" ++"Entfernen Sie die gewählte Eingabemethode aus den aktivierten Eingabemethoden" + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "Bewegen Sie die gewählte Eingabemethode in den aktivierten Eingabemethoden nach oben" ++msgstr "" ++"Bewegen Sie die gewählte Eingabemethode in den aktivierten Eingabemethoden " ++"nach oben" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +-msgstr "Bewegen Sie die gewählte Eingabemethode in den aktivierten Eingabemethoden nach unten" ++msgstr "" ++"Bewegen Sie die gewählte Eingabemethode in den aktivierten Eingabemethoden " ++"nach unten" + + #: ../setup/setup.ui.h:39 + msgid "Show information of the selected input method" +@@ -187,7 +199,10 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "Die standardmäßige Eingabemethode steht in der Liste an erster Stelle.\nSie können dies mit den Hoch/Runter-Schaltflächen ändern." ++msgstr "" ++"Die standardmäßige Eingabemethode steht in der Liste an erster " ++"Stelle.\n" ++"Sie können dies mit den Hoch/Runter-Schaltflächen ändern." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -226,7 +241,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nDer intelligente Eingabe-Bus\nHomepage: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"Der intelligente Eingabe-Bus\n" ++"Homepage: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -265,7 +286,11 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Popup-Verzögerung für IME-Wechsel-Fenster setzen. Standardmäßig ist der Wert von 400 gesetzt. 0 = Fenster sofort anzeigen. 0 < Verzögerung in Millisekunden. 0 > Fenster nicht anzeigen und zur vorhergehenden/ nachfolgenden Engine wechseln." ++msgstr "" ++"Popup-Verzögerung für IME-Wechsel-Fenster setzen. Standardmäßig ist der Wert " ++"von 400 gesetzt. 0 = Fenster sofort anzeigen. 0 < Verzögerung in " ++"Millisekunden. 0 > Fenster nicht anzeigen und zur vorhergehenden/ " ++"nachfolgenden Engine wechseln." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -275,7 +300,10 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "Die gespeicherte Versions-Nummer wird verwendet, um den Unterschied zwischen der Version der zuvor installierten ibus und der aktuellen ibus zu überprüfen." ++msgstr "" ++"Die gespeicherte Versions-Nummer wird verwendet, um den Unterschied zwischen " ++"der Version der zuvor installierten ibus und der aktuellen ibus zu " ++"überprüfen." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -307,7 +335,8 @@ + + #: ../data/ibus.schemas.in.h:17 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "Tastenkombination zum Wechseln zur nächsten Eingabemethode in der Liste" ++msgstr "" ++"Tastenkombination zum Wechseln zur nächsten Eingabemethode in der Liste" + + #: ../data/ibus.schemas.in.h:18 + msgid "Prev engine shortcut keys" +@@ -325,7 +354,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "Verhalten des Sprach-Panels: 0 = Im Menü einbetten, 1 = Automatisch verstecken, 2 = Immer anzeigen" ++msgstr "" ++"Verhalten des Sprach-Panels: 0 = Im Menü einbetten, 1 = Automatisch " ++"verstecken, 2 = Immer anzeigen" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -335,7 +366,9 @@ + 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 "Die Position des Sprach-Panels: 0 = Ecke oben links, 1 = Ecke oben rechts, 2 = Ecke unten links, 3 = Ecke unten rechts, 4 = Benutzerdefiniert" ++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:24 + msgid "Orientation of lookup table" +@@ -383,7 +416,9 @@ + + #: ../data/ibus.schemas.in.h:40 + msgid "Enable input method by default when the application gets input focus" +-msgstr "Eingabemethode standardmäßig aktivieren, wenn die Anwendung Eingabefokus erlangt" ++msgstr "" ++"Eingabemethode standardmäßig aktivieren, wenn die Anwendung Eingabefokus " ++"erlangt" + + #: ../data/ibus.schemas.in.h:41 + msgid "DConf preserve name prefixes" +@@ -397,7 +432,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -450,7 +487,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Bitte eine Taste (oder eine Tastenkombination drücken).\nDer Dialog wird geschlossen, wenn die Taste losgelassen wird." ++msgstr "" ++"Bitte eine Taste (oder eine Tastenkombination drücken).\n" ++"Der Dialog wird geschlossen, wenn die Taste losgelassen wird." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -458,7 +497,9 @@ + + #: ../setup/main.py:98 ../setup/main.py:397 + msgid "Use shortcut with shift to switch to the previous input method" +-msgstr "Tastenkombination mit Umschalttaste benutzen, um zur vorherigen Eingabemethode zu wechseln" ++msgstr "" ++"Tastenkombination mit Umschalttaste benutzen, um zur vorherigen " ++"Eingabemethode zu wechseln" + + #: ../setup/main.py:331 + msgid "The IBus daemon is not running. Do you wish to start it?" +@@ -466,11 +507,18 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus wurde gestartet! Falls Sie IBus nicht nutzen können, fügen Sie bitte in " ++"$HOME/.bashrc die nachfolgenden Zeilen an und loggen Sie sich anschließend " ++"erneut ein.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus wurde gestartet! Falls Sie IBus nicht nutzen können, fügen Sie bitte in $HOME/.bashrc die nachfolgenden Zeilen an und loggen Sie sich anschließend erneut ein.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -504,7 +552,9 @@ + #: ../tools/main.vala:152 + #, c-format + msgid "No engine is set.\n" +-msgstr "Keine Engine gesetzt.\n\n" ++msgstr "" ++"Keine Engine gesetzt.\n" ++"\n" + + #: ../tools/main.vala:160 + #, c-format +@@ -582,7 +632,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Anwendung: %s BEFEHL [OPTION...]\n\n" ++msgstr "" ++"Anwendung: %s BEFEHL [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -612,8 +664,287 @@ + + #: ../ui/gtk3/panel.vala:666 + msgid "translator-credits" +-msgstr "Fabian Affolter , 2009.\nHedda Peters , 2009." ++msgstr "" ++"Fabian Affolter , 2009.\n" ++"Hedda Peters , 2009." + + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "Neustart" ++ ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Über die Eingabemethode" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Über die Eingabemethode" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Engine-Modus vorladen" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"Vorgeladene Engines sind mit diesem Modus geladen. 0 = Benutzer angepasste " ++"Engines. 1 = Mit Sprache verbundene Engines." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "Die Schlüssel vorgeladene_Engine wird initialisiert" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Verwenden Sie xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "xmodmap durchführen falls .xmodmap/.Xmodmap existiert." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Latin Tastaturbelegung die keine ASCII-Codes haben" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"US Tastaturbelegung ist an die Latin Tastaturbelegung angehängt. Variante " ++"ist nicht erforderlich." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "XKB Tastaturbelegungs-Liste, die bei ibus-Setup angezeigt wird" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"XKB Tastaturbelegungs-Liste, die bei ibus-Setup angezeigt wird. Das Format " ++"ist \"layout\" oder \"layout(variant)\"." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Auslöser-Tastenkombination ohne Zusatztasten" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Auslöser-Tastenkombination ohne Zusatztasten. Diese Liste wird von ibus-gjs " ++"verwendet." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Liste der System-Tastaturbelegungsgruppen bei ibus-Setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"Die Gruppenliste wird nicht standardmäßig alle System-Tastatur-Layouts " ++"anzeigen. Das Listen-Element wird am Ende des gconf Schlüssel angehängt " ++"werden. z. B. .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Liste der Europäischen Sprachen bei ibus-Setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-Setup zeigt die Sprachen nur in der Eingabe-Methode Liste, wenn Sie " ++"ibus-Setup in einer der Sprachen ausführen. Andere Sprachen sind unter einem " ++"erweiterten Schalter versteckt." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Liste der Asiatischen Sprachen bei ibus-Setup" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Zeige alle Eingabemethoden" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "Zeige nur die Eingabemethoden für Ihre Region" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"Die Liste der gespeicherten Eingabemethoden wird sofort gelöscht und die " ++"Liste wird jedesmal von der Anmeldungs-Sprache konfiguriert werden. Sind Sie " ++"damit einverstanden?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Wählen Sie eine Tastenkombination für %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Tastaturbelegung: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"Die standardmäßige Eingabemethode steht in der Liste an erster " ++"Stelle.\n" ++"Sie können dies mit den Hoch/Runter-Schaltflächen ändern." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "System-Tastaturbelegung verwenden" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "Eingabemethode-Framework" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus-Eingabemethode-Framework starten" ++ ++#~ msgid "trigger" ++#~ msgstr "Auslöser" ++ ++#~ msgid "enable" ++#~ msgstr "aktivieren" ++ ++#~ msgid "disable" ++#~ msgstr "deaktivieren" ++ ++#~ msgid "Previous page" ++#~ msgstr "Vorherige Seite" ++ ++#~ msgid "Next page" ++#~ msgstr "Nächste Seite" ++ ++#~ msgid "" ++#~ "Some input methods have been installed, removed or updated. Please " ++#~ "restart ibus input platform." ++#~ msgstr "" ++#~ "Einige Eingabemethoden wurden installiert, entfernt oder aktualisiert. " ++#~ "Bitte starten Sie die IBus-Eingabe-Plattform erneut." ++ ++#~ msgid "Restart Now" ++#~ msgstr "Jetzt neu starten" ++ ++#~ msgid "Later" ++#~ msgstr "Später" ++ ++#~ msgid "IBus Panel" ++#~ msgstr "IBus-Panel" ++ ++#~ msgid "IBus input method framework" ++#~ msgstr "IBus-Eingabemethode-Framework" ++ ++#~ msgid "Turn off input method" ++#~ msgstr "Eingabemethode ausschalten" ++ ++#~ msgid "No input window" ++#~ msgstr "Kein Eingabefenster" ++ ++#~ msgid "About the Input Method" ++#~ msgstr "Info zu Eingabemethoden" ++ ++#~ msgid "next input method" ++#~ msgstr "Nächste Eingabemethode" ++ ++#~ msgid "previous input method" ++#~ msgstr "Vorherige Eingabemethode" +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -13,7 +13,7 @@ + "Language-Team: English (British)\n" + "Language: en_GB\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=ASCII\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +@@ -515,6 +515,228 @@ + msgid "Restart" + msgstr "Restart" + ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "About the input method" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "About the input method" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++#, fuzzy ++msgid "Preload engine mode" ++msgstr "Preload engines" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++#, fuzzy ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Trigger shortcut keys" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++#, fuzzy ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Use system keyboard layout" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Show input method name" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "Show input method name" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++#, fuzzy ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "The shortcut keys for switching to the previous input method" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#. Translators: %d == 5 currently ++#: ../setup/main.py:413 ++#, python-format ++msgid "IBus daemon could not be started in %d seconds" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "Switch input method" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Select keyboard shortcut for %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Keyboard layout: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"The default input method is the top one in the list.\n" ++"You may use up/down buttons to change it." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Please press a key (or a key combination)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "Use system keyboard layout" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ + #~ msgid "Previous page" + #~ msgstr "Previous page" + +--- a/po/es.po ++++ b/po/es.po +@@ -70,7 +70,8 @@ + + #: ../setup/setup.ui.h:12 + 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" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -78,7 +79,8 @@ + + #: ../setup/setup.ui.h:14 + 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:15 + msgid "Previous input method:" +@@ -118,7 +120,9 @@ + + #: ../setup/setup.ui.h:24 + 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:25 + msgid "Show language panel:" +@@ -138,7 +142,9 @@ + + #: ../setup/setup.ui.h:29 + 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:30 + msgid "Embed preedit text in application window" +@@ -146,7 +152,9 @@ + + #: ../setup/setup.ui.h:31 + 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:32 + msgid "Use custom font:" +@@ -162,19 +170,27 @@ + + #: ../setup/setup.ui.h:35 + 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:36 + 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:37 + 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:38 + 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:39 + msgid "Show information of the selected input method" +@@ -188,7 +204,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "El método de entrada determinado está al comienzo de la lista.\nPuede usar los botones arriba/abajo para cambiarlo." ++msgstr "" ++"El método de entrada determinado está al comienzo de la lista.\n" ++"Puede usar los botones arriba/abajo para cambiarlo." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -227,7 +245,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nEl bus de entrada inteligente\nSitio web: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"El bus de entrada inteligente\n" ++"Sitio web: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -266,7 +290,11 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Establece retraso del Popup en milisegundos para mostrar la ventana del interruptor IME. Lo predeterminado es 400. 0 = Muestra la ventana inmediatamente. 0 < Demora en milisegundos. 0 > No muestra la ventana ni los motores siguientes o anteriores." ++msgstr "" ++"Establece retraso del Popup en milisegundos para mostrar la ventana del " ++"interruptor IME. Lo predeterminado es 400. 0 = Muestra la ventana " ++"inmediatamente. 0 < Demora en milisegundos. 0 > No muestra la ventana " ++"ni los motores siguientes o anteriores." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -276,7 +304,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "El número de versión guardada se usará para chequear la diferencia entre la versión de ibus previamente instalada y la del ibus actual." ++msgstr "" ++"El número de versión guardada se usará para chequear la diferencia entre la " ++"versión de ibus previamente instalada y la del ibus actual." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -308,7 +338,8 @@ + + #: ../data/ibus.schemas.in.h:17 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "Los atajos de teclado para avanzar al siguiente método de entrada de la lista" ++msgstr "" ++"Los atajos de teclado para avanzar al siguiente método de entrada de la lista" + + #: ../data/ibus.schemas.in.h:18 + msgid "Prev engine shortcut keys" +@@ -316,7 +347,9 @@ + + #: ../data/ibus.schemas.in.h:19 + msgid "The shortcut keys for switching to the previous input method" +-msgstr "Los atajos de teclado para retroceder al método de entrada anterior en la lista" ++msgstr "" ++"Los atajos de teclado para retroceder al método de entrada anterior en la " ++"lista" + + #: ../data/ibus.schemas.in.h:20 + msgid "Auto hide" +@@ -326,7 +359,9 @@ + 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" ++msgstr "" ++"El comportamiento del panel de idioma. 0 = Incrustado en el menú, 1 = " ++"Ocultarlo automáticamente, 2 = Mostrarlo siempre" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -336,7 +371,10 @@ + 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" ++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:24 + msgid "Orientation of lookup table" +@@ -384,7 +422,9 @@ + + #: ../data/ibus.schemas.in.h:40 + msgid "Enable input method by default when the application gets input focus" +-msgstr "Habilitar método de entrada en forma predeterminada cuando la aplicación en uso solicite alguno" ++msgstr "" ++"Habilitar método de entrada en forma predeterminada cuando la aplicación en " ++"uso solicite alguno" + + #: ../data/ibus.schemas.in.h:41 + msgid "DConf preserve name prefixes" +@@ -398,7 +438,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -451,7 +493,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Por favor, presione una tecla (o una combinación de tecla).\nEl diálogo será cerrado cuando la tecla sea soltada." ++msgstr "" ++"Por favor, presione una tecla (o una combinación de tecla).\n" ++"El diálogo será cerrado cuando la tecla sea soltada." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -467,11 +511,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"¡IBus fue iniciado! Sin no puede usar IBus, agregue las siguientes líneas a " ++"su $HOME/.bashrc; luego vuelga a ingresar a su cuenta.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "¡IBus fue iniciado! Sin no puede usar IBus, agregue las siguientes líneas a su $HOME/.bashrc; luego vuelga a ingresar a su cuenta.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -583,7 +633,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "USO: %s COMANDO [OPCION...]\n\n" ++msgstr "" ++"USO: %s COMANDO [OPCION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -618,3 +670,240 @@ + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "Reiniciar" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "Personalizar _methods de entrada activos" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "Personalizar métodos de entrada activos" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Modo de motor de precarga" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"Los motores de precarga se suben con este modo. 0 = motores personalizados " ++"de usuarios. 1 = motores relacionados con el lenguaje." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "La clave de preload_engines se inicializa" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Usar xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "Ejecutar xmodmap si .xmodmap/.Xmodmap existe." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Diseño latino que no tiene ASCII" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"Diseño de EE.UU se anexa a los diseños latinos. La variante no es necesaria." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "Lista de diseño XKB se muestra en ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"Lista de diseño XKB la cual se muestra en ibus-setup. El formato es \"layout" ++"\" o \"layout(variant)\"." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Activador de los Atajos de teclado sin teclas de modificador." ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Activador de los Atajos de teclado sin teclas de modificador. La lista es " ++"utilizada por ibus-gfs." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Lista de los grupos de diseño de teclado de sistema en ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"La lista de grupo no se utiliza para mostrar todos los diseños de teclado. " ++"El elemento de lista será anexado al final de la tecla gconf. Por " ++"ejemplo .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Lista de los idiomas europeos ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup muestra los idiomas en la lista del método de entrada cuando " ++"usted ejecuta ibus-setup en uno de los idiomas. Otras lenguas están ocultas " ++"en un botón extendido." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Lista de idiomas asiáticos en ibus-setup" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Muestra todos los métodos de entrada" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "Muestra únicamente los métodos de entrada para su región" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"La lista de sus métodos de entrada guardados será eliminada inmediatamente y " ++"será configurada cada vez por el idioma de ingreso. ¿Está de acuerdo con " ++"esto?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Seleccione la tecla de atajo para %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Diseño del teclado: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"El método de entrada determinado está al comienzo de la lista.\n" ++"Puede usar los botones arriba/abajo para cambiarlo." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Por favor, presione una tecla (o combinación de teclas)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2007-2012 Peng Huang\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "Usar el diseño del teclado del sistema" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "Marco de trabajo para métodos de entrada" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "Inicie el marco de trabajo para métodos de entrada IBus" ++ ++#~ msgid "trigger" ++#~ msgstr "activador" ++ ++#~ msgid "enable" ++#~ msgstr "habilitar" ++ ++#~ msgid "disable" ++#~ msgstr "Inhabilitar" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "comando [OPCIONES]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "El cambio del diseño de xkb a %s falló." +--- a/po/et.po ++++ b/po/et.po +@@ -2,7 +2,7 @@ + # Estonian translation of ibus. + # Copyright (C) 2008 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # , 2012. + msgid "" +@@ -457,7 +457,8 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +@@ -544,3 +545,207 @@ + #: ../ui/gtk3/panel.vala:402 + msgid "Restart" + msgstr "Restart" ++ ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Järgmine sisestusmeetod." ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Järgmine sisestusmeetod." ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Vali sisestusmeetod" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "Järgmine sisestusmeetod." ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Klaviatuuri asetus: %s\n" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Klaviatuuri asetus: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" +--- a/po/eu.po ++++ b/po/eu.po +@@ -2,7 +2,7 @@ + # Basque translation of ibus. + # Copyright (C) 2008 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Asier Iturralde Sarasola , 2012. + msgid "" +@@ -380,7 +380,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright-a (c) 2007-2010 Peng Huang\nCopyright-a (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright-a (c) 2007-2010 Peng Huang\n" ++"Copyright-a (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -457,7 +459,8 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +@@ -544,3 +547,208 @@ + #: ../ui/gtk3/panel.vala:402 + msgid "Restart" + msgstr "Berrabiarazi" ++ ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Erabili sarrera metodo orokorra" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Erabili sarrera metodo orokorra" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Erakutsi sarrera metodoaren izena" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "Erakutsi sarrera metodoaren izena" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "Hurrengo sarrera metodoa" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Teklatu-diseinua: %s\n" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Teklatu-diseinua: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" +--- a/po/fa.po ++++ b/po/fa.po +@@ -497,6 +497,214 @@ + msgid "Restart" + msgstr "راه‌اندازی مجدد" + ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#. Translators: %d == 5 currently ++#: ../setup/main.py:413 ++#, python-format ++msgid "IBus daemon could not be started in %d seconds" ++msgstr "" ++ ++#: ../setup/main.py:426 ++msgid "switching input methods" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++msgid "Select keyboard layouts" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "میانبرهای صفحه‌کلید" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ + #~ msgid "Previous page" + #~ msgstr "صفحهٔ قبل" + +--- a/po/fr.po ++++ b/po/fr.po +@@ -70,7 +70,8 @@ + + #: ../setup/setup.ui.h:12 + 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 de la liste" ++msgstr "" ++"Raccourci clavier pour passer à la méthode d'entrée suivante de la liste" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -78,7 +79,8 @@ + + #: ../setup/setup.ui.h:14 + 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 de la liste" ++msgstr "" ++"Raccourci clavier pour revenir à la méthode d'entrée précédente de la liste" + + #: ../setup/setup.ui.h:15 + msgid "Previous input method:" +@@ -90,7 +92,9 @@ + + #: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10 + 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 d'entrées" ++msgstr "" ++"Sélection des raccourcis claviers pour activer ou désactiver les méthodes " ++"d'entrées" + + #: ../setup/setup.ui.h:18 + msgid "Enable or disable:" +@@ -138,7 +142,9 @@ + + #: ../setup/setup.ui.h:29 + 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" ++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:30 + msgid "Embed preedit text in application window" +@@ -146,7 +152,9 @@ + + #: ../setup/setup.ui.h:31 + msgid "Embed the preedit text of input method in the application window" +-msgstr "Insérer le texte en cours d'édition par la méthode d'entrée dans la fenêtre de l'application" ++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:32 + msgid "Use custom font:" +@@ -166,15 +174,20 @@ + + #: ../setup/setup.ui.h:36 + msgid "Remove the selected input method from the enabled input methods" +-msgstr "Supprimer la méthode d'entrée sélectionnée des méthodes d'entrées actives" ++msgstr "" ++"Supprimer la méthode d'entrée sélectionnée des méthodes d'entrées actives" + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "Déplacer vers le haut la méthode d'entrée sélectionnée dans la liste des méthodes d'entrée actives" ++msgstr "" ++"Déplacer vers le haut la méthode d'entrée sélectionnée dans la liste des " ++"méthodes d'entrée actives" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +-msgstr "Déplacer vers le bas la méthode d'entrée sélectionnée dans la liste des méthodes d'entrée actives" ++msgstr "" ++"Déplacer vers le bas la méthode d'entrée sélectionnée dans la liste des " ++"méthodes d'entrée actives" + + #: ../setup/setup.ui.h:39 + msgid "Show information of the selected input method" +@@ -189,7 +202,10 @@ + "The active input method can be switched around from the selected " + "ones in the above list by pressing the keyboard shortcut keys or clicking " + "the panel icon." +-msgstr "La méthode de saisie active peut être modifiée vers l'une des méthodes pré-sélectionnées dans la liste ci-dessous en tapant le raccourci clavier ou en cliquant sur l'icône du panneau." ++msgstr "" ++"La méthode de saisie active peut être modifiée vers l'une des " ++"méthodes pré-sélectionnées dans la liste ci-dessous en tapant le raccourci " ++"clavier ou en cliquant sur l'icône du panneau." + + #. create im name & icon column + #: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66 +@@ -228,7 +244,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nThe intelligent input bus\nPage d'accueil : http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"The intelligent input bus\n" ++"Page d'accueil : http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:56 + msgid "Start ibus on login" +@@ -260,14 +282,20 @@ + + #: ../data/ibus.schemas.in.h:5 + msgid "Popup delay milliseconds for IME switcher window" +-msgstr "Délai en millisecondes d'affichage de la fenêtre du commutateur de méthode d'entrée" ++msgstr "" ++"Délai en millisecondes d'affichage de la fenêtre du commutateur de méthode " ++"d'entrée" + + #: ../data/ibus.schemas.in.h:6 + msgid "" + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Définit le délai en millisecondes d'affichage de la fenêtre du commutateur de méthode d'entrée. La valeur par défaut est de 400. 0 = montrer immédiatement la fenêtre. 0 < délai en millisecondes. 0 > ne pas afficher la fenêtre et permuter avec le moteur précédent ou suivant." ++msgstr "" ++"Définit le délai en millisecondes d'affichage de la fenêtre du commutateur " ++"de méthode d'entrée. La valeur par défaut est de 400. 0 = montrer " ++"immédiatement la fenêtre. 0 < délai en millisecondes. 0 > ne pas " ++"afficher la fenêtre et permuter avec le moteur précédent ou suivant." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -277,7 +305,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "Le numéro de version enregistré sera utilisé pour vérifier la différence entre la version d'une installation précédente de ibus et l'actuelle." ++msgstr "" ++"Le numéro de version enregistré sera utilisé pour vérifier la différence " ++"entre la version d'une installation précédente de ibus et l'actuelle." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -309,7 +339,8 @@ + + #: ../data/ibus.schemas.in.h:17 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "Raccourci clavier pour passer à la méthode d'entrée suivante de la liste" ++msgstr "" ++"Raccourci clavier pour passer à la méthode d'entrée suivante de la liste" + + #: ../data/ibus.schemas.in.h:18 + msgid "Prev engine shortcut keys" +@@ -327,7 +358,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "Sélection du comportement d'affichage de la liste des candidats. 0 = Insérée dans le menu, 1 = Masquer automatiquement, 2 = Toujours afficher" ++msgstr "" ++"Sélection du comportement d'affichage de la liste des candidats. 0 = Insérée " ++"dans le menu, 1 = Masquer automatiquement, 2 = Toujours afficher" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -337,7 +370,10 @@ + 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 "Position de la barre de langue. 0 = Coin supérieur gauche, 1 = Coin supérieur droit, 2 = Coin inférieur gauche, 3 = Coin inférieur droit, 4 = Personnalisé" ++msgstr "" ++"Position de la barre de langue. 0 = Coin supérieur gauche, 1 = Coin " ++"supérieur droit, 2 = Coin inférieur gauche, 3 = Coin inférieur droit, 4 = " ++"Personnalisé" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -385,7 +421,8 @@ + + #: ../data/ibus.schemas.in.h:40 + msgid "Enable input method by default when the application gets input focus" +-msgstr "Par défaut, activer la méthode d'entrée lorsque l'application reçoit le focus" ++msgstr "" ++"Par défaut, activer la méthode d'entrée lorsque l'application reçoit le focus" + + #: ../data/ibus.schemas.in.h:41 + msgid "DConf preserve name prefixes" +@@ -399,7 +436,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -452,7 +491,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches).\nLa boîte de dialogue se fermera lorsque la touche sera relâchée." ++msgstr "" ++"Veuillez appuyer sur une touche (ou une combinaison de touches).\n" ++"La boîte de dialogue se fermera lorsque la touche sera relâchée." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -460,7 +501,8 @@ + + #: ../setup/main.py:99 ../setup/main.py:392 + msgid "Use shortcut with shift to switch to the previous input method" +-msgstr "Utiliser le raccourci clavier pour revenir à la méthode d'entrée précédente" ++msgstr "" ++"Utiliser le raccourci clavier pour revenir à la méthode d'entrée précédente" + + #: ../setup/main.py:326 + msgid "The IBus daemon is not running. Do you wish to start it?" +@@ -468,11 +510,18 @@ + + #: ../setup/main.py:347 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus a été démarré ! Si vous ne pouvez pas utiliser IBus, veuillez ajouter " ++"les lignes suivantes dans le fichier « $HOME/.bashrc », et veuillez vous " ++"reconnecter.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus a été démarré ! Si vous ne pouvez pas utiliser IBus, veuillez ajouter les lignes suivantes dans le fichier « $HOME/.bashrc », et veuillez vous reconnecter.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:361 +@@ -584,7 +633,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Utilisation : %s COMMANDE [OPTION…]\n\n" ++msgstr "" ++"Utilisation : %s COMMANDE [OPTION…]\n" ++"\n" + + #: ../tools/main.vala:309 + #, c-format +@@ -619,3 +670,240 @@ + #: ../ui/gtk3/panel.vala:697 + msgid "Restart" + msgstr "Redémarrer" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "Personnaliser les _méthodes de saisie actives" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "Personnaliser les méthodes de saisie actives" ++ ++#: ../setup/setup.ui.h:43 ++msgid "" ++"The default input method is the top one in the list.\n" ++"You may use up/down buttons to change it." ++msgstr "" ++"La méthode d'entrée par défaut se trouve en haut de la liste.\n" ++"Utilisez les boutons « Monter/Descendre » pour changer l'ordre." ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Mode de moteur de préchargement" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"Les moteurs de préchargement sont chargés avec ce mode. 0 = moteurs " ++"personnalisés. 1 = moteurs liés aux langues." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "La clé preload_engines est initialisée" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Utiliser xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "Lancer xmodmap si .xmodmap/.Xmodmap existe." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Disposition latine sans ASCII" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"la disposition us est ajoutée aux dispositions latines. La variante n'est " ++"pas nécessaire." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "la liste de dispositions XKB affichée sur ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"la liste de dispositions XKB affichée sur ibus-setup. Le format est " ++"« disposition » ou « disposition(variante) »" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Déclencher les raccourcis claviers sans touches de commutation" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Déclencher les raccourcis claviers sans touches de commutation. La liste est " ++"utilisée par ibus-gjs." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "" ++"Liste de groupes de dispositions de claviers du système sur ibus-setup." ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"La liste des groupes est utilisée afin de ne pas montrer toutes les " ++"dispositions de clavier par défaut du système. L'élément de liste sera " ++"ajouté à la fin de la clé de gconf. Par exemple .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Liste de langues européennes sur ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup affiche les langues sous forme de liste de méthodes de saisie " ++"uniquement lorsque ibus-setup est utilisé sur l'une des langues. Les autres " ++"langues sont cachées sous un bouton étendu." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Liste de langues asiatiques sur ibus-setup" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "Interroger la disposition xkb actuelle" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "Définir la disposition xkb" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "DISPOSITION" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "Définir la VARIANTE xkb" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "VARIANTE" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "Définir l'OPTION xkb" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "OPTION" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "Obtenir l'état xbd actuel" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Afficher toutes les méthodes de saisie" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "N'afficher que les méthodes de saisie de votre région" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"La liste de vos méthodes de saisie enregistrées sera effacée immédiatement " ++"et la liste sera à chaque fois configurée par la langue de connexion. Êtes " ++"vous d'accord avec ceci ?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "Par défaut" ++ ++#: ../setup/xkbsetup.py:207 ++msgid "Select keyboard layouts" ++msgstr "Définir les dispositions de claviers" ++ ++#: ../setup/xkbsetup.py:212 ++msgid "Keyboard Layouts" ++msgstr "Dispositions de claviers" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"Les dispositions de claviers du système ne peuvent être " ++"inférieures à %d.\n" ++"Utiliser les boutons « Monter/Descendre » pour modifier l'ordre." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "Merci de redémarrer IBus afin de recharger la configuration" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "L'option du clavier ne peut être sélectionnée." ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2012 Takao Fujiwara\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "Disposition par défaut" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "Configuration" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "Configurer le moteur XKB" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "Obtenir la disposition xkb actuelle" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "Définir le layout xbd" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "Définir le modèle xbd" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "Définir l'option xbd" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "Framework de méthode de saisie" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "Démarrer le framework de méthode de saisie IBus" ++ ++#~ msgid "trigger" ++#~ msgstr "déclencheur" ++ ++#~ msgid "enable" ++#~ msgstr "activer" ++ ++#~ msgid "disable" ++#~ msgstr "désactiver" +--- a/po/gu.po ++++ b/po/gu.po +@@ -2,7 +2,7 @@ + # Gujarati translation of ibus. + # Copyright (C) 2008-2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Ankit Patel , 2010 + # sweta , 2009-2010 +@@ -186,7 +186,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "મૂળભૂત ઇનપુટ પદ્દતિ યાદીમાં ઉપર છે.\nતેને બદલવા માટે તમે ઉપર કરો/નીચે કરો બટનોને વાપરી શકો છો." ++msgstr "" ++"મૂળભૂત ઇનપુટ પદ્દતિ યાદીમાં ઉપર છે.\n" ++"તેને બદલવા માટે તમે ઉપર કરો/નીચે કરો બટનોને વાપરી શકો છો." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -225,7 +227,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nહોશિયાર ઇનપુટ બસ\nઘરપાનું: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"હોશિયાર ઇનપુટ બસ\n" ++"ઘરપાનું: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -264,7 +272,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME સ્વીચર વિન્ડોને બતાવવા માટે મિલિસેકંડનો વિલંબ સુયોજિત કરો. મૂળભૂત 400 છે. 0 = વિન્ડોને તરત જ બતાવો. 0 < મિલિસેકંડમાં વિલંબ. 0 > વિન્ડોને બતાવો નહિં અને પહેલાંનુ/પછીનાં એંજિનને બદલો." ++msgstr "" ++"IME સ્વીચર વિન્ડોને બતાવવા માટે મિલિસેકંડનો વિલંબ સુયોજિત કરો. મૂળભૂત 400 છે. 0 = " ++"વિન્ડોને તરત જ બતાવો. 0 < મિલિસેકંડમાં વિલંબ. 0 > વિન્ડોને બતાવો નહિં અને પહેલાંનુ/" ++"પછીનાં એંજિનને બદલો." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -274,7 +285,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "પહેલાંની સ્થાપિત થયેલ ibus અને હાલની ibus ની એકની આવૃત્તિ વચ્ચે તફાવત ચકાસવા માટે સંગ્રહેલ આવૃત્તિ નંબરને વાપરેલ હશે." ++msgstr "" ++"પહેલાંની સ્થાપિત થયેલ ibus અને હાલની ibus ની એકની આવૃત્તિ વચ્ચે તફાવત ચકાસવા માટે " ++"સંગ્રહેલ આવૃત્તિ નંબરને વાપરેલ હશે." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -334,7 +347,9 @@ + 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 "ભાષા પેનલનું સ્થાન. ૦ = ઉંચે ડાબી બાજુનો ખૂણો, ૧ = ઉંચે જમણી બાજુનો ખૂણો, ૨ = નીચે ડાબી બાજુનો ખૂણો, ૩ = નીચે જમણી બાજુનો ખૂણો, ૪ = વૈવિધ્ય" ++msgstr "" ++"ભાષા પેનલનું સ્થાન. ૦ = ઉંચે ડાબી બાજુનો ખૂણો, ૧ = ઉંચે જમણી બાજુનો ખૂણો, ૨ = નીચે ડાબી " ++"બાજુનો ખૂણો, ૩ = નીચે જમણી બાજુનો ખૂણો, ૪ = વૈવિધ્ય" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -396,7 +411,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -449,7 +466,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "મહેરબાની કરીને કીને દબાવો (અથવા કી સંયોજન).\nસંવાદ એ બંધ થયેલ હશે જ્યારે કી પ્રકાશિત થયેલ હોય તો." ++msgstr "" ++"મહેરબાની કરીને કીને દબાવો (અથવા કી સંયોજન).\n" ++"સંવાદ એ બંધ થયેલ હશે જ્યારે કી પ્રકાશિત થયેલ હોય તો." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -465,11 +484,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus ને શરૂ કરી દેવામાં આવી છે! જો તમે IBus ને વાપરી શકતા ન હોય તો, તમારી $HOME/." ++"bashrc માં નીચેના વાક્યોને ઉમેરો; પછી ડેસ્કટોપમાં પુન:લોગ કરો.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus ને શરૂ કરી દેવામાં આવી છે! જો તમે IBus ને વાપરી શકતા ન હોય તો, તમારી $HOME/.bashrc માં નીચેના વાક્યોને ઉમેરો; પછી ડેસ્કટોપમાં પુન:લોગ કરો.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -581,7 +606,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "વપરાશ: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"વપરાશ: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -616,3 +643,233 @@ + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "પુન:શરૂ કરો" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "સક્રિય ઇનપુટ પદ્દતિઓને વૈવિધ્યપૂર્ણ બનાવો (_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "સક્રિય ઇનપુટ પદ્દતિઓને વૈવિધ્યપૂર્ણ બનાવો" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "પહેલેથી લાવેલ એંજિન સ્થિતિ" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"પહેલેથી લાવેલ એંજિનોને આ સ્થિતિ સાથે લાવેલ છે. 0 = વપરાશકર્તા વૈવિધ્યપૂર્ણ એંજિન. 1 = ભાષા " ++"સંબંધિત એંજિન." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "કિ પહેલેથી લાવેલ એંજિનોની શરૂઆત થયેલ છે (_e)" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap ને વાપરો" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "xmodmap ચલાવો જો .xmodmap/.Xmodmap અસ્તિત્વમાં હોય." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "લેટિન લેઆઉટ કે જેની પાસે ASCII નથી" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "us લેઆઉટ લેટિન લેઆઉટ સાથે જોડાયેલ છે. ચલની જરૂરિયાત નથી." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "XKB લેઆઉટ યાદી કે જે ibus-setup પર બતાવેલ છે" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"XKB લેઆઉટ યાદી કે જે ibus-setup પર બતાવેલ છે. બંધારણ \"લેઆઉટ\" અથવા \"લેઆઉટ(ચલ)\" છે." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "સંપાદિત કી વગર ટ્રીગર ટૂંકાણ કી" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "સંપાદિત કી વગર ટ્રીગર ટૂંકાણ કી. યાદી એ ibus-gjs દ્દારા વાપરેલ છે." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup પર સિસ્ટમ કિબોર્ડ લેઆઉટની યાદી" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"મૂળભૂત યાદી એ મૂળભૂત રીતે બધા સિસ્ટમ કિબોર્ડ લેઆઉટને બતાવવા માટે વાપરેલ નથી. યાદી વસ્તુ " ++"gconf કીને અંતે જોડાયેલ હશે. દા.ત. .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup પર યુરોપિયન ભાષાઓની યાદી" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup એ ઇનપુટ પદ્દતિ યાદીમાં ફક્ત ભાષાઓને બતાવે છે જ્યારે તમે કોઇપણ ભાષામાંની એક " ++"પર ibus-setup ને ચલાવો. બીજી ભાષાઓ વિસ્તરેલ બટન હેઠળ છુપાયેલ છે." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup પર એશિયન ભાષાઓની યાદી" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "બધી ઇનપુટ પદ્દતિને બતાવો" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "ફક્ત તમારાં વિસ્તારની ઇનપુટ પદ્દતિને બતાવો" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"તમારી સંગ્રહેલ ઇનપુટ પદ્દતિઓની યાદી એ તરત જ સાફ થઇ જશે અને દરેક વખતે ભાષામાં પ્રવેશીને " ++"યાદી રૂપરેખાંકિત થશે. શું તમે આની સાથે સંમત છો?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s માટે કિબોર્ડ ટૂંકાણોને પસંદ કરો" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "કિબોર્ડ લેઆઉટ: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"મૂળભૂત ઇનપુટ પદ્દતિ યાદીમાં ઉપર છે.\n" ++"તેને બદલવા માટે તમે ઉપર કરો/નીચે કરો બટનોને વાપરી શકો છો." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "મહેરબાની કરીને કી ને દબાવો (અથવા કી સંયોજન)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2007-2012 Peng Huang\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "સિસ્ટમ કિબોર્ડ લેઆઉટને વાપરો" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "ઇનપુટ પદ્દતિ ફ્રેમવર્ક" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus ઇનપુટ પદ્દતિ ફ્રેમવર્કને શરૂ કરો" ++ ++#~ msgid "trigger" ++#~ msgstr "ટ્રીગર" ++ ++#~ msgid "enable" ++#~ msgstr "સક્રિય" ++ ++#~ msgid "disable" ++#~ msgstr "નિષ્ક્રિય" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "આદેશ [OPTIONS]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "%s માં xkb લેઆઉટને બદલવામાં નિષ્ફળતા." +--- a/po/hi.po ++++ b/po/hi.po +@@ -2,7 +2,7 @@ + # Hindi translation of ibus. + # Copyright (C) 2008-2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Rajesh Ranjan , 2009 + # Rajesh Ranjan , 2009,2011-2012 +@@ -185,7 +185,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "तयशुदा इनपुट विधि सूची में सबसे ऊपर है.\nआप ऊपर/नीचे बटन को इसे बदलने के लिए प्रयोग कर सकते हैं." ++msgstr "" ++"तयशुदा इनपुट विधि सूची में सबसे ऊपर है.\n" ++"आप ऊपर/नीचे बटन को इसे बदलने के लिए प्रयोग कर सकते हैं." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64 +@@ -224,7 +226,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nतेज-तर्रार इनपुट बस\nहोमपेज: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"तेज-तर्रार इनपुट बस\n" ++"होमपेज: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -275,7 +283,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME स्विचर विंडो दिखाने के लिए पॉपअप विलंब को मिलीसेकेंड में सेट करें. तयशुदा है400. 0 = विंडो को तत्काल दिखाएँ. 0 < मिलीसेकेंड विलंब. 0 > विंडो को मत दिखाएँ और पिछला/अगला इंजन में स्विच करें." ++msgstr "" ++"IME स्विचर विंडो दिखाने के लिए पॉपअप विलंब को मिलीसेकेंड में सेट करें. तयशुदा है400. 0 = " ++"विंडो को तत्काल दिखाएँ. 0 < मिलीसेकेंड विलंब. 0 > विंडो को मत दिखाएँ और पिछला/" ++"अगला इंजन में स्विच करें." + + #: ../data/ibus.schemas.in.h:7 + msgid "Trigger shortcut keys" +@@ -325,7 +336,8 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "भाषा फलक का व्यवहार. 0 = मेन्यू में अंतःस्थापित, 1 = स्वतः छिपाएँ, 2 = हमेशा दिखाएँ" ++msgstr "" ++"भाषा फलक का व्यवहार. 0 = मेन्यू में अंतःस्थापित, 1 = स्वतः छिपाएँ, 2 = हमेशा दिखाएँ" + + #: ../data/ibus.schemas.in.h:20 + msgid "Language panel position" +@@ -335,7 +347,9 @@ + 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 = निचला बायां कोना, 3 = निचला दाहिना कोना, 4 = पसंदीदा" ++msgstr "" ++"भाषा पटल की स्थिति. 0 = ऊपरी बायाँ कोना, 1 = ऊपरी दाहिना कोना, 2 = निचला बायां " ++"कोना, 3 = निचला दाहिना कोना, 4 = पसंदीदा" + + #: ../data/ibus.schemas.in.h:22 + msgid "Orientation of lookup table" +@@ -397,7 +411,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -450,7 +466,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग).\nयह संवाद कुंजी छोड़े जाने पर बंद हो जाएगा." ++msgstr "" ++"कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग).\n" ++"यह संवाद कुंजी छोड़े जाने पर बंद हो जाएगा." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -466,11 +484,17 @@ + + #: ../setup/main.py:353 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus को आरंभ किया गया है! यदि आप IBus का उपयोग नहीं करना चाहते हैं, अपने $HOME/." ++"bashrc; में निम्नलिखित पंक्ति जोड़ें फिर अपने डेस्कटॉप में लॉग करें.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus को आरंभ किया गया है! यदि आप IBus का उपयोग नहीं करना चाहते हैं, अपने $HOME/.bashrc; में निम्नलिखित पंक्ति जोड़ें फिर अपने डेस्कटॉप में लॉग करें.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:367 +@@ -525,7 +549,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "प्रयोग: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"प्रयोग: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:225 + #, c-format +@@ -552,3 +578,223 @@ + #: ../ui/gtk3/panel.vala:539 + msgid "Restart" + msgstr "पुनः प्रारंभ करें" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "सक्रिय इनपुट विधि मनपसंद बनाएँ (_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "सक्रिय इनपुट विधि मनपसंद बनाएँ" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "प्रीलोड ईंजन अवस्था" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"प्रीलोड ईंजन को इस अवस्था से लोड किया जाता है. 0 = उपयोक्ता द्वारा मनपसंद किया ईंजन. " ++"1 = भाषा संबंधी ईंजन." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "कुंजी preload_engines आरंभ किया गया है" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap का उपयोग करें" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "xmodmap चलाएँ यदि .xmodmap/.Xmodmap मौजूद है." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "लैटिन ख़ाका जिसमें ASCII नहीं है" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "यूएस ख़ाका लैटिन ख़ाका में स्वीकार है. चर जरूरी नहीं है." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "XKB ख़ाका जो ibus-setup पर दिखाया गया है" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"XKB ख़ाका सूची जो कि ibus-setup पर दिखाया गया है. \"layout\" या " ++"\"layout(variant)\" प्रारूप है." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "बिना मॉडिफायर कुँझी के लघुकुँजी ट्रिगर करें" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"बिना मॉडिफायर कुँझी के लघुकुँजी ट्रिगर करें. सूची को ibus-gjs के द्वारा प्रयोग किया गया है." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup पर तंत्र कुँजीपटल ख़ाका समूह की सूची" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"समूह सूची को तयशुदा रूप से सभी तंत्र कुँजीपटल को दिखाने के लिए प्रयोग नहीं किया गया है. " ++"सूची मद को gconf कुँजी के अंत में जोड़ा जाएगा. जैसे .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup पर यूरोपीय भाषाओं की सूची" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup केवल भाषा को इनपुट सूची में दिखाता है जब आप ibus-setup को किसी एक भाषा " ++"पर चलाते हैं. विस्तारित बटन के अंतर्गत अन्य भाषाएँ छिपी हैं." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup पर एशियाई भाषाओं की सूची" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "सभी इनपुट पद्धति दिखाएँ" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "अपने क्षेत्र के लिए केवल इनपुट विधि दिखाएँ" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"आपके सहेजे इनपुट विधि की सूची को तत्काल साफ़ किया जाएगा और सूची को हर बार लॉगिन भाषा " ++"के द्वारा विन्यस्त किया जाएगा. क्या आप इसके लिए सहमत हैं?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s के लिए कुंजीपटल शॉर्टकर्ट चुनें" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "कुंजीपट लेआउट: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"तयशुदा इनपुट विधि सूची में सबसे ऊपर है.\n" ++"आप ऊपर/नीचे बटन को इसे बदलने के लिए प्रयोग कर सकते हैं." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "कृपया कोई कुंजी दबाएँ (या कोई कुंजी संयोग)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "कॉपीराइट (c) 2007-2012 Peng Huang\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "तंत्र कुंजीपट लेआउट का प्रयोग करें" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "trigger" ++#~ msgstr "ट्रिगर" ++ ++#~ msgid "enable" ++#~ msgstr "सक्रिय करें" ++ ++#~ msgid "disable" ++#~ msgstr "निष्क्रिय करें" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "xkb लेआउट को %s विफल में स्विच करें." +--- a/po/hu.po ++++ b/po/hu.po +@@ -2,7 +2,7 @@ + # Hungarian translation of ibus. + # Copyright (C) 2008-2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # kelemeng , 2011 + # kelemeng , 2011 +@@ -144,7 +144,8 @@ + + #: ../setup/setup.ui.h:31 + msgid "Embed the preedit text of input method in the application window" +-msgstr "A beviteli mód előszerkesztett szövegének beágyazása az alkalmazás ablakába" ++msgstr "" ++"A beviteli mód előszerkesztett szövegének beágyazása az alkalmazás ablakába" + + #: ../setup/setup.ui.h:32 + msgid "Use custom font:" +@@ -160,19 +161,26 @@ + + #: ../setup/setup.ui.h:35 + msgid "Add the selected input method into the enabled input methods" +-msgstr "A kiválasztott beviteli mód hozzáadása az engedélyezett beviteli módokhoz" ++msgstr "" ++"A kiválasztott beviteli mód hozzáadása az engedélyezett beviteli módokhoz" + + #: ../setup/setup.ui.h:36 + msgid "Remove the selected input method from the enabled input methods" +-msgstr "A kiválasztott beviteli mód eltávolítása az engedélyezett beviteli módok közül" ++msgstr "" ++"A kiválasztott beviteli mód eltávolítása az engedélyezett beviteli módok " ++"közül" + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "A kiválasztott beviteli mód mozgatása felfelé az engedélyezett beviteli módok között" ++msgstr "" ++"A kiválasztott beviteli mód mozgatása felfelé az engedélyezett beviteli " ++"módok között" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +-msgstr "A kiválasztott beviteli mód mozgatása lefelé az engedélyezett beviteli módok között" ++msgstr "" ++"A kiválasztott beviteli mód mozgatása lefelé az engedélyezett beviteli módok " ++"között" + + #: ../setup/setup.ui.h:39 + msgid "Show information of the selected input method" +@@ -186,7 +194,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "Az alapértelmezett beviteli mód a listában a legfelső.\nEzt a fel/le billentyűk segítségével változtathatja meg." ++msgstr "" ++"Az alapértelmezett beviteli mód a listában a legfelső.\n" ++"Ezt a fel/le billentyűk segítségével változtathatja meg." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64 +@@ -225,7 +235,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nAz intelligens beviteli busz\nHonlap: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"Az intelligens beviteli busz\n" ++"Honlap: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -276,7 +292,11 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Beállítja a felugró ablak késését, hogy megjeleníthesse az IME váltó ablakot. Az alapértelmezett 400.0 = Azonnal megjelenik. 0 < Késés milliszekundumban. 0 > Nem jeleníti meg az ablakot, és átváltja a köv./előző motorra." ++msgstr "" ++"Beállítja a felugró ablak késését, hogy megjeleníthesse az IME váltó " ++"ablakot. Az alapértelmezett 400.0 = Azonnal megjelenik. 0 < Késés " ++"milliszekundumban. 0 > Nem jeleníti meg az ablakot, és átváltja a köv./" ++"előző motorra." + + #: ../data/ibus.schemas.in.h:7 + msgid "Trigger shortcut keys" +@@ -308,7 +328,8 @@ + + #: ../data/ibus.schemas.in.h:15 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "A lista következő beviteli módjára váltáshoz használandó gyorsbillentyű" ++msgstr "" ++"A lista következő beviteli módjára váltáshoz használandó gyorsbillentyű" + + #: ../data/ibus.schemas.in.h:16 + msgid "Prev engine shortcut keys" +@@ -326,7 +347,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "A nyelvi panel viselkedése. 0 = beágyazva a menübe, 1 = automatikus elrejtés, 2 = megjelenítés mindig" ++msgstr "" ++"A nyelvi panel viselkedése. 0 = beágyazva a menübe, 1 = automatikus " ++"elrejtés, 2 = megjelenítés mindig" + + #: ../data/ibus.schemas.in.h:20 + msgid "Language panel position" +@@ -336,7 +359,9 @@ + 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 "A nyelv panel pozíciója. 0 = bal felső sarok, 1 = jobb felső sarok, 2 = bal alsó sarok, 3 = jobb alsó sarok, 4 = egyéni" ++msgstr "" ++"A nyelv panel pozíciója. 0 = bal felső sarok, 1 = jobb felső sarok, 2 = bal " ++"alsó sarok, 3 = jobb alsó sarok, 4 = egyéni" + + #: ../data/ibus.schemas.in.h:22 + msgid "Orientation of lookup table" +@@ -384,7 +409,9 @@ + + #: ../data/ibus.schemas.in.h:38 + msgid "Enable input method by default when the application gets input focus" +-msgstr "Beviteli mód engedélyezése alapértelmezésben, amikor az alkalmazás beviteli fókuszba kerül" ++msgstr "" ++"Beviteli mód engedélyezése alapértelmezésben, amikor az alkalmazás beviteli " ++"fókuszba kerül" + + #: ../data/ibus.schemas.in.h:39 + msgid "DConf preserve name prefixes" +@@ -398,7 +425,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -451,7 +480,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Nyomjon meg egy billentyűt (vagy billentyűkombinációt).\nAz ablak a billentyű felengedésekor bezáródik." ++msgstr "" ++"Nyomjon meg egy billentyűt (vagy billentyűkombinációt).\n" ++"Az ablak a billentyű felengedésekor bezáródik." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -459,7 +490,9 @@ + + #: ../setup/main.py:99 ../setup/main.py:398 + msgid "Use shortcut with shift to switch to the previous input method" +-msgstr "Alkalmazza a shift billentyűt a gyors visszaváltáshoz, hogy elérje a korábbi beviteli módot" ++msgstr "" ++"Alkalmazza a shift billentyűt a gyors visszaváltáshoz, hogy elérje a korábbi " ++"beviteli módot" + + #: ../setup/main.py:332 + msgid "The IBus daemon is not running. Do you wish to start it?" +@@ -467,11 +500,17 @@ + + #: ../setup/main.py:353 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:367 +@@ -526,7 +565,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Használat: %s PARANCS [OPCIÓK...]\n\n" ++msgstr "" ++"Használat: %s PARANCS [OPCIÓK...]\n" ++"\n" + + #: ../tools/main.vala:225 + #, c-format +@@ -548,8 +589,238 @@ + + #: ../ui/gtk3/panel.vala:507 + msgid "translator-credits" +-msgstr "Zoltan Hoppar , 2012.\n\nLaunchpad Contributions:\n Gabor Kelemen https://launchpad.net/~kelemeng\n Muszela Balázs https://launchpad.net/~bazsi86-deactivatedaccount\n Ocsovszki Dorián https://launchpad.net/~gorkhaan\n Robert Roth https://launchpad.net/~evfool\n Token https://launchpad.net/~kozmad\n fergekolferol https://launchpad.net/~ferge-kolferol" ++msgstr "" ++"Zoltan Hoppar , 2012.\n" ++"\n" ++"Launchpad Contributions:\n" ++" Gabor Kelemen https://launchpad.net/~kelemeng\n" ++" Muszela Balázs https://launchpad.net/~bazsi86-deactivatedaccount\n" ++" Ocsovszki Dorián https://launchpad.net/~gorkhaan\n" ++" Robert Roth https://launchpad.net/~evfool\n" ++" Token https://launchpad.net/~kozmad\n" ++" fergekolferol https://launchpad.net/~ferge-kolferol" + + #: ../ui/gtk3/panel.vala:539 + msgid "Restart" + msgstr "Újraindítás" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "Állítsa be az aktív input_methods-okat" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "Állítsa be az aktív beviteli metódusokat" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Engine mód gyorstárazása" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"Előkészített engine-ek betöltésre kerülnek ebben a módban. 0= felhasználó " ++"által beállított engine-k. 1 = nyelvvel kapcsolatos engine-k." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "A preload_engines kulcs beállítva" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Az xmodmap használata" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "Futtassa az xmodmap alkalmazást ha az .xmodmap/.Xmodmap létezik." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Latin kiosztás amelynek nincs ASCII része" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "US kiosztás hozzáfűzve a latin kiosztáshoz. Variáns nem szükséges." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "XKB kiosztási lista ami megjelenik az ibus-setup alkalmazásban" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"XKB kiosztási lista ami megjelenik az ibus-setup alkalmazásban. A formátum: " ++"\"kiosztás\" vagy \"kiosztás(variáns)\"." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Nyomja le a gyorsbillentyűket módosító billentyűk nélkül" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Nyomja le a gyorsbillentyűket módosító billentyűk nélkül. A lista a ibus-gjs " ++"által kerül felhasználásra." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Rendszerbeli kiosztási csoportok listája az ibus-setup alkalmazásban" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"A csoportlista azért kerül alkalmazásra, hogy ne az összes rendszerbeli " ++"kiosztás jelenjen meg alapértelmezésben. A listaelemek összefűzésre kerülnek " ++"a gconf key fájl végén. Pl. .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Az európai nyelvek listája az ibus-setup alkalmazásban" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"Az ibus-setup alkalmazás csaj akkor jeleníti meg a beviteli metódus listát, " ++"ha az alkalmazást futtatja valamely nyelven. Más nyelvek rejtve vannak egy " ++"kibontó menü alatt." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Ázsiai nyelvek listája az ibus-setup alkalmazásban" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "Jelenlegi xkb kiosztás lekérdezése" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "Az xkb KIOSZTÁS beállítása" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "KIOSZTÁS" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "Az xkb VARIÁNS beállítása" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "VARIÁNS" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "Az xkb OPCIÓ beállítása" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "OPCIÓ" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "Jelenlegi xkb állapota" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Összes beviteli metódus megjelenítése" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "Csak a régióhoz tartozó beviteli metódusok megjelenítése" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"A mentett beviteli metódusok listája azonnal törlésre kerül, és a lista a " ++"bejelentkezési nyelv után kerül ezentúl beállításra. Elfogadja ezt?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "Alapértelmezett" ++ ++#: ../setup/xkbsetup.py:207 ++msgid "Select keyboard layouts" ++msgstr "Válasszon billentyűzet kiosztásokat" ++ ++#: ../setup/xkbsetup.py:212 ++msgid "Keyboard Layouts" ++msgstr "Billentyűzet kiosztások" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"A rendszer billentyűzet kiosztásai beállíthatóak kevesebb mint, " ++"vagy pontosan %d számúra.\n" ++"Alkalmazza a Fel/Le billentyűket hogy a sorrendet megváltoztassa. " ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "" ++"Kérem indítsa újra az IBus szolgáltatást a beállításainak aktualizálásához." ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "A billentyűzet opció nem kiválasztható." ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Szerzői jog (c) 2012 Takao Fujiwara\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "Alapértelmezett kiosztás" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "Beállítás" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "XKB engine beállítása" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "Jelenlegi xkb kiosztás lekérdezése" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "XKB kiosztás beállítása" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "Az xkb modell beállítása" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "Az xkb opció beállítása" ++ ++#~ msgid "trigger" ++#~ msgstr "aktiváló" ++ ++#~ msgid "enable" ++#~ msgstr "engedélyezés" ++ ++#~ msgid "disable" ++#~ msgstr "letiltás" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "Az xkb kiosztás átváltása %s nem sikerült." +--- a/po/ia.po ++++ b/po/ia.po +@@ -2,7 +2,7 @@ + # Interlingua translation of ibus. + # Copyright (C) 2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Nik Kalach , 2013 + # Nik Kalach , 2013 +@@ -66,7 +66,9 @@ + + #: ../setup/setup.ui.h:12 + msgid "The shortcut keys for switching to next input method in the list" +-msgstr "Le claves acceleratori pro cambiar al methodo de ingresso sequente in le lista" ++msgstr "" ++"Le claves acceleratori pro cambiar al methodo de ingresso sequente in le " ++"lista" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -74,7 +76,9 @@ + + #: ../setup/setup.ui.h:14 + msgid "The shortcut keys for switching to previous input method in the list" +-msgstr "Le claves acceleratori pro cambiar al methodo de ingresso precedente in le lista" ++msgstr "" ++"Le claves acceleratori pro cambiar al methodo de ingresso precedente in le " ++"lista" + + #: ../setup/setup.ui.h:15 + msgid "Previous input method:" +@@ -114,7 +118,9 @@ + + #: ../setup/setup.ui.h:24 + msgid "Set the behavior of ibus how to show or hide language bar" +-msgstr "Configurar le comportamento de ibus super como monstrar o occultar le barra de lingua" ++msgstr "" ++"Configurar le comportamento de ibus super como monstrar o occultar le barra " ++"de lingua" + + #: ../setup/setup.ui.h:25 + msgid "Show language panel:" +@@ -134,7 +140,9 @@ + + #: ../setup/setup.ui.h:29 + msgid "Show input method's name on language bar when check the checkbox" +-msgstr "Monstar le nomine del methodo de ingresso sur le barra de lingua quando le quadrato de selection es marcate " ++msgstr "" ++"Monstar le nomine del methodo de ingresso sur le barra de lingua quando le " ++"quadrato de selection es marcate " + + #: ../setup/setup.ui.h:30 + msgid "Embed preedit text in application window" +@@ -142,7 +150,9 @@ + + #: ../setup/setup.ui.h:31 + msgid "Embed the preedit text of input method in the application window" +-msgstr "Inserer le texto pre-editate del methodo de ingresso in le fenestra de application" ++msgstr "" ++"Inserer le texto pre-editate del methodo de ingresso in le fenestra de " ++"application" + + #: ../setup/setup.ui.h:32 + msgid "Use custom font:" +@@ -162,15 +172,20 @@ + + #: ../setup/setup.ui.h:36 + msgid "Remove the selected input method from the enabled input methods" +-msgstr "Remover le methodo de ingresso seligite del methodos de ingresso active" ++msgstr "" ++"Remover le methodo de ingresso seligite del methodos de ingresso active" + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "Mover in alto le methodo de ingresso seligite in le lista de methodos de ingresso active" ++msgstr "" ++"Mover in alto le methodo de ingresso seligite in le lista de methodos de " ++"ingresso active" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +-msgstr "Mover in basso le methodo de ingresso seligite in le lista de methodos de ingresso" ++msgstr "" ++"Mover in basso le methodo de ingresso seligite in le lista de methodos de " ++"ingresso" + + #: ../setup/setup.ui.h:39 + msgid "Show information of the selected input method" +@@ -184,7 +199,10 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "Le methodo de ingresso predefinite es le entrata superior del lista.\nUsar le buttones 'supra' e 'infra' pro cambiar lo." ++msgstr "" ++"Le methodo de ingresso predefinite es le entrata superior del " ++"lista.\n" ++"Usar le buttones 'supra' e 'infra' pro cambiar lo." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64 +@@ -223,7 +241,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nLe bus de ingresso intelligente\nPagina del projecto: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"Le bus de ingresso intelligente\n" ++"Pagina del projecto: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -267,14 +291,20 @@ + + #: ../data/ibus.schemas.in.h:5 + msgid "Popup delay milliseconds for IME switcher window" +-msgstr "Demora in millisecundas ante le demonstration del fenestra de commutator de methodos de ingresso" ++msgstr "" ++"Demora in millisecundas ante le demonstration del fenestra de commutator de " ++"methodos de ingresso" + + #: ../data/ibus.schemas.in.h:6 + msgid "" + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Definir le demora (in ms) ante le demonstration del fenestra de commutator de methodos de ingresso. Le valor predefinite es 400. 0 = monstrar immediatemente le fenestra. 0 < demora (in ms). 0 > non monstrar le fenestra e commutar inter ingenios precedente o sequente." ++msgstr "" ++"Definir le demora (in ms) ante le demonstration del fenestra de commutator " ++"de methodos de ingresso. Le valor predefinite es 400. 0 = monstrar " ++"immediatemente le fenestra. 0 < demora (in ms). 0 > non monstrar le " ++"fenestra e commutar inter ingenios precedente o sequente." + + #: ../data/ibus.schemas.in.h:7 + msgid "Trigger shortcut keys" +@@ -306,7 +336,9 @@ + + #: ../data/ibus.schemas.in.h:15 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "Le combination de claves pro cambiar al methodo de ingresso sequente in le lista" ++msgstr "" ++"Le combination de claves pro cambiar al methodo de ingresso sequente in le " ++"lista" + + #: ../data/ibus.schemas.in.h:16 + msgid "Prev engine shortcut keys" +@@ -314,7 +346,9 @@ + + #: ../data/ibus.schemas.in.h:17 + msgid "The shortcut keys for switching to the previous input method" +-msgstr "Le combination de claves pro cambiar al methodo de ingresso precedente in le lista" ++msgstr "" ++"Le combination de claves pro cambiar al methodo de ingresso precedente in le " ++"lista" + + #: ../data/ibus.schemas.in.h:18 + msgid "Auto hide" +@@ -324,7 +358,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "Le comportamento del pannello de lingua. 0 = inserite in le menu, 1 = occultar lo automaticamente, 2 = monstrar lo sempre" ++msgstr "" ++"Le comportamento del pannello de lingua. 0 = inserite in le menu, 1 = " ++"occultar lo automaticamente, 2 = monstrar lo sempre" + + #: ../data/ibus.schemas.in.h:20 + msgid "Language panel position" +@@ -334,7 +370,10 @@ + 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 "Le position del pannello de lingua. 0 = angulo superior siniste, 1 = angulo superior dextere, 2 = angulo inferior sinistre, 3 = angulo inferior dextere, 4 = Personalisate" ++msgstr "" ++"Le position del pannello de lingua. 0 = angulo superior siniste, 1 = angulo " ++"superior dextere, 2 = angulo inferior sinistre, 3 = angulo inferior dextere, " ++"4 = Personalisate" + + #: ../data/ibus.schemas.in.h:22 + msgid "Orientation of lookup table" +@@ -382,7 +421,9 @@ + + #: ../data/ibus.schemas.in.h:38 + msgid "Enable input method by default when the application gets input focus" +-msgstr "Activar le methodo de ingresso predefinite quando le application recipe le foco de ingresso" ++msgstr "" ++"Activar le methodo de ingresso predefinite quando le application recipe le " ++"foco de ingresso" + + #: ../data/ibus.schemas.in.h:39 + msgid "DConf preserve name prefixes" +@@ -396,7 +437,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -449,7 +492,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Preme un clave (o un combination de claves).\nLe dialogo se claudera quando le clave es liberate." ++msgstr "" ++"Preme un clave (o un combination de claves).\n" ++"Le dialogo se claudera quando le clave es liberate." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -457,7 +502,8 @@ + + #: ../setup/main.py:99 ../setup/main.py:398 + msgid "Use shortcut with shift to switch to the previous input method" +-msgstr "Usa accellerator con majuscula pro revinir al methodo previe de ingresso" ++msgstr "" ++"Usa accellerator con majuscula pro revinir al methodo previe de ingresso" + + #: ../setup/main.py:332 + msgid "The IBus daemon is not running. Do you wish to start it?" +@@ -465,11 +511,17 @@ + + #: ../setup/main.py:353 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus se ha initiate! Si tu non pote usar IBus, adde le lineas sequente al " ++"file $HOME/.bashrc e reconnecte.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus se ha initiate! Si tu non pote usar IBus, adde le lineas sequente al file $HOME/.bashrc e reconnecte.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:367 +@@ -524,7 +576,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Usage: %s COMMANDO [OPTION...]\n\n" ++msgstr "" ++"Usage: %s COMMANDO [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:225 + #, c-format +@@ -551,3 +605,211 @@ + #: ../ui/gtk3/panel.vala:539 + msgid "Restart" + msgstr "Reinitiar" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "Personalisar le _methodos de ingresso active" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "Personalisar le methodos de ingresso active" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Modo de ingenio de precargamento" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"Le ingenios de precargamento se carga con iste modo. 0 = ingenios " ++"pesonalisate. 1 = ingenios de linguas." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "Le clave preload_engines es initialisate" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Usar xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "Exequer xmodmap si .xmodmap/.Xmodmap existe." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Dispositiones latin sin ASCII" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"Le disposition 'us' es appendite al dispositiones latin. Le variante non es " ++"necessari." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "Le lista del dispositiones XKB que se monstra in ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"Le lista del dispositiones XKB que se monstra in ibus-setup. Le formato es " ++"\"disposition\" o \"disposition(variante)\"." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Activatores sin modificatores" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Le claves de activation que se usa sin claves de modification. Le lista es " ++"utilisate per ibus-gjs." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Lista del gruppos de dispositiones de clavieros in ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"Le lista de gruppos se usa pro non monstrar per predefinition tote le " ++"dispositiones de clavieros del systema. Le elemento del lista se appendera " ++"al fin del clave gconf. Per ex. .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Lista del linguas europee in ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup monstra le linguas solmente in le lista de methodos de ingresso " ++"quando illo opera sur un del linguas. Altere linguas son occultate sub un " ++"button de extension." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Lista del linguas asiatic in ibus-setup" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "Querer le disposition xkb actual" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "Definir le DISPOSITION xkb" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "DISPOSITION" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "Definir le VARIANTE xkb" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "VARIANTE" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "Definir le OPTION xkb" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "OPTION" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "Obtener le stato xkb actual" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Monstrar tote le methodos de ingresso" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "Monstrar solmente le methodos de ingresso de tu region" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"Rader immediatemente le lista existente del methodos de ingresso e " ++"configurar lo per le lingua de session al cata connexion. Facer lo?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "Predefinite" ++ ++#: ../setup/xkbsetup.py:207 ++msgid "Select keyboard layouts" ++msgstr "Seliger dispositiones de claviero" ++ ++#: ../setup/xkbsetup.py:212 ++msgid "Keyboard Layouts" ++msgstr "Dispositiones de claviero" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"On pote configurar %d o minus del dispositiones de claviero.\n" ++"Usa buttones Supra/Infra pro cambiar lor ordine." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "Reinitia IBus pro recargar su configuration." ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "Le option de claviero non pote ser seligite." ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2012 Takao Fujiwara\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "Disposition predefinite" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "Configuration" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "Configurar le ingenio XKB" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "Obtener le disposition xkb actual" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "Definir le disposition xkb" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "Definir le modello xkb" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "Definir le option xkb" +--- a/po/it.po ++++ b/po/it.po +@@ -2,7 +2,7 @@ + # Italian translation of ibus. + # Copyright (C) 2008-2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # fvalen , 2013 + # fvalen , 2012 +@@ -69,7 +69,8 @@ + + #: ../setup/setup.ui.h:12 + 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" ++msgstr "" ++"I tasti scorciatoia per passare al metodo di input successivo nell'elenco" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -77,7 +78,8 @@ + + #: ../setup/setup.ui.h:14 + 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" ++msgstr "" ++"I tasti scorciatoia per passare al metodo di input precedente nell'elenco" + + #: ../setup/setup.ui.h:15 + msgid "Previous input method:" +@@ -117,7 +119,9 @@ + + #: ../setup/setup.ui.h:24 + 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" ++msgstr "" ++"Imposta il comportamento di IBus su come mostrare o nascondere la barra " ++"della lingua" + + #: ../setup/setup.ui.h:25 + msgid "Show language panel:" +@@ -137,7 +141,9 @@ + + #: ../setup/setup.ui.h:29 + 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" ++msgstr "" ++"Quando la casella è spuntata mostra il nome del metodo di input nella barra " ++"della lingua" + + #: ../setup/setup.ui.h:30 + msgid "Embed preedit text in application window" +@@ -145,7 +151,9 @@ + + #: ../setup/setup.ui.h:31 + msgid "Embed the preedit text of input method in the application window" +-msgstr "Inserisce il testo premodificato del metodo di input nella finestra dell'applicazione" ++msgstr "" ++"Inserisce il testo premodificato del metodo di input nella finestra " ++"dell'applicazione" + + #: ../setup/setup.ui.h:32 + msgid "Use custom font:" +@@ -187,7 +195,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "Il metodo di input predefinito è il primo in alto nell'elenco.\nPer cambiarlo è possibile usare i pulsanti su/giù." ++msgstr "" ++"Il metodo di input predefinito è il primo in alto nell'elenco.\n" ++"Per cambiarlo è possibile usare i pulsanti su/giù." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64 +@@ -226,7 +236,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nIl bus di input intelligente\nSito web: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"Il bus di input intelligente\n" ++"Sito web: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -277,7 +293,11 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Imposta ritardo del popup in millisecondi per mostrare la finestra del selettore IME. Il valore predefinito è 400. 0 = Mostra la finestra immediatamente. 0 < Ritardo in millisecondi. 0 > Non mostrare la finestra e passa ai motori prec/succ." ++msgstr "" ++"Imposta ritardo del popup in millisecondi per mostrare la finestra del " ++"selettore IME. Il valore predefinito è 400. 0 = Mostra la finestra " ++"immediatamente. 0 < Ritardo in millisecondi. 0 > Non mostrare la " ++"finestra e passa ai motori prec/succ." + + #: ../data/ibus.schemas.in.h:7 + msgid "Trigger shortcut keys" +@@ -309,7 +329,8 @@ + + #: ../data/ibus.schemas.in.h:15 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "I tasti scorciatoia per passare al metodo di input successivo nell'elenco" ++msgstr "" ++"I tasti scorciatoia per passare al metodo di input successivo nell'elenco" + + #: ../data/ibus.schemas.in.h:16 + msgid "Prev engine shortcut keys" +@@ -327,7 +348,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "Il comportamento del pannello della lingua. 0 = Inserito nel menu, 1 = Nasconde automaticamente, 2 = Mostra sempre" ++msgstr "" ++"Il comportamento del pannello della lingua. 0 = Inserito nel menu, 1 = " ++"Nasconde automaticamente, 2 = Mostra sempre" + + #: ../data/ibus.schemas.in.h:20 + msgid "Language panel position" +@@ -337,7 +360,10 @@ + 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 posizione del pannello della lingua. 0 = Angolo in alto a sinistra, 1 = Angolo in alto a destra, 2 = Angolo in basso a sinistra, 3 = Angolo in basso a destra, 4 = Personalizzata" ++msgstr "" ++"La posizione del pannello della lingua. 0 = Angolo in alto a sinistra, 1 = " ++"Angolo in alto a destra, 2 = Angolo in basso a sinistra, 3 = Angolo in basso " ++"a destra, 4 = Personalizzata" + + #: ../data/ibus.schemas.in.h:22 + msgid "Orientation of lookup table" +@@ -385,7 +411,9 @@ + + #: ../data/ibus.schemas.in.h:38 + msgid "Enable input method by default when the application gets input focus" +-msgstr "Abilita per impostazione predefinita il metodo di input quando le applicazioni ottengono l'input focus" ++msgstr "" ++"Abilita per impostazione predefinita il metodo di input quando le " ++"applicazioni ottengono l'input focus" + + #: ../data/ibus.schemas.in.h:39 + msgid "DConf preserve name prefixes" +@@ -399,7 +427,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright © 2007-2010 Peng Huang\nCopyright © 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright © 2007-2010 Peng Huang\n" ++"Copyright © 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -452,7 +482,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Premere un tasto (o una combinazione di tasti).\nLa finestra verrà chiusa dopo il rilascio del tasto stesso." ++msgstr "" ++"Premere un tasto (o una combinazione di tasti).\n" ++"La finestra verrà chiusa dopo il rilascio del tasto stesso." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -460,7 +492,8 @@ + + #: ../setup/main.py:99 ../setup/main.py:398 + msgid "Use shortcut with shift to switch to the previous input method" +-msgstr "Usa i tasti scorciatoia e shift per passare al metodo di input successivo" ++msgstr "" ++"Usa i tasti scorciatoia e shift per passare al metodo di input successivo" + + #: ../setup/main.py:332 + msgid "The IBus daemon is not running. Do you wish to start it?" +@@ -468,11 +501,18 @@ + + #: ../setup/main.py:353 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus è stato avviato! Se non puoi utilizzare IBus aggiungi le seguenti righe in $HOME/.bashrc; successivamente eseguire una nuova registrazione sul desktop.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus\"" ++msgstr "" ++"IBus è stato avviato! Se non puoi utilizzare IBus aggiungi le seguenti righe " ++"in $HOME/.bashrc; successivamente eseguire una nuova registrazione sul " ++"desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus\"" + + #. Translators: %d == 5 currently + #: ../setup/main.py:367 +@@ -527,7 +567,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Utilizzo: %s COMANDO [OPZIONE...]\n\n" ++msgstr "" ++"Utilizzo: %s COMANDO [OPZIONE...]\n" ++"\n" + + #: ../tools/main.vala:225 + #, c-format +@@ -549,8 +591,266 @@ + + #: ../ui/gtk3/panel.vala:507 + msgid "translator-credits" +-msgstr "Launchpad Contributions:\n Sergio Zanchetta https://launchpad.net/~primes2h" ++msgstr "" ++"Launchpad Contributions:\n" ++" Sergio Zanchetta https://launchpad.net/~primes2h" + + #: ../ui/gtk3/panel.vala:539 + msgid "Restart" + msgstr "Riavvia" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "Personalizza i _metodi di input attivi" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "Personalizza i metodi di input attivi" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Modalità preload dei motori" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"I motori con modalità preload vengono caricati con questa modalità. 0 = " ++"motori personalizzati dall'utente. 1 = motori relativi alla lingua." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "preload_engines è inizializzato" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Usa xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "Esegui xmodmap se esiste .xmodmap/.Xmodmap." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Disposizione Latin senza ASCII" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"La disposizione us viene associata alle disposizioni latin. la variante non " ++"è necessaria." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "Elenco disposizione XKB come riportato su ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"Elenco disposizione XKB riportato su ibus-setup. Il formato è \"layout\" o " ++"\"layout(variant)\"." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Tasti di scelta rapida di avvio senza i tasti modificatori" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Tasti di scelta rapida di avvio senza i tasti modificatori. L'elenco viene " ++"usato da ibus-gjs." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Elenco gruppi disposizione tastiera del sistema su ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"Per impostazione predefinita l'elenco dei gruppi viene usato per non " ++"mostrare tutte le disposizioni della tastiera del sistema. L'elemento verrà " ++"accodato alla fine di gconf key. es .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Elenco di lingue europee su ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup mostra le lingue solo nell'elenco del metodo di input quando si " ++"esegue ibus-setup con una delle lingue stesse. Le altre lingue sono nascoste " ++"dietro un pulsante esteso." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Elenco di lingue orientali su ibus-setup" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Mostra tutti i metodi di input" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "Mostra solo i metodi di input per la tua regione" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"L'elenco dei metodi di input salvati verrà resettato immediatamente e sarà " ++"configurato dalla lingua che esegue la registrazione. Accetti questo " ++"processo?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Selezione delle scorciatoie da tastiera per %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Disposizione tastiera: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"Il metodo di input predefinito è il primo in alto nell'elenco.\n" ++"Per cambiarlo è possibile usare i pulsanti su/giù." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Premere un tasto (o una combinazione di tasti)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"Copyright © 2007-2010 Peng Huang\n" ++"Copyright © 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "Usa la disposizione di tastiera del sistema" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "trigger" ++#~ msgstr "l'avvio" ++ ++#~ msgid "Previous page" ++#~ msgstr "Pagina precedente" ++ ++#~ msgid "Next page" ++#~ msgstr "Pagina successiva" ++ ++#~ msgid "" ++#~ "Some input methods have been installed, removed or updated. Please " ++#~ "restart ibus input platform." ++#~ msgstr "" ++#~ "Alcuni metodi di input sono stati installati, rimossi o aggiornati. " ++#~ "Riavviare la piattaforma di input di ibus." ++ ++#~ msgid "Restart Now" ++#~ msgstr "Riavvia ora" ++ ++#~ msgid "Later" ++#~ msgstr "Più tardi" ++ ++#~ msgid "IBus input method framework" ++#~ msgstr "Ambiente del metodo di input IBus" ++ ++#~ msgid "Turn off input method" ++#~ msgstr "Disabilita metodo di input" ++ ++#~ msgid "No input window" ++#~ msgstr "Nessuna finestra di input" ++ ++#~ msgid "About the Input Method" ++#~ msgstr "Informazioni sul metodo di input" ++ ++#~ msgid "next input method" ++#~ msgstr "il metodo di input successivo" ++ ++#~ msgid "previous input method" ++#~ msgstr "il metodo di input precedente" +--- a/po/ja.po ++++ b/po/ja.po +@@ -79,7 +79,8 @@ + + #: ../setup/setup.ui.h:14 + msgid "The shortcut keys for switching to previous input method in the list" +-msgstr "リストの中でひとつ前のインプットメソッドに切り替えるためのショートカットキー" ++msgstr "" ++"リストの中でひとつ前のインプットメソッドに切り替えるためのショートカットキー" + + #: ../setup/setup.ui.h:15 + msgid "Previous input method:" +@@ -139,7 +140,9 @@ + + #: ../setup/setup.ui.h:29 + msgid "Show input method's name on language bar when check the checkbox" +-msgstr "チェックボックスをチェックしたときに言語バー上でインプットメソッドの名前を表示します" ++msgstr "" ++"チェックボックスをチェックしたときに言語バー上でインプットメソッドの名前を表" ++"示します" + + #: ../setup/setup.ui.h:30 + msgid "Embed preedit text in application window" +@@ -147,7 +150,9 @@ + + #: ../setup/setup.ui.h:31 + msgid "Embed the preedit text of input method in the application window" +-msgstr "アプリケーションウィンドウにインプットメソッドのプリエディットテキストを組み込みます" ++msgstr "" ++"アプリケーションウィンドウにインプットメソッドのプリエディットテキストを組み" ++"込みます" + + #: ../setup/setup.ui.h:32 + msgid "Use custom font:" +@@ -171,11 +176,13 @@ + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "選択したインプットメソッドを有効なインプットメソッドの中で上へ移動します" ++msgstr "" ++"選択したインプットメソッドを有効なインプットメソッドの中で上へ移動します" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +-msgstr "選択したインプットメソッドを有効なインプットメソッドの中で下へ移動します" ++msgstr "" ++"選択したインプットメソッドを有効なインプットメソッドの中で下へ移動します" + + #: ../setup/setup.ui.h:39 + msgid "Show information of the selected input method" +@@ -190,7 +197,10 @@ + "The active input method can be switched around from the selected " + "ones in the above list by pressing the keyboard shortcut keys or clicking " + "the panel icon." +-msgstr "アクティブなインプットメソッドは、キーボードショートカットキーを押すかパネルアイコンをクリックすることによってリストされている中から１つのインプットメソッドを選択することで切り替えることが可能です。" ++msgstr "" ++"アクティブなインプットメソッドは、キーボードショートカットキーを押" ++"すかパネルアイコンをクリックすることによってリストされている中から１つのイン" ++"プットメソッドを選択することで切り替えることが可能です。" + + #. create im name & icon column + #: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66 +@@ -229,7 +239,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nインテリジェントなインプットバス\nホームページ: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"インテリジェントなインプットバス\n" ++"ホームページ: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:56 + msgid "Start ibus on login" +@@ -268,7 +284,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME スイッチャーウィンドウを表示するまでのミリ秒単位の遅延を指定してください。デフォルトは400ミリ秒です。0 = ウィンドウをすぐに表示。0 < ミリ秒単位の遅延。0 > ウィンドウの表示をせずに、以前と次のエンジンの切り替え。" ++msgstr "" ++"IME スイッチャーウィンドウを表示するまでのミリ秒単位の遅延を指定してくださ" ++"い。デフォルトは400ミリ秒です。0 = ウィンドウをすぐに表示。0 < ミリ秒単位" ++"の遅延。0 > ウィンドウの表示をせずに、以前と次のエンジンの切り替え。" + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -278,7 +297,10 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "保存されているバージョンナンバーは以前インストールされていた ibus のバージョンと現在インストールされている ibus のバージョンの違いを検査するために使用されます。" ++msgstr "" ++"保存されているバージョンナンバーは以前インストールされていた ibus のバージョ" ++"ンと現在インストールされている ibus のバージョンの違いを検査するために使用さ" ++"れます。" + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -318,7 +340,8 @@ + + #: ../data/ibus.schemas.in.h:19 + msgid "The shortcut keys for switching to the previous input method" +-msgstr "リスト中のひとつ前のインプットメソッドに切り替えるためのショートカットキー" ++msgstr "" ++"リスト中のひとつ前のインプットメソッドに切り替えるためのショートカットキー" + + #: ../data/ibus.schemas.in.h:20 + msgid "Auto hide" +@@ -328,7 +351,8 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "言語パネルの動作。0 = メニューに組み込む、1 = 自動的に隠す、2 = 常に表示" ++msgstr "" ++"言語パネルの動作。0 = メニューに組み込む、1 = 自動的に隠す、2 = 常に表示" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -338,7 +362,9 @@ + 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 = 左下隅、3 = 右下隅、4 = カスタム" ++msgstr "" ++"言語パネルの位置。0 = 左上隅、1 = 右上隅、2 = 左下隅、3 = 右下隅、4 = カスタ" ++"ム" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -386,7 +412,9 @@ + + #: ../data/ibus.schemas.in.h:40 + msgid "Enable input method by default when the application gets input focus" +-msgstr "アプリケーションに入力フォーカスが当たったとき標準でインプットメソッドを有効にする" ++msgstr "" ++"アプリケーションに入力フォーカスが当たったとき標準でインプットメソッドを有効" ++"にする" + + #: ../data/ibus.schemas.in.h:41 + msgid "DConf preserve name prefixes" +@@ -400,7 +428,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -453,7 +483,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "キーもしくはキーの組み合わせを入力してください。\nキーを離すとダイアログを閉じます" ++msgstr "" ++"キーもしくはキーの組み合わせを入力してください。\n" ++"キーを離すとダイアログを閉じます" + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -469,11 +501,17 @@ + + #: ../setup/main.py:347 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus は開始しました。もし IBus を利用できない場合、次の環境変数を $HOME/.bashrc へ追記し、デスクトップに再ログインしてください。\nexport GTK_IM_MODULE=ibus\nexport XMODIFIERS=@im=ibus\nexport QT_IM_MODULE=ibus" ++msgstr "" ++"IBus は開始しました。もし IBus を利用できない場合、次の環境変数を $HOME/." ++"bashrc へ追記し、デスクトップに再ログインしてください。\n" ++"export GTK_IM_MODULE=ibus\n" ++"export XMODIFIERS=@im=ibus\n" ++"export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:361 +@@ -585,7 +623,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "使い方: %s コマンド [オプション...]\n\n" ++msgstr "" ++"使い方: %s コマンド [オプション...]\n" ++"\n" + + #: ../tools/main.vala:309 + #, c-format +@@ -615,8 +655,249 @@ + + #: ../ui/gtk3/panel.vala:665 + msgid "translator-credits" +-msgstr "UTUMI Hirosi \nIWAI, Masaharu \n日向原 龍一 " ++msgstr "" ++"UTUMI Hirosi \n" ++"IWAI, Masaharu \n" ++"日向原 龍一 " + + #: ../ui/gtk3/panel.vala:697 + msgid "Restart" + msgstr "再起動" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "アクティブな入力メソッドのカスタマイズ (_M)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "アクティブな入力メソッドをカスタマイズします" ++ ++#: ../setup/setup.ui.h:43 ++msgid "" ++"The default input method is the top one in the list.\n" ++"You may use up/down buttons to change it." ++msgstr "" ++"一覧の先頭にある入力メソッドがデフォルトになります。\n" ++"デフォルトを変更する場合は「上へ/下へ」ボタンを使用します。" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "プリロードエンジンモード" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"プリロードエンジンはこのモードで読み込まれます。0 はユーザーによってカスタマ" ++"イズされたエンジン、1 は言語に関連するエンジンです。" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "キー preload_engines は初期化されます" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap を使用する" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr ".xmodmap/.Xmodmap が存在する場合は xmodmap を実行します。" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "ASCII がないラテンレイアウト" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"ラテンレイアウトに US レイアウトが追加されます。バリアントは必要ありません。" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "ibus 設定に表示される XKB レイアウト" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"ibus 設定に表示される XKB レイアウトの一覧です。形式は「レイアウト」または" ++"「レイアウト(バリアント)」です。" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "修飾キーを持たないトリガーショートカットキー" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"修飾キーを持たないトリガーショートカットキー。一覧は ibus-gjs で使用されま" ++"す。" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup 上のシステムキーボードレイアウトグループのリスト" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"このグループ一覧を使用して、デフォルトではすべてのシステムキーボードレイアウ" ++"トを表示させないようにします。一覧のアイテムは gconf キーの末尾に追加されま" ++"す (.../xkblayoutconfig/item1 など)。" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup 上のヨーロッパの言語一覧" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"この言語のいずれかひとつで ibus-setup を実行すると、入力メソッド一覧にその言" ++"語しか表示されなくなります。他の言語は拡張ボタンの下に隠されます。" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup 上のアジア言語一覧" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "現在の XKB レイアウトを問い合わせる" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "XKB レイアウトを設定" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "レイアウト" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "XKB バリアントを設定" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "バリアント" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "XKB オプションを設定" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "オプション" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "現在の XKB の状態を取得" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "すべての入力メソッドを表示" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "ユーザーの地域の入力メソッドのみを表示" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"保存した入力メソッドの一覧が直ちに消去され、一覧は毎回、ログイン時の言語で設" ++"定されるようになります。よろしいですか?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "デフォルト" ++ ++#: ../setup/xkbsetup.py:207 ++msgid "Select keyboard layouts" ++msgstr "キーボードショートカットを選択" ++ ++#: ../setup/xkbsetup.py:212 ++msgid "Keyboard Layouts" ++msgstr "キーボードレイアウト" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"システムキーボードレイアウトは %d 以下で構成可能です。\n" ++"「上へ/下へ」ボタンを使って順番を変更できます。" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "構成を再度読み込むために IBus を再起動してください。" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "キーボードオプションは選択できません。" ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2012 Takao Fujiwara\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "デフォルトレイアウト" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "設定" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "XKB エンジンを構成する" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "現在の XKB レイアウトを取得する" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "XKB レイアウトを設定する" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "XKB モデルを設定する" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "XKB オプションを設定する" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "インプットメソッドフレームワーク" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus インプットメソッドフレームワークを起動" ++ ++#~ msgid "trigger" ++#~ msgstr "トリガー" ++ ++#~ msgid "enable" ++#~ msgstr "有効" ++ ++#~ msgid "disable" ++#~ msgstr "無効" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "command [OPTIONS]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "xkb レイアウトから %s への切り替えに失敗しました。" +--- a/po/kn.po ++++ b/po/kn.po +@@ -15,7 +15,8 @@ + "POT-Creation-Date: 2013-08-09 15:07+0900\n" + "PO-Revision-Date: 2013-11-20 11:18+0000\n" + "Last-Translator: shanky \n" +-"Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/kn/)\n" ++"Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/" ++"kn/)\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +@@ -116,7 +117,8 @@ + + #: ../setup/setup.ui.h:24 + msgid "Set the behavior of ibus how to show or hide language bar" +-msgstr "ಭಾಷಾ ಪಟ್ಟಿಕೆಯನ್ನು ಹೇಗೆ ತೋರಿಸಬೇಕು ಅಥವ ಅಡಗಿಸಬೇಕು ಎನ್ನುವ ibus ನ ವರ್ತನೆಯನ್ನು ಹೊಂದಿಸಿ" ++msgstr "" ++"ಭಾಷಾ ಪಟ್ಟಿಕೆಯನ್ನು ಹೇಗೆ ತೋರಿಸಬೇಕು ಅಥವ ಅಡಗಿಸಬೇಕು ಎನ್ನುವ ibus ನ ವರ್ತನೆಯನ್ನು ಹೊಂದಿಸಿ" + + #: ../setup/setup.ui.h:25 + msgid "Show language panel:" +@@ -164,15 +166,20 @@ + + #: ../setup/setup.ui.h:36 + msgid "Remove the selected input method from the enabled input methods" +-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಸಕ್ರಿಯಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದು ಹಾಕಿ" ++msgstr "" ++"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಸಕ್ರಿಯಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದು ಹಾಕಿ" + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಸಕ್ರಿಯಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಮೇಲಕ್ಕೆ ಜರುಗಿಸಿ" ++msgstr "" ++"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಸಕ್ರಿಯಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಮೇಲಕ್ಕೆ " ++"ಜರುಗಿಸಿ" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಸಕ್ರಿಯಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಕೆಳಕ್ಕೆ ಜರುಗಿಸಿ" ++msgstr "" ++"ಆಯ್ಕೆ ಮಾಡಲಾದ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಸಕ್ರಿಯಗೊಂಡಿರುವ ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಕೆಳಕ್ಕೆ " ++"ಜರುಗಿಸಿ" + + #: ../setup/setup.ui.h:39 + msgid "Show information of the selected input method" +@@ -186,7 +193,10 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವು ಪಟ್ಟಿಯ ಮೇಲ್ಬಾಗದಲ್ಲಿದೆ.\nಅದನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಮೇಲೆ/ಕೆಳಗಿನ ಬಾಣದ ಗುರುತಿನ ಗುಂಡಿಗಳನ್ನು ಬಳಸಬಹುದು." ++msgstr "" ++"ಪೂರ್ವನಿಯೋಜಿತ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವು ಪಟ್ಟಿಯ ಮೇಲ್ಬಾಗದಲ್ಲಿದೆ.\n" ++"ಅದನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಮೇಲೆ/ಕೆಳಗಿನ ಬಾಣದ ಗುರುತಿನ ಗುಂಡಿಗಳನ್ನು ಬಳಸಬಹುದು." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -225,7 +235,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್\nHomepage: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್\n" ++"Homepage: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -264,7 +280,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಗಾಗಿ ಪುಟಿಕೆ (ಪಾಪಪ್) ವಿಳಂಬ, ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ. ಪೂರ್ವನಿಯೋಜಿತವು 400. 0 = ತಕ್ಷಣ ಕಿಟಕಿಯನ್ನು ತೋರಿಸುತ್ತದೆ. 0 < ಮಿಲಿಸೆಕೆಂಡುಗಳ ವಿಳಂಬ. 0 > ಕಿಟಕಿಯನ್ನು ತೋರಿಸಬೇಡ ಮತ್ತು ಮುಂದಿನ/ಹಿಂದಿನ ಎಂಜಿನ್‌ಗಳಿಗೆ ಬದಲಾಯಿಸಬೇಡ." ++msgstr "" ++"IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಗಾಗಿ ಪುಟಿಕೆ (ಪಾಪಪ್) ವಿಳಂಬ, ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ. " ++"ಪೂರ್ವನಿಯೋಜಿತವು 400. 0 = ತಕ್ಷಣ ಕಿಟಕಿಯನ್ನು ತೋರಿಸುತ್ತದೆ. 0 < ಮಿಲಿಸೆಕೆಂಡುಗಳ " ++"ವಿಳಂಬ. 0 > ಕಿಟಕಿಯನ್ನು ತೋರಿಸಬೇಡ ಮತ್ತು ಮುಂದಿನ/ಹಿಂದಿನ ಎಂಜಿನ್‌ಗಳಿಗೆ ಬದಲಾಯಿಸಬೇಡ." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -274,7 +293,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "ಉಳಿಸಲಾದ ಆವೃತ್ತಿ ಸಂಖ್ಯೆಯಿಂದಾಗಿ, ಈ ಹಿಂದೆ ಉಳಿಸಲಾದ ibus ನ ಆವೃತ್ತಿ ಮತ್ತು ಪ್ರಸಕ್ತ ಅನುಸ್ಥಾಪಿಸಲಾದ ಆವೃತ್ತಿಯ ನಡುವೆ ವ್ಯತ್ಯಾಸವನ್ನು ಪರಿಶೀಲಿಸಲು ಸಹಾಯಕವಾಗುತ್ತದೆ." ++msgstr "" ++"ಉಳಿಸಲಾದ ಆವೃತ್ತಿ ಸಂಖ್ಯೆಯಿಂದಾಗಿ, ಈ ಹಿಂದೆ ಉಳಿಸಲಾದ ibus ನ ಆವೃತ್ತಿ ಮತ್ತು ಪ್ರಸಕ್ತ " ++"ಅನುಸ್ಥಾಪಿಸಲಾದ ಆವೃತ್ತಿಯ ನಡುವೆ ವ್ಯತ್ಯಾಸವನ್ನು ಪರಿಶೀಲಿಸಲು ಸಹಾಯಕವಾಗುತ್ತದೆ." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -324,7 +345,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "ಭಾಷೆಯ ಫಲಕದ ವರ್ತನೆ. 0 = ಮೆನುವಿನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾಗಿದೆ, 1 = ಸ್ವಯಂ ಅಡಗಿಸು, 2 = ಯಾವಾಗಲೂ ತೋರಿಸು" ++msgstr "" ++"ಭಾಷೆಯ ಫಲಕದ ವರ್ತನೆ. 0 = ಮೆನುವಿನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾಗಿದೆ, 1 = ಸ್ವಯಂ ಅಡಗಿಸು, 2 = " ++"ಯಾವಾಗಲೂ ತೋರಿಸು" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -334,7 +357,9 @@ + 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 = ಕೆಳಗಿನ ಎಡ ಮೂಲೆ, 3 = ಕೆಳಗಿನ ಬಲ ಮೂಲೆ, 4 = ಇಚ್ಛೆಯ" ++msgstr "" ++"ಭಾಷೆಯ ಫಲಕವು ಇರುವ ಸ್ಥಳ. 0 = ಮೇಲಿನ ಎಡ ಮೂಲೆ, 1 = ಮೇಲಿನ ಬಲ ಮೂಲೆ, 2 = ಕೆಳಗಿನ ಎಡ " ++"ಮೂಲೆ, 3 = ಕೆಳಗಿನ ಬಲ ಮೂಲೆ, 4 = ಇಚ್ಛೆಯ" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -382,7 +407,8 @@ + + #: ../data/ibus.schemas.in.h:40 + msgid "Enable input method by default when the application gets input focus" +-msgstr "ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸು" ++msgstr "" ++"ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸು" + + #: ../data/ibus.schemas.in.h:41 + msgid "DConf preserve name prefixes" +@@ -396,7 +422,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -449,7 +477,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ.\nಕೀಲಿಯನ್ನು ಬಿಟ್ಟಾಗ ಸಂವಾದವು ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ." ++msgstr "" ++"ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ.\n" ++"ಕೀಲಿಯನ್ನು ಬಿಟ್ಟಾಗ ಸಂವಾದವು ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -465,11 +495,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus ಅನ್ನು ಆರಂಭಿಸಲಾಗಿದೆ! ನೀವು IBus ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ, ಈ ಕೆಳಗಿನ ಸಾಲುಗಳನ್ನು " ++"$HOME/.bashrc ಗೆ ಸೇರಿಸಿ; ನಂತರ ನಿಮ್ಮ ಗಣಕತೆರೆಗೆ ಮರಳಿ ಪ್ರವೇಶಿಸಿ.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus ಅನ್ನು ಆರಂಭಿಸಲಾಗಿದೆ! ನೀವು IBus ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ, ಈ ಕೆಳಗಿನ ಸಾಲುಗಳನ್ನು $HOME/.bashrc ಗೆ ಸೇರಿಸಿ; ನಂತರ ನಿಮ್ಮ ಗಣಕತೆರೆಗೆ ಮರಳಿ ಪ್ರವೇಶಿಸಿ.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -581,12 +617,16 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "ಬಳಕೆ: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"ಬಳಕೆ: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format + msgid "Commands:\n" +-msgstr "ಆದೇಶಗಳು:\n\n" ++msgstr "" ++"ಆದೇಶಗಳು:\n" ++"\n" + + #: ../tools/main.vala:337 + #, c-format +@@ -616,3 +656,274 @@ + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "ಮರಳಿ ಆರಂಭಿಸು" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "ಸಕ್ರಿಯ ಇನ್<200c>ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಅಗತ್ಯಾನುಗುಣಗೊಳಿಸು (_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "ಸಕ್ರಿಯ ಇನ್<200c>ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಅಗತ್ಯಾನುಗುಣಗೊಳಿಸಿ" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "ಪ್ರಿಲೋಡ್ ಎಂಜಿನ್ ಸ್ಥಿತಿ" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"ಪ್ರಿಲೋಡ್ ಮಾಡಲಾದ ಎಂಜಿನ್<200c>ಗಳನ್ನು ಈ ಕ್ರಮದೊಂದಿಗೆ ಲೋಡ್ ಮಾಡಲಾಗುತ್ತದೆ. 0 = ಬಳಕೆದಾರರಿಂದ " ++"ಅಗತ್ಯಾನುಗುಣಗೊಳಿಸಲಾದ ಎಂಜಿನ್<200c>ಗಳು, 1 = ಭಾಷೆಗೆ ಸಂಬಂಧಿಸಿದ ಎಂಜಿನ್<200c>ಗಳು." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "ಪ್ರಮುಖ ಪ್ರಿಲೋಡ್_ಎಂಜಿನ್<200c>ಗಳನ್ನು ಆರಂಭಿಸಲಾಗಿದೆ" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap ಅನ್ನು ಬಳಸು" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr ".xmodmap/.Xmodmap ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ xmodmap ಅನ್ನು ಚಲಾಯಿಸಿ." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "ASCII ಅನ್ನು ಹೊಂದಿರದ ಲ್ಯಾಟಿನ್ ವಿನ್ಯಾಸ" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"ಲ್ಯಾಟಿನ್<200c> ವಿನ್ಯಾಸಗಳಿಗೆ us ವಿನ್ಯಾಸವನ್ನು ಸೇರಿಸಲಾಗಿದೆ. ವೇರಿಯಂಟ್<200c>ನ " ++"ಅಗತ್ಯವಿರುವುದಿಲ್ಲ." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "ibus-setup ನಲ್ಲಿ ತೋರಿಸಲಾಗುವ XKB ವಿನ್ಯಾಸ" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"ibus-setup ನಲ್ಲಿ ತೋರಿಸಲಾಗುವ XKB ವಿನ್ಯಾಸ. ನಮೂನೆಯು \"layout\" ಅಥವ " ++"\"layout(variant)\" ಆಗಿರುತ್ತದೆ." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "ಮಾರ್ಪಡಕ ಕೀಲಿಗಳು ಇಲ್ಲದೆ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"ಮಾರ್ಪಡಕ ಕೀಲಿಗಳು ಇಲ್ಲದೆ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು. ಪಟ್ಟಿಯನ್ನು ibus-gjs ಇಂದ " ++"ಬಳಸಲಾಗುತ್ತದೆ." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup ನಲ್ಲಿ ವ್ಯವಸ್ಥೆ ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ ಗುಂಪುಗಳ ಪಟ್ಟಿ" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"ಗುಂಪಿನ ಪಟ್ಟಿಯು ವ್ಯವಸ್ಥೆಯ ಎಲ್ಲಾ ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸಗಳನ್ನು ತೋರಿಸುವಂತೆ ಬಳಸಲು ಇರುವುದಲ್ಲ. " ++"ಪಟ್ಟಿ ಅಂಶವನ್ನು gconf ಕೀಲಿಯ ಕೊನೆಯಲ್ಲಿ ಸೇರಿಸಲಾಗುತ್ತದೆ. ಉದಾ. .../xkblayoutconfig/" ++"item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup ನಲ್ಲಿರುವ ಯುರೋಪಿನ ಭಾಷೆಗಳ ಪಟ್ಟಿ" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ನೀವು ibus-setup ಅನ್ನು ಚಲಾಯಿಸಿದಾಗ ಭಾಷೆಗಳನ್ನು ibus-setup ಕೇವಲ ಇನ್<200c>ಪುಟ್ ವಿಧಾನದ " ++"ಪಟ್ಟಿಯಲ್ಲಿ ತೋರಿಸುತ್ತದೆ. ಇತರೆ ಭಾಷೆಗಳನ್ನು ಒಂದು ಅಡಗಿಸಲಾದ ವಿಸ್ತೃತ ಗುಂಡಿಯ ಅಡಿಯಲ್ಲಿ " ++"ಅಡಗಿಸಲಾಗುತ್ತದೆ." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup ನಲ್ಲಿರುವ ಏಶಿಯಾದ ಭಾಷೆಗಳ ಪಟ್ಟಿ" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "ಎಲ್ಲಾ ಇನ್<200c>ಪುಟ್ ವಿಧಾನಗಳನ್ನು ತೋರಿಸು" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "ನಿಮ್ಮ ಪ್ರದೇಶದ ಇನ್<200c>ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಮಾತ್ರ ತೋರಿಸು" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"ನಿಮ್ಮ ಉಳಿಸಲಾದ ಇನ್<200c>ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಕೂಡಲೆ ತೆರವುಗೊಳಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಪಟ್ಟಿಯನ್ನು " ++"ಪ್ರತಿ ಬಾರಿಯ ಪ್ರವೇಶದ ಭಾಷೆಯಿಂದ ಸಂರಚಿಸಲಾಗುತ್ತದೆ. ನೀವಿದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುವಿರಾ?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"ಪೂರ್ವನಿಯೋಜಿತ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವು ಪಟ್ಟಿಯ ಮೇಲ್ಬಾಗದಲ್ಲಿದೆ.\n" ++"ಅದನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಮೇಲೆ/ಕೆಳಗಿನ ಬಾಣದ ಗುರುತಿನ ಗುಂಡಿಗಳನ್ನು ಬಳಸಬಹುದು." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "IBus ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್ ಅನ್ನು ಆರಂಭಿಸು" ++ ++#~ msgid "trigger" ++#~ msgstr "ಟ್ರಿಗರ್" ++ ++#~ msgid "enable" ++#~ msgstr "ಶಕ್ತಗೊಳಿಸು" ++ ++#~ msgid "disable" ++#~ msgstr "ಅಶಕ್ತಗೊಳಿಸು" ++ ++#~ msgid "Previous page" ++#~ msgstr "ಹಿಂದಿನ ಪುಟ" ++ ++#~ msgid "Next page" ++#~ msgstr "ಮುಂದಿನ ಪುಟ" ++ ++#~ msgid "" ++#~ "Some input methods have been installed, removed or updated. Please " ++#~ "restart ibus input platform." ++#~ msgstr "" ++#~ "ಕೆಲವು ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿದೆ, ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಅಥವ ಅಪ್‌ಡೇಟ್ " ++#~ "ಮಾಡಲಾಗಿದೆ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ibus ಇನ್‌ಪುಟ್ ಪ್ಲಾಟ್‌ಫಾರ್ಮ್ ಅನ್ನು ಮರಳಿ ಆರಂಭಿಸಿ." ++ ++#~ msgid "Restart Now" ++#~ msgstr "ಮರಳಿ ಆರಂಭಿಸು" ++ ++#~ msgid "Later" ++#~ msgstr "ನಂತರ" ++ ++#~ msgid "IBus input method framework" ++#~ msgstr "IBus ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್" ++ ++#~ msgid "Turn off input method" ++#~ msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್‌ ಮಾಡಿ" ++ ++#~ msgid "No input window" ++#~ msgstr "ಯಾವುದೆ ಇನ್‌ಪುಟ್ ವಿಂಡೊ ಇಲ್ಲ" ++ ++#~ msgid "About the Input Method" ++#~ msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಬಗೆಗೆ" ++ ++#~ msgid "next input method" ++#~ msgstr "ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ" ++ ++#~ msgid "previous input method" ++#~ msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ" +--- a/po/ko.po ++++ b/po/ko.po +@@ -186,7 +186,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "기본 입력 방식은 목록의 맨 위에 있습니다.\n위로/아래 버튼을 사용하여 변경할 수 있습니다. " ++msgstr "" ++"기본 입력 방식은 목록의 맨 위에 있습니다.\n" ++"위로/아래 버튼을 사용하여 변경할 수 있습니다. " + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -225,7 +227,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\n지능형 입력 버스\n홈페이지: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"지능형 입력 버스\n" ++"홈페이지: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -264,7 +272,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME 스위치 창을 표시하기 위해 밀리초 단위의 지연을 지정합니다. 기본값은 400입니다. 0 = 창을 즉시 표시합니다. 0 < 밀리초 단위로 지연합니다. 0 > 창을 표시하지 않고 이전/다음 엔진으로 전환합니다." ++msgstr "" ++"IME 스위치 창을 표시하기 위해 밀리초 단위의 지연을 지정합니다. 기본값은 400입" ++"니다. 0 = 창을 즉시 표시합니다. 0 < 밀리초 단위로 지연합니다. 0 > 창을 " ++"표시하지 않고 이전/다음 엔진으로 전환합니다." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -334,7 +345,9 @@ + 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 = 왼쪽 아래, 3 = 오른쪽 아래, 4 = 사용자 지정" ++msgstr "" ++"언어 패널의 위치. 0 = 왼쪽 위, 1 = 오른쪽 위, 2 = 왼쪽 아래, 3 = 오른쪽 아" ++"래, 4 = 사용자 지정" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -396,7 +409,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -449,7 +464,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "키 또는 키 조합을 입력하십시오.\n키를 입력하면 대화 상자가 닫히게 됩니다." ++msgstr "" ++"키 또는 키 조합을 입력하십시오.\n" ++"키를 입력하면 대화 상자가 닫히게 됩니다." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -465,11 +482,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus를 시작했습니다! IBus를 사용할 수 없는 경우 다음과 같은 행을 $HOME/." ++"bashrc;에 추가하고 바탕 화면으로 다시 로그인합니다.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus를 시작했습니다! IBus를 사용할 수 없는 경우 다음과 같은 행을 $HOME/.bashrc;에 추가하고 바탕 화면으로 다시 로그인합니다.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -581,7 +604,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "사용법: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"사용법: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -616,3 +641,230 @@ + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "재시작" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "활성 입력 방식 사용자 지정(_M)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "활성 입력 방식 사용자 지정 " ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "엔진 모드 미리 로드" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"사전 로드 엔진은 이 모드로 로딩됩니다. 0 = 사용자 지정 엔진. 1 = 언어 관련 엔" ++"진." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "주요 preload_engines이 초기화되었습니다 " ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap 사용 " ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr ".xmodmap/.Xmodmap이 존재할 경우 xmodmap을 실행합니다." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "ASCII이 없는 라틴어 레이아웃 " ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"영어 레이아웃이 라틴어 레이아웃에 추가되어 있습니다. 변형이 필요하지 않습니" ++"다." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "ibus 설정에 표시되는 XKB 레이아웃 목록 " ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"ibus 설정에 표시되는 XKB 레이아웃 목록. 형식은 \"layout\" 또는 " ++"\"layout(variant)\"입니다." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "수정 키 없는 트리거 단축키 " ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "수정 키 없는 트리거 단축키. 목록은 ibus-gjs에 의해 사용됩니다." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus 설정에서 시스템 키보드 레이아웃 그룹 목록 " ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"그룹 목록은 기본값으로 모든 시스템 키보드 레이아웃을 표시하는데 사용되지 않습" ++"니다. 목록 항목은 gconf 키 마지막에 추가됩니다. 예: .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus 설정에서 유럽어 목록 " ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus 설정은 언어 중 하나에서 ibus 설정을 실행할 때 입력 방식 목록에 있는 언어" ++"만을 표시합니다. 다른 언어는 확장 버튼 아래에 숨겨져 있습니다." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus 설정에서 아시아어 목록 " ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "모든 입력 방식 표시 " ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "해당 지역의 입력 방식만 표시 " ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"저장된 입력 방식 목록은 즉시 삭제되고 목록은 로그인 언어에 의해 매번 설정됩니" ++"다. 이에 동의하십니까? " ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s의 단축키를 선택" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "키보드 레이아웃: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"기본 입력 방식은 목록의 맨 위에 있습니다.\n" ++"위로/아래 버튼을 사용하여 변경할 수 있습니다. " ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "키 또는 키 조합을 입력하십시오. " ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2007-2012 Peng Huang\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "시스템 키보드 레이아웃 사용 " ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "입력 방식 프레임워크" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus 입력 방식 프레임워크 시작" ++ ++#~ msgid "trigger" ++#~ msgstr "트리거 " ++ ++#~ msgid "enable" ++#~ msgstr "활성화 " ++ ++#~ msgid "disable" ++#~ msgstr "비활성화 " +--- a/po/lv.po ++++ b/po/lv.po +@@ -527,6 +527,228 @@ + msgid "Restart" + msgstr "Pārstartēt" + ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Par ievades metodi" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Par ievades metodi" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++#, fuzzy ++msgid "Preload engine mode" ++msgstr "Pārlādēt dzinējus" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++#, fuzzy ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Trigera saīsņu taustiņi" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++#, fuzzy ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Izmantot sistēmas tastatūras izkārtojumu" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Rādīt ievades metodes nosaukumu" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "Rādīt ievades metodes nosaukumu" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++#, fuzzy ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "Saīsņu taustiņi, lai pārslēgtos uz iepriekšējo ievades metodi sarakstā" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#. Translators: %d == 5 currently ++#: ../setup/main.py:413 ++#, python-format ++msgid "IBus daemon could not be started in %d seconds" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "Pārslēgt ievades metodi" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Izvēlieties tastatūras saīsni priekš %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Tastatūras izkārtojums: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"Noklusētā ievades metode atrodas saraksta augšpusē.\n" ++"Jūs varat izmantot pogas uz augšu/uz leju, lai to izmainītu." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Lūdzu, nospiediet taustiņu (vai taustiņu kombināciju)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"Autortiesības (c) 2007-2010 Peng Huang\n" ++"Autortiesības (c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "Izmantot sistēmas tastatūras izkārtojumu" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ + #~ msgid "Previous page" + #~ msgstr "Iepriekšējā lapa" + +--- a/po/ml.po ++++ b/po/ml.po +@@ -2,7 +2,7 @@ + # Malayalam translation of ibus. + # Copyright (C) 2008-2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Ani Peter , 2009,2012-2013 + msgid "" +@@ -65,7 +65,8 @@ + + #: ../setup/setup.ui.h:12 + msgid "The shortcut keys for switching to next input method in the list" +-msgstr "അടുത്ത ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴി" ++msgstr "" ++"അടുത്ത ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി അടുത്ത സംവിധാനത്തിനുള്ള എളുപ്പവഴി" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -73,7 +74,9 @@ + + #: ../setup/setup.ui.h:14 + msgid "The shortcut keys for switching to previous input method in the list" +-msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള എളുപ്പവഴി" ++msgstr "" ++"മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ് സംവിധാനത്തിലേക്ക് മാറ്റുന്നതിനായി തൊട്ടു് മുമ്പുള്ള സംവിധാനത്തിനുള്ള " ++"എളുപ്പവഴി" + + #: ../setup/setup.ui.h:15 + msgid "Previous input method:" +@@ -183,7 +186,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "പട്ടികയില്‍ ആദ്യമുള്ളതാണു് സ്വതവേയുള്ള ഇന്‍പുട്ട് മെഥേഡ്.\nഇതു് മാറ്റുന്നതിനായി മുകളിലേക്കും താഴേക്കും ഉള്ള ബട്ടണ്‍ ഉപയോഗിക്കാം." ++msgstr "" ++"പട്ടികയില്‍ ആദ്യമുള്ളതാണു് സ്വതവേയുള്ള ഇന്‍പുട്ട് മെഥേഡ്.\n" ++"ഇതു് മാറ്റുന്നതിനായി മുകളിലേക്കും താഴേക്കും ഉള്ള ബട്ടണ്‍ ഉപയോഗിക്കാം." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -222,7 +227,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nഇന്റലി‍ജന്റ് ഇന്‍പുട്ട് ബസ്\nപ്രധാന താള്‍: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"ഇന്റലി‍ജന്റ് ഇന്‍പുട്ട് ബസ്\n" ++"പ്രധാന താള്‍: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -261,7 +272,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "ഐഎംഇ സ്വിച്ചര്‍ ജാലകം കാണിയ്ക്കുന്നതിനായി പോപ്പപ്പ് താമസം മില്ലിസെക്കന്‍ഡുകളില്‍ സജ്ജമാക്കുക. സ്വതവേയുള്ളതു് 400. 0 = ജാലകം ഉടന്‍ കാണിയ്ക്കുക. 0 < താമസം മില്ലിസെക്കന്‍ഡുകളില്‍. 0 > ജാലകം കാണിയ്ക്കരുതു്, അടുത്തതു്/മുമ്പുള്ള എഞ്ചിനുകളിലേക്കു് മാറുക." ++msgstr "" ++"ഐഎംഇ സ്വിച്ചര്‍ ജാലകം കാണിയ്ക്കുന്നതിനായി പോപ്പപ്പ് താമസം മില്ലിസെക്കന്‍ഡുകളില്‍ സജ്ജമാക്കുക. " ++"സ്വതവേയുള്ളതു് 400. 0 = ജാലകം ഉടന്‍ കാണിയ്ക്കുക. 0 < താമസം മില്ലിസെക്കന്‍ഡുകളില്‍. 0 > " ++"ജാലകം കാണിയ്ക്കരുതു്, അടുത്തതു്/മുമ്പുള്ള എഞ്ചിനുകളിലേക്കു് മാറുക." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -271,7 +285,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "മുമ്പു് ഇന്‍സ്റ്റോള്‍ ചെയ്ത ibus-ന്റെ പതിപ്പും നിലവിലുള്ള ibus-ന്റെ പതിപ്പും തമ്മിലുള്ള വ്യത്യാസം പരിശോധിയ്ക്കുന്നതിനായി സൂക്ഷിച്ചിട്ടുള്ള പതിപ്പു് ഉപയോഗിയ്ക്കുന്നു." ++msgstr "" ++"മുമ്പു് ഇന്‍സ്റ്റോള്‍ ചെയ്ത ibus-ന്റെ പതിപ്പും നിലവിലുള്ള ibus-ന്റെ പതിപ്പും തമ്മിലുള്ള വ്യത്യാസം " ++"പരിശോധിയ്ക്കുന്നതിനായി സൂക്ഷിച്ചിട്ടുള്ള പതിപ്പു് ഉപയോഗിയ്ക്കുന്നു." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -321,7 +337,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "ഭാഷയുടെ പാനലിന്റെ രീതി. 0 = മെനുവില്‍ ഉള്‍പ്പെടുത്തുക, 1 = സ്വയം അദൃശ്യമാകുക, 2 = എപ്പോഴും കാണിക്കുക" ++msgstr "" ++"ഭാഷയുടെ പാനലിന്റെ രീതി. 0 = മെനുവില്‍ ഉള്‍പ്പെടുത്തുക, 1 = സ്വയം അദൃശ്യമാകുക, 2 = എപ്പോഴും " ++"കാണിക്കുക" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -331,7 +349,9 @@ + 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 = താഴെ ഇടതു് കോണ്‍, 3 = താഴെ വലതു് കോണ്‍, 4 = യഥേഷ്ടം" ++msgstr "" ++"ഭാഷയുടെ പാനലിന്റെ സ്ഥാനം. 0 = മുകളില്‍ ഇടതു് കോണ്‍, 1 = മുകളില്‍ വലതു് കോണ്‍, 2 = താഴെ ഇടതു് " ++"കോണ്‍, 3 = താഴെ വലതു് കോണ്‍, 4 = യഥേഷ്ടം" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -393,7 +413,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -446,7 +468,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "ദയവായി ഒരു കീ അമര്‍ത്തുക (അല്ലെങ്കില്‍ ഒരു കീ കൂട്ട്).\nകീ റിലീസ് ചെയ്യുമ്പോള്‍ ഡയലോഗ് അടയ്ക്കുന്നു." ++msgstr "" ++"ദയവായി ഒരു കീ അമര്‍ത്തുക (അല്ലെങ്കില്‍ ഒരു കീ കൂട്ട്).\n" ++"കീ റിലീസ് ചെയ്യുമ്പോള്‍ ഡയലോഗ് അടയ്ക്കുന്നു." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -462,11 +486,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus തുടങ്ങി! IBus ഉപയോഗിയ്ക്കുവാന്‍ സാധ്യമല്ലെങ്കില്‍, നിങ്ങളുടെ $HOME/.bashrc;-ലേക്കു് ഈ " ++"വരികള്‍ ചേര്‍ത്തു് വീണ്ടും നിങ്ങളുടെ പണിയിടത്തിലേക്കു് വീണ്ടും പ്രവേശിയ്ക്കുക.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus തുടങ്ങി! IBus ഉപയോഗിയ്ക്കുവാന്‍ സാധ്യമല്ലെങ്കില്‍, നിങ്ങളുടെ $HOME/.bashrc;-ലേക്കു് ഈ വരികള്‍ ചേര്‍ത്തു് വീണ്ടും നിങ്ങളുടെ പണിയിടത്തിലേക്കു് വീണ്ടും പ്രവേശിയ്ക്കുക.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -578,7 +608,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "ഉപയോഗിയ്ക്കേണ്ട വിധം: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"ഉപയോഗിയ്ക്കേണ്ട വിധം: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -613,3 +645,239 @@ + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "വീണ്ടും ആരംഭിക്കുക" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "സജീവമായ ഇന്<200d>പുട്ട് രീതി_കള്<200d> യഥേഷ്ടമാക്കുക" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "സജീവമായ ഇന്<200d>പുട്ട് രീതികള്<200d> യഥേഷ്ടമാക്കുക" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "എഞ്ചിന്<200d> മോഡ് മുന്നേ ലഭ്യമാക്കുക" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"മുന്നേ ലഭ്യമാക്കുന്ന എഞ്ചിനുകള്<200d> ഈ മോഡില്<200d> ലഭ്യമാക്കുന്നു. 0 = ഉപയോക്താവിനുചിതമായ " ++"എഞ്ചിനുകള്<200d>. 1 = ഭാഷ സംബന്ധിച്ചുള്ള എഞ്ചിനുകള്<200d>" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "preload_engines കീ ആരംഭിച്ചിരിയ്ക്കുന്നു" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap ഉപയോഗിയ്ക്കുക" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr ".xmodmap/.Xmodmap നിലവിലുണ്ടെങ്കില്<200d>, xmodmap പ്രവര്<200d>ത്തിപ്പിയ്ക്കുക." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "ആസ്കി ഇല്ലാത്ത ലാറ്റിന്<200d> ശൈലി" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "ലാറ്റിന്<200d> ശൈലികളനുസരിച്ചാകുന്ന യുഎസ് ശൈലികള്<200d>. വേരിയന്റ് ആവശ്യമില്ല." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "ibus-setup-ല്<200d> കാണിയ്ക്കുന്ന എക്സ്<200c>കെബി ശൈലി പട്ടിക" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"എക്സ്<200c>കെബി ശൈലിയിലുള്ള പട്ടിക, ഇതു് ibus-setup-ല്<200d> കാണിച്ചിരിയ്ക്കുന്നു. \"ശൈലി" ++"\" അല്ലെങ്കില്<200d> \"ശൈലി(വേരിയന്റ്)\" ആണു് ശൈലി." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "മോഡിഫയര്<200d> കീകളില്ലാതെ എഴുപ്പവഴികള്<200d> ട്രിഗ്ഗര്<200d> ചെയ്യുക" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"മോഡിഫയര്<200d> കീകളില്ലാതെ എളുപ്പവഴികള്<200d> ട്രിഗ്ഗര്<200d> ചെയ്യുക. ibus-gjs പട്ടിക " ++"ഉപയോഗിയ്ക്കുന്നു." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup-ലുള്ള സിസ്റ്റം കീബോര്<200d>ഡ് ശൈലി ഗ്രൂപ്പുകളുടെ പട്ടിക" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"എല്ലാ സിസ്റ്റം കീബോര്<200d>ഡ് ശൈലികളും സ്വതവേ കാണിയ്ക്കാതിരിയ്ക്കുവാന്<200d> ഗ്രൂപ്പ് പട്ടിക " ++"ഉപയോഗിയ്ക്കുന്നു. gconf കീയുടെ അവസാനം പട്ടിക വസ്തു കൂട്ടിച്ചേര്<200d>ക്കുന്നു. ഉദാ. .../" ++"xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup-ലുള്ള യൂറോപ്പിയന്<200d> ഭാഷകളുടെ പട്ടിക" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup ഒരു ഭാഷയ്ക്കു് പ്രവര്<200d>ത്തിയ്ക്കുമ്പോള്<200d> ഇന്<200d>പുട്ട് രീതിയുടെ " ++"പട്ടികയിലുള്ള ഭാഷകള്<200d> മാത്രം ibus-setup കാണിയ്ക്കുന്നു. ഒരു വികസിപ്പിച്ച " ++"ബട്ടണില്<200d> മറ്റു് ഭാഷകള്<200d> ലഭ്യമാകുന്നു." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup-ലുള്ള ഏഷ്യന്<200d> ഭാഷകളുടെ പട്ടിക" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "എല്ലാ ഇന്<200d>പുട്ട് രീതികളും കാണിയ്ക്കുക" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "നിങ്ങളുടെ സ്ഥലത്തിനുള്ള ഇന്<200d>പുട്ട് രീതികള്<200d> മാത്രം കാണിയ്ക്കുക" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"നിങ്ങള്<200d> സൂക്ഷിച്ചിട്ടുള്ള ഇന്<200d>പുട്ട് സംവിധാനങ്ങള്<200d> ഉടന്<200d> തന്നെ " ++"വെടിപ്പാക്കി ഓരോ സമയത്തും പ്രവേശനത്തിനുള്ള ഭാഷ ഉപയോഗിച്ചു് പട്ടിക ക്രമീകരിയ്ക്കുന്നു. " ++"നിങ്ങള്<200d>ക്കിതു് സമ്മതമാണോ?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s-നുള്ള കീബോര്‍ഡ് എളുപ്പവഴി തെരഞ്ഞെടുക്കുക" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "കീബോര്‍ഡ് മാതൃക: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"പട്ടികയില്‍ ആദ്യമുള്ളതാണു് സ്വതവേയുള്ള ഇന്‍പുട്ട് മെഥേഡ്.\n" ++"ഇതു് മാറ്റുന്നതിനായി മുകളിലേക്കും താഴേക്കും ഉള്ള ബട്ടണ്‍ ഉപയോഗിക്കാം." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "ദയവായി ഒരു കീ അമര്‍ത്തുക (അല്ലെങ്കില്‍ ഒരു കീ കൂട്ട്)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "പകര്‍പ്പവകാശം (c) 2007-2012 പെങ് ഹുവാങ്\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "സിസ്റ്റം കീബോര്‍ഡ് മാതൃക ഉപയോഗിക്കുക" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "ഇന്‍പുട്ട് മെഥേഡ് ആകൃതി" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus ഇന്‍പുട്ട് മെഥേഡ് ആകൃതി ആരംഭിയ്ക്കുക" ++ ++#~ msgid "trigger" ++#~ msgstr "ട്രിഗ്ഗര്‍ ചെയ്യുക" ++ ++#~ msgid "enable" ++#~ msgstr "പ്രവര്‍ത്തന സജ്ജം" ++ ++#~ msgid "disable" ++#~ msgstr "പ്രവര്‍ത്തന രഹിതം" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "കമാന്‍ഡ് [OPTIONS]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "xkb ശൈലി %s-ലേക്കു് മാറ്റുന്നതു് പരാജയപ്പെട്ടു." +--- a/po/mr.po ++++ b/po/mr.po +@@ -2,7 +2,7 @@ + # Marathi translation of ibus. + # Copyright (C) 2008-2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Sandeep Shedmake , 2009 + # sandeeps , 2009,2012 +@@ -185,7 +185,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "यादीतील प्रथम इन्पुट पद्धती मुलभूत नुरूप आहे.\nबदलण्याकरीता तुम्ही वर/खाली बटणांचा वापर करू शकता." ++msgstr "" ++"यादीतील प्रथम इन्पुट पद्धती मुलभूत नुरूप आहे.\n" ++"बदलण्याकरीता तुम्ही वर/खाली बटणांचा वापर करू शकता." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -224,7 +226,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nहुशार इनपुट बस\nमुख्यपान: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"हुशार इनपुट बस\n" ++"मुख्यपान: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -263,7 +271,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME स्विचर पटल दाखवण्याकरिता पॉपअप डिले मिलिसेकंदामध्ये सेट करा. पूर्वनिर्धारित 400. 0 = पटल पटकन दाखवा. 0 < मिलिसेकंदातील विलंब. 0 > पटल दाखवू नका व मागील किंवा पुढील इंजिन्स्चा वापर करू नका." ++msgstr "" ++"IME स्विचर पटल दाखवण्याकरिता पॉपअप डिले मिलिसेकंदामध्ये सेट करा. पूर्वनिर्धारित 400. 0 " ++"= पटल पटकन दाखवा. 0 < मिलिसेकंदातील विलंब. 0 > पटल दाखवू नका व मागील किंवा " ++"पुढील इंजिन्स्चा वापर करू नका." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -273,7 +284,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "साठवलेले आवृत्ती क्रमांकाचा वापर मागील इंस्टॉल झालेले ibus आणि सध्या इंस्टॉल झालेल्या ibus मधील भेद जाणून घेण्यासाठी केला जाईल." ++msgstr "" ++"साठवलेले आवृत्ती क्रमांकाचा वापर मागील इंस्टॉल झालेले ibus आणि सध्या इंस्टॉल झालेल्या ibus " ++"मधील भेद जाणून घेण्यासाठी केला जाईल." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -333,7 +346,9 @@ + 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 = Top left corner, 1 = Top right corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom" ++msgstr "" ++"भाषा पटलाचे स्थान. 0 = Top left corner, 1 = Top right corner, 2 = Bottom left " ++"corner, 3 = Bottom right corner, 4 = Custom" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -395,7 +410,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "सर्वहक्काधिकार (c) 2007-2010 पेंग हुआंग\nसर्वहक्काधिकार (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"सर्वहक्काधिकार (c) 2007-2010 पेंग हुआंग\n" ++"सर्वहक्काधिकार (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -448,7 +465,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "कृपया कि (किंवा कि जोडणी) दाबा.\nकि सोडल्यावर संवाद बंद होईल." ++msgstr "" ++"कृपया कि (किंवा कि जोडणी) दाबा.\n" ++"कि सोडल्यावर संवाद बंद होईल." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -464,11 +483,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus सुरू झाले! IBus चा वापर न केल्यास, खालील ओळींना $HOME/.bashrc मध्ये समाविष्ट " ++"करा; व त्यानंतर डेस्कटॉपमध्ये पुनः प्रवेश करा.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus सुरू झाले! IBus चा वापर न केल्यास, खालील ओळींना $HOME/.bashrc मध्ये समाविष्ट करा; व त्यानंतर डेस्कटॉपमध्ये पुनः प्रवेश करा.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -580,7 +605,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "वापर: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"वापर: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -610,8 +637,240 @@ + + #: ../ui/gtk3/panel.vala:666 + msgid "translator-credits" +-msgstr "संदिप शेडमाके , 2009; संदिप शेडमाके , 2009, 2010." ++msgstr "" ++"संदिप शेडमाके , 2009; संदिप शेडमाके , 2009, 2010." + + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "पुन्हा चालू करा" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "ॲक्टिव्ह इंपुट पद्धती पसंतीचे करा (_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "ॲक्टिव्ह इंपुट पद्धती पसंतीचे करा" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "प्रिलोड इंजिन मोड" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"प्रिलोड इंजिन्स ह्या मोडसह लोड केले आहेत. 0 = युजर पसंतीचे इंजिन्स. 1 = भाषा संबंधीत इंजिन्स." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "कि preload_engines प्रारंभ केले" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmapचा वापर करा" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr ".xmodmap/.Xmodmap अस्तित्वात असल्यास xmodmap चालवा." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "लॅटिन मांडणी ज्याकडे ASCII नाही" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "us मांडणी लॅटिन मांडणीकरिता समावेश केले आहे. वेरिएंट आवश्यक नाही." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "XKB मांडणी सूची ज्यास ibus-setup येथे दाखवले जाते" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"XKB मांडणी सूची ज्यास ibus-setup येथे दाखवले जाते. रूपण \"layout\" किंवा " ++"\"layout(variant)\" असते." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "मॉडिफायर किज विना शार्टकट किज सुरू करा" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "मॉडिफायर किज विना शार्टकट किज सुरू करा. सूची ibus-gjs तर्फे वापरले जाते." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup वरील प्रणाली किबोर्ड मांडणी गटची सूची दाखवा" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"गट सूचीचा वापर पूर्वनिर्धारितपणे सर्व प्रणाली कळफलक मांडणी दाखवण्याकरिता नाही. सूचीतील " ++"घटक gconf किच्या शेवटी जोडले जाईल. उ.दा. .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup वरील युरोपियन भाषांची सूची" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"उपलब्ध भाषांपैकी एकावर ibus-setup चालवल्यास ibus-setup फक्त इंपुट पद्धती सूची अंतर्गत " ++"भाषा दाखवतात. इतर भाषा विस्तारित बटण अंतर्गत छुपे आहेत." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup वरील एशियन भाषांची सूची" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "सर्व इंपुट पद्धती दाखवा" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "तुमच्या क्षेत्रकरिता फक्त इंपुट पद्धती दाखवा" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"साठवलेल्या इंपुट पद्धतींची सूची त्वरीत नष्ट केले जाईल व सूची प्रत्येकवेळी प्रवेश भाषातर्फे संरचीत " ++"केली जाईल. तुम्हाला हे मान्य आहे?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s करीता कळफलक शार्टकट नीवडा" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "कळफलक मांडणी: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"यादीतील प्रथम इन्पुट पद्धती मुलभूत नुरूप आहे.\n" ++"बदलण्याकरीता तुम्ही वर/खाली बटणांचा वापर करू शकता." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "कृपया कि (किंवा कि जोडणी) दाबा" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "सर्वहक्काधिकार (c) 2007-2012 पेंग हुआंग\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "प्रणाली कळफलक मांडणीचा वापर करा" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "इन्पुट पद्धत फ्रेमवर्क" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus इन्पुट पद्धती फ्रेमवर्क सुरू करा" ++ ++#~ msgid "trigger" ++#~ msgstr "ट्रिगर" ++ ++#~ msgid "enable" ++#~ msgstr "सुरू करा" ++ ++#~ msgid "disable" ++#~ msgstr "बंद करा" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "आदेश [OPTIONS]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "xkb मांडणीला %s करीता बदलण्यास अपयशी." +--- a/po/nb.po ++++ b/po/nb.po +@@ -2,7 +2,7 @@ + # Norwegian Bokmål translation of ibus. + # Copyright (C) 2008 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Kjartan Maraas , 2012. + msgid "" +@@ -380,7 +380,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Opphavsrett © 2007-2010 Peng Huang\nOpphavsrett © 2007-2010 Red Hat, Inc." ++msgstr "" ++"Opphavsrett © 2007-2010 Peng Huang\n" ++"Opphavsrett © 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -433,7 +435,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Vennligst trykk en tast (eller en tastekombinasjon)\nDialogen vil lukkes når tasten slippes." ++msgstr "" ++"Vennligst trykk en tast (eller en tastekombinasjon)\n" ++"Dialogen vil lukkes når tasten slippes." + + #: ../setup/keyboardshortcut.py:253 + msgid "Please press a key (or a key combination)" +@@ -457,7 +461,8 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +@@ -544,3 +549,208 @@ + #: ../ui/gtk3/panel.vala:402 + msgid "Restart" + msgstr "Start på nytt" ++ ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Neste inndatametode:" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Neste inndatametode:" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Velg en inndatametode" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "Neste inndatametode:" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Velg tastatursnarvei for %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Tastaturutforming: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Vennligst trykk en tast (eller en tastekombinasjon)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" +--- a/po/nl.po ++++ b/po/nl.po +@@ -65,7 +65,8 @@ + + #: ../setup/setup.ui.h:12 + msgid "The shortcut keys for switching to next input method in the list" +-msgstr "De sneltoetsen voor het schakelen naar de volgende invoermethode in de lijst" ++msgstr "" ++"De sneltoetsen voor het schakelen naar de volgende invoermethode in de lijst" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -73,7 +74,8 @@ + + #: ../setup/setup.ui.h:14 + msgid "The shortcut keys for switching to previous input method in the list" +-msgstr "De sneltoetsen voor het schakelen naar de vorige invoermethode in de lijst" ++msgstr "" ++"De sneltoetsen voor het schakelen naar de vorige invoermethode in de lijst" + + #: ../setup/setup.ui.h:15 + msgid "Previous input method:" +@@ -113,7 +115,8 @@ + + #: ../setup/setup.ui.h:24 + msgid "Set the behavior of ibus how to show or hide language bar" +-msgstr "Stel het gedrag van ibus in voor het tonen of verbergen van de taalbalk" ++msgstr "" ++"Stel het gedrag van ibus in voor het tonen of verbergen van de taalbalk" + + #: ../setup/setup.ui.h:25 + msgid "Show language panel:" +@@ -133,7 +136,9 @@ + + #: ../setup/setup.ui.h:29 + msgid "Show input method's name on language bar when check the checkbox" +-msgstr "Toon de naam van de invoermethode op de taalbalk als je het selectievakje aanvinkt" ++msgstr "" ++"Toon de naam van de invoermethode op de taalbalk als je het selectievakje " ++"aanvinkt" + + #: ../setup/setup.ui.h:30 + msgid "Embed preedit text in application window" +@@ -157,19 +162,25 @@ + + #: ../setup/setup.ui.h:35 + msgid "Add the selected input method into the enabled input methods" +-msgstr "Voeg de geselecteerde invoermethode toe aan de ingeschakelde invoermethoden" ++msgstr "" ++"Voeg de geselecteerde invoermethode toe aan de ingeschakelde invoermethoden" + + #: ../setup/setup.ui.h:36 + msgid "Remove the selected input method from the enabled input methods" +-msgstr "Verwijder de geselecteerde invoermethode uit de aangezette invoermethoden" ++msgstr "" ++"Verwijder de geselecteerde invoermethode uit de aangezette invoermethoden" + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "Verplaats de geselecteerde invoermethode omhoog in de aangezette invoermethoden lijst" ++msgstr "" ++"Verplaats de geselecteerde invoermethode omhoog in de aangezette " ++"invoermethoden lijst" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +-msgstr "Verplaats de geselecteerde invoermethode omlaag in de aangezette invoermethoden lijst" ++msgstr "" ++"Verplaats de geselecteerde invoermethode omlaag in de aangezette " ++"invoermethoden lijst" + + #: ../setup/setup.ui.h:39 + msgid "Show information of the selected input method" +@@ -184,7 +195,10 @@ + "The active input method can be switched around from the selected " + "ones in the above list by pressing the keyboard shortcut keys or clicking " + "the panel icon." +-msgstr "De actieve invoermethode kan omgeschakeld worden tussen de geselecteerden in de bovenstaande lijst met het induwen van de toetsenbord sneltoets of met het klikken op het paneel icoon." ++msgstr "" ++"De actieve invoermethode kan omgeschakeld worden tussen de " ++"geselecteerden in de bovenstaande lijst met het induwen van de toetsenbord " ++"sneltoets of met het klikken op het paneel icoon." + + #. create im name & icon column + #: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66 +@@ -223,7 +237,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nDe intelligente invoer bus\nHomepagina: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"De intelligente invoer bus\n" ++"Homepagina: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:56 + msgid "Start ibus on login" +@@ -262,7 +282,11 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Stel pop-up vertraging milliseconden in om het IME omschakelvenster te tonen. De standaard is 400. 0 = Ton het venster onmiddellijk. 0 < Vertraging in milliseconden. 0 > Laat het venster niet zien en schakel vorige/volgende engine om." ++msgstr "" ++"Stel pop-up vertraging milliseconden in om het IME omschakelvenster te " ++"tonen. De standaard is 400. 0 = Ton het venster onmiddellijk. 0 < " ++"Vertraging in milliseconden. 0 > Laat het venster niet zien en schakel " ++"vorige/volgende engine om." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -272,7 +296,10 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "Het opgeslagen versienummer zal gebruikt worden voor het checken van het verschil tussen de versie van de vorige geïnstalleerde ibus en die van de huidige ibus. " ++msgstr "" ++"Het opgeslagen versienummer zal gebruikt worden voor het checken van het " ++"verschil tussen de versie van de vorige geïnstalleerde ibus en die van de " ++"huidige ibus. " + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -304,7 +331,9 @@ + + #: ../data/ibus.schemas.in.h:17 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "De sneltoetsen voor het omschakelen naar de volgende invoermethode in de lijst" ++msgstr "" ++"De sneltoetsen voor het omschakelen naar de volgende invoermethode in de " ++"lijst" + + #: ../data/ibus.schemas.in.h:18 + msgid "Prev engine shortcut keys" +@@ -322,7 +351,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "Het gedrag van het taal paneel. 0 = Ingebed in het menu, 1 = Automatisch verbergen, 2 = Altijd tonen" ++msgstr "" ++"Het gedrag van het taal paneel. 0 = Ingebed in het menu, 1 = Automatisch " ++"verbergen, 2 = Altijd tonen" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -332,7 +363,9 @@ + 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 "De positie van de taal paneel. 0 = linksboven, 1 = rechtsboven, 2 = linksonder, 3 = rechtsonder, 4 = aangepast" ++msgstr "" ++"De positie van de taal paneel. 0 = linksboven, 1 = rechtsboven, 2 = " ++"linksonder, 3 = rechtsonder, 4 = aangepast" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -394,7 +427,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -447,7 +482,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Druk op een toets (of een toetsencombinatie).\nDe dialoog wordt afgesloten als de toets losgelaten wordt." ++msgstr "" ++"Druk op een toets (of een toetsencombinatie).\n" ++"De dialoog wordt afgesloten als de toets losgelaten wordt." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -455,7 +492,9 @@ + + #: ../setup/main.py:99 ../setup/main.py:392 + msgid "Use shortcut with shift to switch to the previous input method" +-msgstr "Gebruik snelkoppeling met Shift voor het omschakelen naar de vorige invoermethode" ++msgstr "" ++"Gebruik snelkoppeling met Shift voor het omschakelen naar de vorige " ++"invoermethode" + + #: ../setup/main.py:326 + msgid "The IBus daemon is not running. Do you wish to start it?" +@@ -463,11 +502,17 @@ + + #: ../setup/main.py:347 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus is gestart! Als je IBus niet kunt gebruiken, voeg je de volgende regels " ++"toe aan je $HOME/.bashrc; log daarna opnieuw in op je bureaublad.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus is gestart! Als je IBus niet kunt gebruiken, voeg je de volgende regels toe aan je $HOME/.bashrc; log daarna opnieuw in op je bureaublad.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:361 +@@ -579,7 +624,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Gebruik: %s COMMANDO [OPTIE...]\n\n" ++msgstr "" ++"Gebruik: %s COMMANDO [OPTIE...]\n" ++"\n" + + #: ../tools/main.vala:309 + #, c-format +@@ -614,3 +661,245 @@ + #: ../ui/gtk3/panel.vala:697 + msgid "Restart" + msgstr "Opnieuw starten" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "Pas actieve invoer _methodes aan" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "Pas actieve invoer methodes aan" ++ ++#: ../setup/setup.ui.h:43 ++msgid "" ++"The default input method is the top one in the list.\n" ++"You may use up/down buttons to change it." ++msgstr "" ++"De standaard invoermethode is de bovenste in de lijst.\n" ++"je kunt op/neer toetsen gebruiken om dit te veranderen." ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Laad engine modus voor" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"Voor geladen engines worden met deze modus geladen. 0 = gebruikers " ++"aangepaste engines. 1 = taal gerelateerde engines." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "De sleutel preload_engines is geïnitialiseerd" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Gebruik xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "Voer xmodmap uit als .xmodmap/.Xmodmap bestaat." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Latin indeling die geen ASCII geeft" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"us indeling wordt toegevoegd aan de latin indelingen. variant is niet nodig." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "XKB indelingslijst die getoond wordt op ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"XKB indelingslijst die getoond wordt op ibus-setup. Het formaat is \"layout" ++"\" of \"layout(variant)\"." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Activeer sneltoetsen zonder modificatietoetsen" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Activeer sneltoetsen zonder modificatietoetsen. De lijst wordt gebruikt door " ++"ibus-gjs." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Lijst met systeemtoetsenbordindelingsgroepen op ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"De groepslijst wordt gebruikt om standaard niet alle " ++"systeemtoetsenbordindelingen te tonen. Het lijst item zal toegevoegd worden " ++"aan het einde van gconf key. b.v. .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Lijst met Europese talen op ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup toont de talen alleen in de invoermethodelijst als je ibus-setup " ++"uitvoert voor een van de talen. Andere talen zijn verborgen onder een " ++"uitbreidknop." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Lijst met Aziatische talen op ibus-setup" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "Zoek naar de huidige xkb indeling" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "Stel xkb INDELING in" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "INDELING" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "Stel xkb VARIANT in" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "VARIANT" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "Stel xkb OPTIE in" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "OPTIE" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "Haal huidige xkb toestand op" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Toon alle invoermethodes" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "Toon alleen invoermethodes voor jouw regio" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"De lijst met jouw opgeslagen invoermethodes zal onmiddellijk gewist worden " ++"en de lijst zal iedere keer met de inlog taal geconfigureerd worden. Ben je " ++"het daarmee eens?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "Standaard" ++ ++#: ../setup/xkbsetup.py:207 ++msgid "Select keyboard layouts" ++msgstr "Selecteer toetsenbordindelingen" ++ ++#: ../setup/xkbsetup.py:212 ++msgid "Keyboard Layouts" ++msgstr "Toetsenbordindelingen" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"De systeemtoetsenbordindelingen ka ingesteld worden als kleiner " ++"dan of gelijk aan %d.\n" ++"Je kunt de Omhoog/Omlaag toetsen gebruiken om de volgorde te veranderen." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "Start IBus opnieuw op om je configuratie te herladen." ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "De toetsenbord optie kan niet gekozen worden." ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2012 Takao Fujiwara\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "Standaard indeling" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "Instellen" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "Configureer XKB engine" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "Haal huidige xkb indeling op" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "Stel xkb indeling in" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "Stel xkb model in" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "Stel xkb optie in" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "Invoer methode kader" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "Start IBus invoer methode kader" ++ ++#~ msgid "trigger" ++#~ msgstr "trigger" ++ ++#~ msgid "enable" ++#~ msgstr "aanzetten" ++ ++#~ msgid "disable" ++#~ msgstr "uitzetten" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "commando[OPTIES]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "Omschakelen van xkb indeling naar %s is mislukt." +--- a/po/or.po ++++ b/po/or.po +@@ -2,7 +2,7 @@ + # Oriya translation of ibus. + # Copyright (C) 2008-2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Manoj Kumar Giri , 2009,2011-2013 + # Manoj Kumar Giri , 2013 +@@ -184,7 +184,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିବେଶ ପଦ୍ଧତିଟି ତାଲିକା ଉପରେ ଅଛି।\nଆପଣ ଉପର/ତଳ ବଟନକୁ ବ୍ୟାବହାର କରି ଏହାକୁ ପରିବର୍ତ୍ତନ କରିପାରିବେ।" ++msgstr "" ++"ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିବେଶ ପଦ୍ଧତିଟି ତାଲିକା ଉପରେ ଅଛି।\n" ++"ଆପଣ ଉପର/ତଳ ବଟନକୁ ବ୍ୟାବହାର କରି ଏହାକୁ ପରିବର୍ତ୍ତନ କରିପାରିବେ।" + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -223,7 +225,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ\nମୂଖ୍ୟ ପୃଷ୍ଠା: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"ବୁଦ୍ଧିମାନ ନିବେଶ ପରିପଥ\n" ++"ମୂଖ୍ୟ ପୃଷ୍ଠା: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -262,7 +270,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME ପରିବର୍ତ୍ତନକାରୀ ୱିଣ୍ଡୋ ପାଇଁ ପପ୍‌ଅପ୍‌ ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ ସେଟ କରନ୍ତୁ। ପୂର୍ବନିର୍ଦ୍ଧାରିତଟି ହେଉଛି400. 0 = ସଙ୍ଗେ ସଙ୍ଗେ ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ। 0 < ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ। 0 > ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ ନାହିଁ ଏବଂ ପୂର୍ବ/ପର ଯନ୍ତ୍ରଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ।" ++msgstr "" ++"IME ପରିବର୍ତ୍ତନକାରୀ ୱିଣ୍ଡୋ ପାଇଁ ପପ୍‌ଅପ୍‌ ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ ସେଟ କରନ୍ତୁ। ପୂର୍ବନିର୍ଦ୍ଧାରିତଟି ହେଉଛି400. " ++"0 = ସଙ୍ଗେ ସଙ୍ଗେ ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ। 0 < ବିଳମ୍ବ ମିଲିସେକେଣ୍ଡରେ। 0 > ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ ନାହିଁ " ++"ଏବଂ ପୂର୍ବ/ପର ଯନ୍ତ୍ରଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ।" + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -272,7 +283,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "ସଂରକ୍ଷିତ ସଂସ୍କରଣ କ୍ରମ ସଂଖ୍ୟାକୁ ପୂର୍ବରୁ ସ୍ଥାପିତ ibus ଏବଂ ପ୍ରଚଳିତ ibus ମଧ୍ଯରେ ପାର୍ଥକ୍ୟକୁ ଯାଞ୍ଚ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇଥାଏ।" ++msgstr "" ++"ସଂରକ୍ଷିତ ସଂସ୍କରଣ କ୍ରମ ସଂଖ୍ୟାକୁ ପୂର୍ବରୁ ସ୍ଥାପିତ ibus ଏବଂ ପ୍ରଚଳିତ ibus ମଧ୍ଯରେ ପାର୍ଥକ୍ୟକୁ ଯାଞ୍ଚ " ++"କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇଥାଏ।" + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -322,7 +335,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "ଭାଷା ତାଲିକାର ଆଚରଣ। 0 = ତାଲିକାରେ ସନ୍ନିହିତ, 1 = ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ, 2 = ସର୍ବଦା ଦର୍ଶାନ୍ତୁ" ++msgstr "" ++"ଭାଷା ତାଲିକାର ଆଚରଣ। 0 = ତାଲିକାରେ ସନ୍ନିହିତ, 1 = ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲୁଚାନ୍ତୁ, 2 = ସର୍ବଦା " ++"ଦର୍ଶାନ୍ତୁ" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -332,7 +347,9 @@ + 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 = ତଳ ପାଖ ବାମ କୋଣ, 3 = ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ, 4 = ଇଚ୍ଛାମୁତାବକ" ++msgstr "" ++"ଭାଷା ଫଳକର ଅବସ୍ଥାନ। 0 = ଉପର ପାଖ ବାମ କୋଣ, 1 = ଉପର ପାଖ ଡାହାଣ କୋଣ, 2 = ତଳ ପାଖ ବାମ " ++"କୋଣ, 3 = ତଳ ପାଖ ଡ଼ାହାଣ କୋଣ, 4 = ଇଚ୍ଛାମୁତାବକ" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -380,7 +397,8 @@ + + #: ../data/ibus.schemas.in.h:40 + msgid "Enable input method by default when the application gets input focus" +-msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ ଯେତେବେଳେ ପ୍ରୟୋଗକୁ ନିବେଶ ଲକ୍ଷ୍ଯ ମିଳିଥାଏ" ++msgstr "" ++"ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନିବେଶ ପ୍ରଣାଳୀକୁ ସକ୍ରିୟ କରନ୍ତୁ ଯେତେବେଳେ ପ୍ରୟୋଗକୁ ନିବେଶ ଲକ୍ଷ୍ଯ ମିଳିଥାଏ" + + #: ../data/ibus.schemas.in.h:41 + msgid "DConf preserve name prefixes" +@@ -394,7 +412,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -447,7 +467,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।\nକିକୁ ଛାଡ଼ିଦେଲାପରେ ସଂଳାପଟି ବନ୍ଦ ହୋଇଯିବ।" ++msgstr "" ++"ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।\n" ++"କିକୁ ଛାଡ଼ିଦେଲାପରେ ସଂଳାପଟି ବନ୍ଦ ହୋଇଯିବ।" + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -463,11 +485,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus ଆରମ୍ଭ ହୋଇସାରିଛି! ଯଦି ଆପଣ IBus ବ୍ୟବହାର କରି ନପାରନ୍ତି, ତେବେ ଦୟାକରି ନିମ୍ନଲିଖିତ ଧାଡ଼ିଗୁଡ଼ିକୁ " ++"$HOME/.bashrcରେ ଯୋଗ କରନ୍ତୁ, ତାପରେ ଆପଣଙ୍କର ଡେସ୍କଟପକୁ ପୁଣି ଲଗଇନ କରନ୍ତୁ।\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus ଆରମ୍ଭ ହୋଇସାରିଛି! ଯଦି ଆପଣ IBus ବ୍ୟବହାର କରି ନପାରନ୍ତି, ତେବେ ଦୟାକରି ନିମ୍ନଲିଖିତ ଧାଡ଼ିଗୁଡ଼ିକୁ $HOME/.bashrcରେ ଯୋଗ କରନ୍ତୁ, ତାପରେ ଆପଣଙ୍କର ଡେସ୍କଟପକୁ ପୁଣି ଲଗଇନ କରନ୍ତୁ।\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -579,7 +607,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "ବ୍ୟବହାର: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"ବ୍ୟବହାର: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -614,3 +644,236 @@ + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "ପୁନଃଚାଳନ" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "ସକ୍ରିୟ ନିବେଶ ପ୍ରଣାଳୀଗୁଡ଼ିକୁ ଇଚ୍ଛାରୂପଣ କରନ୍ତୁ (_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "ସକ୍ରିୟ ନିବେଶ ପ୍ରଣାଳୀଗୁଡ଼ିକୁ ଇଚ୍ଛାରୂପଣ କରନ୍ତୁ" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "ଯନ୍ତ୍ର ଧାରାକୁ ପୂର୍ବରୁ ଧାରଣ ହୋଇଥାଏ" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"ପୂର୍ବରୁ ଧାରଣ ହୋଇଥିବା ଯନ୍ତ୍ରଗୁଡ଼ିକ ଏହି ଧାରାରେ ଧାରଣ ହୋଇଥାଏ। 0 = ବ୍ୟବହାରକାରୀ ଇଚ୍ଛାରୂପଣ ଯନ୍ତ୍ର। " ++"1 = ଭାଷା ସମ୍ପୃକ୍ତ ଯନ୍ତ୍ର।" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "କି ପ୍ରାକଧାରଣ ଯନ୍ତ୍ରଗୁଡ଼ିକ ଆରମ୍ଭ କରାଯାଇଛି (_e)" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap କୁ ବ୍ୟବହାର କରନ୍ତୁ" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "xmodmap କୁ ଚଲାନ୍ତୁ ଯଦି .xmodmap/.Xmodmap ଅବସ୍ଥିତ ଅଛି।" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "ASCII ନଥିବା ଲାଟିନ ବିନ୍ୟାସ" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "us ବିନ୍ୟାସକୁ ଲାଟିନ ବିନ୍ୟାସ ସହିତ ଯୋଡ଼ାଯାଇଛି। ଭିନ୍ନ ପ୍ରକାର ଆବଶ୍ୟକ ନାହିଁ।" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "XKB ବିନ୍ୟାସ ତାଲିକା ଯାହାକି ibus-ସଂରଚନାରେ ଦର୍ଶାଯାଇଥାଏ" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"XKB ବିନ୍ୟାସ ତାଲିକା ଯାହାକି ibus-ବ୍ୟବସ୍ଥାରେ ଦର୍ଶାଯାଇଛି। ଶୈଳୀଟି ହେଉଛି \"ବିନ୍ୟାସ\" କିମ୍ବା " ++"\"ବିନ୍ୟାସ(ଭିନ୍ନ ପ୍ରକାରର)\"।" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "ପରିବର୍ତ୍ତନକାରୀ କି ଗୁଡ଼ିକ ବିନା ସଂକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକୁ ଆରମ୍ଭ କରନ୍ତୁ" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"ପରିବର୍ତ୍ତନକାରୀ କି ଗୁଡ଼ିକ ବିନା ସଂକ୍ଷିପ୍ତ ପଥ କି ଗୁଡ଼ିକୁ ଆରମ୍ଭ କରନ୍ତୁ। ତାଲିକାଟିibus-gjs ଦ୍ୱାରା ବ୍ୟବହାର " ++"ହୋଇଥାଏ।" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus ବ୍ୟବସ୍ଥା ଉପରେ ତନ୍ତ୍ର କି ବୋର୍ଡ ବିନ୍ୟାସ ଶ୍ରେଣୀଗୁଡ଼ିକର ତାଲିକା" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"ଶ୍ରେଣୀ ତାଲିକାକୁ ସମସ୍ତ ତନ୍ତ୍ର କିବୋର୍ଡ ବିନ୍ୟାସକୁ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ନଦର୍ଶାଇବା ପାଇଁ ବ୍ୟବହାର " ++"କରାଯାଇଥାଏ। ତାଲିକା ବସ୍ତୁକୁ gconf କି ଶେଷରେ ଯୋଗ କରାଯିବ। ଯେପରିକି .../xkblayoutconfig/ବସ୍ତୁ1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-ସଂରଚନାରେ ୟିରୋପିଆନ ଭାଷାର ତାଲିକା" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ଆପଣ କୌଣସି ଭାଷା ଉପରେ ibus-ସଂରଚନାକୁ ଚଲାଇବା ସମୟରେ ibus-ସଂରଚନା ଭାଷାଗୁଡ଼ିକୁ କେବଳ ନିବେଶ " ++"ପ୍ରଣାଳୀ ତାଲିକାରେ ଦର୍ଶାଇଥାଏ। ଅନ୍ୟାନ୍ୟ ଭାଷାଗୁଡ଼ିକ ଏକ ଅନୁଲମ୍ବିତ ବଟନ ତଳେ ଲୁଚାଇ ରଖାଯାଇଥାଏ।" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-ସଂରଚନାରେ ଏସିଆନ ଭାଷାଗୁଡ଼ିକର ତାଲିକା" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "ସମସ୍ତ ନିବେଶ ପ୍ରଣାଳୀଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "କେବଳ ଆପଣଙ୍କ ଅଞ୍ଚଳ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ ନିବେଶ ପ୍ରଣାଳୀଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"ଆପଣଙ୍କର ସଂରକ୍ଷିତ ନିବେଶ ପ୍ରଣାଳୀଗୁଡ଼ିକର ତାଲିକା ସଙ୍ଗେ ସଙ୍ଗେ ସଫା ହୋଇଯିବ ଏବଂ ପ୍ରତ୍ୟେକ ଥର ଲଗଇନ " ++"ଦ୍ୱାରା ତାଲିକାକୁ ବିନ୍ୟାସ କରାଯିବ। ଆପଣ ଏହା ସହିତ ସହମତ କି?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s ପାଇଁ କିବୋର୍ଡ ସକ୍ଷିପ୍ତପଥ ବାଛନ୍ତୁ" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "କିବୋର୍ଡ ବିନ୍ୟାସ: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିବେଶ ପଦ୍ଧତିଟି ତାଲିକା ଉପରେ ଅଛି।\n" ++"ଆପଣ ଉପର/ତଳ ବଟନକୁ ବ୍ୟାବହାର କରି ଏହାକୁ ପରିବର୍ତ୍ତନ କରିପାରିବେ।" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "ଦୟାକରି ଗୋଟିଏ କି (କିମ୍ବା ଗୋଟିଏ କି ସଂଯୋଜନ) ଦବାନ୍ତୁ।" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2007-2012 Peng Huang\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "ତନ୍ତ୍ର କିବୋର୍ଡ ବିନ୍ୟାସକୁ ବ୍ୟବହାର କରନ୍ତୁ" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "ନିବେଶ ପ୍ରଣାଳୀ ଫ୍ରେମୱର୍କ" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus ନିବେଶ ପ୍ରଣାଳୀ ଫ୍ରେମୱର୍କକୁ ଆରମ୍ଭ କରନ୍ତୁ" ++ ++#~ msgid "trigger" ++#~ msgstr "ଟ୍ରିଗର" ++ ++#~ msgid "enable" ++#~ msgstr "ସକ୍ରିୟ କରନ୍ତୁ" ++ ++#~ msgid "disable" ++#~ msgstr "ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "command [OPTIONS]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "xkb ବିନ୍ୟାସକୁ %s ରେ ପରିବର୍ତ୍ତନ କରିବା ବିଫଳ ହୋଇଛି।" +--- a/po/pa.po ++++ b/po/pa.po +@@ -2,7 +2,7 @@ + # Panjabi translation of ibus. + # Copyright (C) 2008-2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # asaini , 2013 + # Amanpreet Singh , 2008 +@@ -188,7 +188,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "ਡਿਫਾਲਟ ਇੰਪੁੱਟ ਢੰਗ ਲਿਸਟ ਵਿੱਚ ਸਭ ਤੋਂ ਉੱਤੇ ਹੈ।\nਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣ ਲਈ ਉੱਤੇ/ਹੇਠਾਂ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।" ++msgstr "" ++"ਡਿਫਾਲਟ ਇੰਪੁੱਟ ਢੰਗ ਲਿਸਟ ਵਿੱਚ ਸਭ ਤੋਂ ਉੱਤੇ ਹੈ।\n" ++"ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣ ਲਈ ਉੱਤੇ/ਹੇਠਾਂ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।" + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -227,7 +229,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ\nਮੁੱਖ ਸਫ਼ਾ: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"ਇੰਟੈਲੀਜੈਂਟ ਇੰਪੁੱਟ ਢੰਗ\n" ++"ਮੁੱਖ ਸਫ਼ਾ: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -266,7 +274,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Set popup delay milliseconds to show IME switcher window. The default is 400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show the window and switch prev/next engines." ++msgstr "" ++"Set popup delay milliseconds to show IME switcher window. The default is " ++"400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " ++"not show the window and switch prev/next engines." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -276,7 +287,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "ਸੰਭਾਲਿਆ ਸੰਸਕਰਣ ਨੰਬਰ ਪੁਰਾਣੇ ਇੰਸਟਾਲ ਕੀਤੇ ਹੋਏ ibus ਅਤੇ ਮੌਜੂਦਾ ibus ਦੇ ਸੰਸਕਰਣ ਵਿਚਲੇ ਫ਼ਰਕ ਨੂੰ ਜਾਂਚਣ ਲਈ ਵਰਤਿਆ ਜਾਏਗਾ।" ++msgstr "" ++"ਸੰਭਾਲਿਆ ਸੰਸਕਰਣ ਨੰਬਰ ਪੁਰਾਣੇ ਇੰਸਟਾਲ ਕੀਤੇ ਹੋਏ ibus ਅਤੇ ਮੌਜੂਦਾ ibus ਦੇ ਸੰਸਕਰਣ ਵਿਚਲੇ ਫ਼ਰਕ ਨੂੰ ਜਾਂਚਣ " ++"ਲਈ ਵਰਤਿਆ ਜਾਏਗਾ।" + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -336,7 +349,9 @@ + 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 = ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ, 3 = ਹੇਠਾਂ ਸੱਜਾ ਕੋਨਾ, 4 = ਪਸੰਦੀਦਾ" ++msgstr "" ++"ਭਾਸ਼ਾ ਪੈਨਲ ਦੀ ਸਥਿਤੀ. 0 = ਉੱਤੇ ਖੱਬਾ ਕੋਨਾ, 1 = ਉੱਤੇ ਸੱਜਾ ਕੋਨਾ, 2 = ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ, 3 = ਹੇਠਾਂ " ++"ਸੱਜਾ ਕੋਨਾ, 4 = ਪਸੰਦੀਦਾ" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -398,7 +413,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -451,7 +468,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਕੋਈ ਸਵਿੱਚ ਜੋੜ)।\nਜਦੋਂ ਸਵਿੱਚ ਛੱਡੀ ਜਾਵੇਗੀ ਤਾਂ ਇਹ ਡਾਇਲਾਗ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।" ++msgstr "" ++"ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਕੋਈ ਸਵਿੱਚ ਜੋੜ)।\n" ++"ਜਦੋਂ ਸਵਿੱਚ ਛੱਡੀ ਜਾਵੇਗੀ ਤਾਂ ਇਹ ਡਾਇਲਾਗ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।" + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -467,11 +486,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus ਚੱਲ ਪਿਆ ਹੈ! ਜੇ ਤੁਸੀਂ IBus ਨਹੀਂ ਵਰਤ ਸਕੇ, ਤਾਂ ਹੇਠਲੀ ਲਾਈਨ ਆਪਣੀ $HOME/.bashrc ਵਿੱਚ " ++"ਜੋੜੋ; ਅਤੇ ਦੁਬਾਰਾ ਲਾਗਇਨ ਕਰੋ।\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus ਚੱਲ ਪਿਆ ਹੈ! ਜੇ ਤੁਸੀਂ IBus ਨਹੀਂ ਵਰਤ ਸਕੇ, ਤਾਂ ਹੇਠਲੀ ਲਾਈਨ ਆਪਣੀ $HOME/.bashrc ਵਿੱਚ ਜੋੜੋ; ਅਤੇ ਦੁਬਾਰਾ ਲਾਗਇਨ ਕਰੋ।\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -583,7 +608,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "ਵਰਤੋਂ: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"ਵਰਤੋਂ: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -613,8 +640,235 @@ + + #: ../ui/gtk3/panel.vala:666 + msgid "translator-credits" +-msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ ੨੦੦੮-੨੦੧੨\nਜਸਵਿੰਦਰ ਸਿੰਘ \nhttp://www.satluj.com/" ++msgstr "" ++"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ ੨੦੦੮-੨੦੧੨\n" ++"ਜਸਵਿੰਦਰ ਸਿੰਘ \n" ++"http://www.satluj.com/" + + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "ਸਰਗਰਮ ਇੰਨਪੁੱਟ ਤਰੀਕੇ ਚੁਣੋ (_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "ਸਰਗਰਮ ਇੰਨਪੁੱਟ ਤਰੀਕੇ ਚੁਣੋ" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "ਪ੍ਰੀ-ਲੋਡ ਇੰਜਣ ਮੋਡ" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"ਪ੍ਰੀ-ਲੋਡ ਇੰਜਣ ਇਸ ਮੋਡ ਨਾਲ ਲੋਡ ਹੁੰਦੇ ਹਨ। 0 = ਯੂਜ਼ਰ ਦੇ ਚੁਣਿੰਦਾ ਇੰਜਣ। 1 =ਭਾਸ਼ਾ ਨਾਲ ਸੰਬੰਧਿਤ ਇੰਜਣ।" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "preload_engines ਚਾਬੀ ਚਾਲੂ ਹੋ ਗਈ ਹੈ" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap ਵਰਤੋਂ" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "xmodmap ਚਲਾਓ ਜੇ .xmodmap/.Xmodmap ਮੌਜੂਦ ਹੈ।" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "ਲੈਤਿਨ ਖਾਕਾ ਜਿਸਦਾ ਕੋਈ ASCII ਨਹੀਂ" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "ਯੂ ਐਸ ਖਾਕਾ ਲੈਤਿਨ ਖਾਕਿਆਂ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਵੱਖਰੇਵਾਂ ਲੋੜੀਂਦਾ ਨਹੀਂ।" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "XKB ਖਾਕਾ ਸੂਚੀ ਜਿਹੜੀ ibus-setup ਤੇ ਵਿਖਾਈ ਗਈ ਹੈ" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"XKB ਖਾਕਾ ਸੂਚੀ ਜਿਹੜੀ ibus-setup ਤੇ ਵਿਖਾਈ ਗਈ ਹੈ। ਫਾਰਮੈਟ \"ਖਾਕਾ\" ਜਾਂ " ++"\"ਖਾਕਾ(ਵੇਰੀਐਂਟ)\"।" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "ਮੌਡੀਫਾਇਰਾਂ ਚਾਬੀਆਂ ਤੋਂ ਬਿਨਾਂ ਟਰਿਗਰ ਸ਼ਾਰਟਕੱਟ ਚਾਬੀਆਂ" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "ਮੌਡੀਫਾਇਰਾਂ ਚਾਬੀਆਂ ਤੋਂ ਬਿਨਾਂ ਟਰਿਗਰ ਸ਼ਾਰਟਕੱਟ ਚਾਬੀਆਂ। ਸੂਚੀ ibus-gjs ਦੁਆਰਾ ਵਰਤੀ " ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup ਉੱਤੇ ਸਿਸਟਮ ਕੀ-ਬੋਰਡ ਖਾਕਾ ਸਮੂਹਾਂ ਦੀ ਸੂਚੀ" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"ਸਮੂਹ ਸੂਚੀ ਮੂਲ ਤੌਰ ਤੇ ਸਾਰੇ ਸਿਸਟਮ ਕੀ-ਬੋਰਡ ਖਾਕੇ ਨਾ ਵਿਖਾਉਣ ਲਈ ਵਰਤੀ ਜਾਂਦੀ ਹੈ। ਸੂਚੀ ਆਈਟਮ " ++"gconf ਕੀਅ ਦੇ ਅੰਤ ਵਿੱਚ ਜੋੜੀ ਜਾਵੇਗੀ। ਉਦਾਹਰਣ .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-ਸੈੱਟਅੱਪ ਉੱਤੇ ਯੂਰੋਪੀ ਭਾਸ਼ਾਵਾਂ ਦੀ ਸੂਚੀ" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-ਸੈੱਟਅੱਪ ਭਾਸ਼ਾਵਾਂ ਵਿੱਚੋਂ ਇੱਕ ਤੇ ibus-ਸੈਟਅੱਪ ਚਲਾਉਣ ਤੇ ਸਿਰਫ਼ ਇੰਨਪੁੱਟ ਢੰਗ ਸੂਚੀ ਵਿੱਚਲੀਆਂ ਭਾਸ਼ਾਵਾਂ " ++"ਹੀ ਵਿਖਾਉਂਦਾ ਹੈ। ਬਾਕੀ ਭਾਸ਼ਾਵਾਂ ਇੱਕ ਵੱਧਵੇਂ ਬਟਨ ਥੱਲੇ ਲੁਕੀਆਂ ਰਹਿੰਦੀਆਂ ਹਨ।" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-ਸੈੱਟਅੱਪ ਤੇ ਏਸ਼ੀਆਈ ਭਾਸ਼ਾਵਾਂ ਦੀ ਸੂਚੀ" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "xkb ਲੇਆਉਟ ਸੈੱਟ ਕਰੋ" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "ਲੇਆਉਟ" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "ਚੋਣ" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "ਸਾਰੇ ਇੰਨਪੁੱਟ ਢੰਗ ਵਿਖਾਓ" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "ਸਿਰਫ਼ ਤੁਹਾਡੇ ਖੇਤਰ ਲਈ ਇੰਨਪੁੱਟ ਢੰਗ ਹੀ ਵਿਖਾਓ" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"ਤੁਹਾਡੀਆਂ ਸੰਭਾਲੇ ਗਏ ਇੰਨਪੁੱਟ ਢੰਗਾਂ ਦੀ ਸੂਚੀ ਇਕਦਮ ਸਾਫ ਕਰ ਦਿੱਤੀ ਜਾਵੇਗੀ ਅਤੇ ਸੂਚੀ ਹਰ ਵਾਰੀ ਲਾਗਇਨ " ++"ਭਾਸ਼ਾ ਦੁਆਰਾ ਸੰਰਚਿਤ ਕੀਤੀ ਜਾਵੇਗੀ। ਕੀ ਤੁਸੀਂ ਇਸ ਨਾਲ ਸਹਿਮਤ ਹੋ?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "ਮੂਲ" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"ਡਿਫਾਲਟ ਇੰਪੁੱਟ ਢੰਗ ਲਿਸਟ ਵਿੱਚ ਸਭ ਤੋਂ ਉੱਤੇ ਹੈ।\n" ++"ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣ ਲਈ ਉੱਤੇ/ਹੇਠਾਂ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "ਕੀਬੋਰਡ ਚੋਣ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ।" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2007-2012 Peng Huang\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "ਡਿਫਲਟ ਲੇਆਉਟ" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "ਸੈਟਅੱਪ" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "ਸਿਸਟਮ ਕੀਬੋਰਡ ਲੇਆਉਟ ਵਰਤੋ" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus ਇੰਪੁੱਟ ਢੰਗ ਫਰੇਮਵਰਕ ਸ਼ੁਰੂ ਕਰੋ" ++ ++#~ msgid "trigger" ++#~ msgstr "ਟਰਿੱਗਰ" ++ ++#~ msgid "enable" ++#~ msgstr "ਚਾਲੂ ਕਰੋ" ++ ++#~ msgid "disable" ++#~ msgstr "ਬੰਦ ਕਰੋ" +--- a/po/pl.po ++++ b/po/pl.po +@@ -17,7 +17,8 @@ + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Language: pl\n" +-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " ++"|| n%100>=20) ? 1 : 2);\n" + + #: ../setup/setup.ui.h:1 + msgid "Horizontal" +@@ -65,7 +66,8 @@ + + #: ../setup/setup.ui.h:12 + 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" ++msgstr "" ++"Klawisz skrótu do przełączenia na następną metodę wprowadzania na liście" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -73,7 +75,8 @@ + + #: ../setup/setup.ui.h:14 + 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" ++msgstr "" ++"Klawisz skrótu do przełączenia na poprzednią metodę wprowadzania na liście" + + #: ../setup/setup.ui.h:15 + msgid "Previous input method:" +@@ -133,7 +136,9 @@ + + #: ../setup/setup.ui.h:29 + 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" ++msgstr "" ++"Wyświetlanie nazwy metody wprowadzania na panelu języków podczas zaznaczania " ++"pola wyboru" + + #: ../setup/setup.ui.h:30 + msgid "Embed preedit text in application window" +@@ -141,7 +146,8 @@ + + #: ../setup/setup.ui.h:31 + msgid "Embed the preedit text of input method in the application window" +-msgstr "Osadzanie wcześniej wprowadzonego tekstu metody wejścia w oknie aplikacji" ++msgstr "" ++"Osadzanie wcześniej wprowadzonego tekstu metody wejścia w oknie aplikacji" + + #: ../setup/setup.ui.h:32 + msgid "Use custom font:" +@@ -161,15 +167,20 @@ + + #: ../setup/setup.ui.h:36 + msgid "Remove the selected input method from the enabled input methods" +-msgstr "Usunięcie zaznaczonej metody wprowadzania we włączonych metodach wprowadzania" ++msgstr "" ++"Usunięcie zaznaczonej metody wprowadzania we włączonych metodach wprowadzania" + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "Przeniesienie w górę zaznaczonej metody wprowadzania we włączonych metodach wprowadzania" ++msgstr "" ++"Przeniesienie w górę zaznaczonej metody wprowadzania we włączonych metodach " ++"wprowadzania" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +-msgstr "Przeniesienie w dół zaznaczonej metody wprowadzania we włączonych metodach wprowadzania" ++msgstr "" ++"Przeniesienie w dół zaznaczonej metody wprowadzania we włączonych metodach " ++"wprowadzania" + + #: ../setup/setup.ui.h:39 + msgid "Show information of the selected input method" +@@ -184,7 +195,10 @@ + "The active input method can be switched around from the selected " + "ones in the above list by pressing the keyboard shortcut keys or clicking " + "the panel icon." +-msgstr "Aktywna metoda wprowadzania może być przełączana z wybranych metod na powyższej liście za pomocą skrótu klawiszowego lub kliknięcia ikony na panelu." ++msgstr "" ++"Aktywna metoda wprowadzania może być przełączana z wybranych metod " ++"na powyższej liście za pomocą skrótu klawiszowego lub kliknięcia ikony na " ++"panelu." + + #. create im name & icon column + #: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66 +@@ -223,7 +237,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nInteligentna magistrala wprowadzania\nStrona domowa: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"Inteligentna magistrala wprowadzania\n" ++"Strona domowa: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:56 + msgid "Start ibus on login" +@@ -262,7 +282,11 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Ustawia opóźnienie wyświetlenia okna przełącznika IME w milisekundach. Domyślnie wynosi 400. 0 = natychmiastowe wyświetlanie okna. 0 < milisekundy opóźnienia. 0 > Bez wyświetlania okna i przełączania na następny/poprzedni mechanizm." ++msgstr "" ++"Ustawia opóźnienie wyświetlenia okna przełącznika IME w milisekundach. " ++"Domyślnie wynosi 400. 0 = natychmiastowe wyświetlanie okna. 0 < " ++"milisekundy opóźnienia. 0 > Bez wyświetlania okna i przełączania na " ++"następny/poprzedni mechanizm." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -272,7 +296,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "Zapisany numer wersji będzie używany do sprawdzania różnicy między wersją poprzednio zainstalowanego IBus a obecnego." ++msgstr "" ++"Zapisany numer wersji będzie używany do sprawdzania różnicy między wersją " ++"poprzednio zainstalowanego IBus a obecnego." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -304,7 +330,8 @@ + + #: ../data/ibus.schemas.in.h:17 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "Klawisze skrótu do przełączania na następną metodę wprowadzania na liście" ++msgstr "" ++"Klawisze skrótu do przełączania na następną metodę wprowadzania na liście" + + #: ../data/ibus.schemas.in.h:18 + msgid "Prev engine shortcut keys" +@@ -312,7 +339,8 @@ + + #: ../data/ibus.schemas.in.h:19 + msgid "The shortcut keys for switching to the previous input method" +-msgstr "Klawisze skrótu do przełączania na poprzednią metodę wprowadzania na liście" ++msgstr "" ++"Klawisze skrótu do przełączania na poprzednią metodę wprowadzania na liście" + + #: ../data/ibus.schemas.in.h:20 + msgid "Auto hide" +@@ -322,7 +350,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "Zachowanie panela języków. 0 = osadzony w menu, 1 = automatycznie ukrywany, 2 = zawsze wyświetlany" ++msgstr "" ++"Zachowanie panela języków. 0 = osadzony w menu, 1 = automatycznie ukrywany, " ++"2 = zawsze wyświetlany" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -332,7 +362,9 @@ + 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 "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" ++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:24 + msgid "Orientation of lookup table" +@@ -380,7 +412,9 @@ + + #: ../data/ibus.schemas.in.h:40 + msgid "Enable input method by default when the application gets input focus" +-msgstr "Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność wprowadzania" ++msgstr "" ++"Domyślne włączanie metody wprowadzania, kiedy aplikacja uzyskuje aktywność " ++"wprowadzania" + + #: ../data/ibus.schemas.in.h:41 + msgid "DConf preserve name prefixes" +@@ -394,7 +428,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -447,7 +483,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy).\nOkno dialogowe zostanie zamknięte po zwolnieniu klawisza." ++msgstr "" ++"Proszę nacisnąć klawisz (lub kombinację klawiszy).\n" ++"Okno dialogowe zostanie zamknięte po zwolnieniu klawisza." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -455,7 +493,9 @@ + + #: ../setup/main.py:99 ../setup/main.py:392 + msgid "Use shortcut with shift to switch to the previous input method" +-msgstr "Użycie skrótu z klawiszem Shift do przełączania do poprzedniej metody wprowadzania" ++msgstr "" ++"Użycie skrótu z klawiszem Shift do przełączania do poprzedniej metody " ++"wprowadzania" + + #: ../setup/main.py:326 + msgid "The IBus daemon is not running. Do you wish to start it?" +@@ -463,11 +503,17 @@ + + #: ../setup/main.py:347 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus został uruchomiony. Jeśli nie można używać iBus, należy dodać poniższe " ++"wiersze do pliku $HOME/.bashrc i zalogować się ponownie.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus został uruchomiony. Jeśli nie można używać iBus, należy dodać poniższe wiersze do pliku $HOME/.bashrc i zalogować się ponownie.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:361 +@@ -579,7 +625,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Użycie %s POLECENIE [OPCJA...]\n\n" ++msgstr "" ++"Użycie %s POLECENIE [OPCJA...]\n" ++"\n" + + #: ../tools/main.vala:309 + #, c-format +@@ -614,3 +662,244 @@ + #: ../ui/gtk3/panel.vala:697 + msgid "Restart" + msgstr "Uruchom ponownie" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "Dostosowanie aktywnej _metody wprowadzania" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "Dostosowanie aktywnej metody wprowadzania" ++ ++#: ../setup/setup.ui.h:43 ++msgid "" ++"The default input method is the top one in the list.\n" ++"You may use up/down buttons to change it." ++msgstr "" ++"Domyślna metoda wprowadzania znajduje się na górze listy.\n" ++"Można użyć klawiszy w górę/w dół, aby ją zmienić." ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Wcześniejsze wczytanie mechanizmów" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"W tym trybie mechanizmy są wcześniej wczytywane. 0 = mechanizmy dostosowane " ++"przez użytkownika. 1 = mechanizmy związane z językiem." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "Klucz preload_engines jest zainicjowany" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Użycie xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "Wykonuje xmodmap, jeśli plik .xmodmap/.Xmodmap istnieje." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Układ łaciński bez ASCII" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"układ us jest dołączany do układów łacińskich. wariant nie jest wymagany." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "Lista układów XKB wyświetlana przez program ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"Lista układów XKB wyświetlana przez program ibus-setup. Format to \"układ\" " ++"lub \"układ(wariant)\"." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Klawisze skrótu przełączenia bez klawiszy modyfikacji" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Klawisze skrótu przełączenia bez klawiszy modyfikacji. Lista jest używana " ++"przez ibus-gjs." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Lista systemowych grup układów klawiatury w programie ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"Lista grup jest używana, aby domyślnie nie wyświetlać wszystkich układów " ++"klawiatury. Element listy zostanie dołączony na końcu klucza GConf, np. .../" ++"xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Lista europejskich języków w programie ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"Program ibus-setup wyświetla języki na liście metod wprowadzania po " ++"uruchomieniu ibus-setup na jednym z języków. Inne języki są ukryte pod " ++"przyciskiem rozwijania." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Lista azjatyckich języków w programie ibus-setup" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "Odpytuje bieżący układ XKB" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "Ustawia układ XKB" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "UKŁAD" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "Ustawia wariant XKB" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "WARIANT" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "Ustawia opcję XKB" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "OPCJA" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "Ustawia obecny stan XKB" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Wyświetla wszystkie metod wprowadzania" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "Wyświetla metody wprowadzania tylko dla regionu użytkownika" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"Lista zapisanych metod wprowadzania będzie natychmiast czyszczona i zostanie " ++"skonfigurowana za każdym razem według języka logowania. Wyrazić zgodę?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "Domyślne" ++ ++#: ../setup/xkbsetup.py:207 ++msgid "Select keyboard layouts" ++msgstr "Wybór układów klawiatury" ++ ++#: ../setup/xkbsetup.py:212 ++msgid "Keyboard Layouts" ++msgstr "Układy klawiatury" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"Systemowe układy klawiatury można ustawić na mniej niż lub równo " ++"%d.\n" ++"Można użyć klawiszy w górę/w dół, aby ją zmienić." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "" ++"Proszę ponownie uruchomić usługę iBus, aby ponownie wczytać konfigurację." ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "Nie można wybrać opcji klawiatury." ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "Copyright (c) 2012 Takao Fujiwara\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "Domyślny układ" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "Ustawienia" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "Konfiguruje mechanizm XKB" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "Uzyskuje bieżący układ XKB" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "Ustawia układ XKB" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "Ustawia model XKB" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "Ustawia opcję XKB" ++ ++#~ msgid "IBus" ++#~ msgstr "iBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "Struktura metody wprowadzania" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "Uruchomienie struktury metody wprowadzania iBus" ++ ++#~ msgid "trigger" ++#~ msgstr "przełącznik" ++ ++#~ msgid "enable" ++#~ msgstr "włączenie" ++ ++#~ msgid "disable" ++#~ msgstr "wyłączenie" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "polecenie [OPCJE]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "Przełączenie układu XKB na %s się nie powiodło." +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -2,7 +2,7 @@ + # Portuguese (Brazil) translation of ibus. + # Copyright (C) 2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Arthur Rodrigues Araruna , 2012 + # Automatically generated, 2010 +@@ -68,7 +68,8 @@ + + #: ../setup/setup.ui.h:12 + msgid "The shortcut keys for switching to next input method in the list" +-msgstr "As teclas de atalho para alteração ao próximo método de entrada na lista" ++msgstr "" ++"As teclas de atalho para alteração ao próximo método de entrada na lista" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -116,7 +117,9 @@ + + #: ../setup/setup.ui.h:24 + msgid "Set the behavior of ibus how to show or hide language bar" +-msgstr "Configure o comportamento do ibus para como demonstrar ou ocultar a barra de linguagem" ++msgstr "" ++"Configure o comportamento do ibus para como demonstrar ou ocultar a barra de " ++"linguagem" + + #: ../setup/setup.ui.h:25 + msgid "Show language panel:" +@@ -136,7 +139,9 @@ + + #: ../setup/setup.ui.h:29 + msgid "Show input method's name on language bar when check the checkbox" +-msgstr "Apresente o nome do método de entrada na barra de linguagem quando selecionando a caixa de seleção" ++msgstr "" ++"Apresente o nome do método de entrada na barra de linguagem quando " ++"selecionando a caixa de seleção" + + #: ../setup/setup.ui.h:30 + msgid "Embed preedit text in application window" +@@ -144,7 +149,8 @@ + + #: ../setup/setup.ui.h:31 + msgid "Embed the preedit text of input method in the application window" +-msgstr "Embutir o texto de pré-edição do método de entrada na janela do aplicativo" ++msgstr "" ++"Embutir o texto de pré-edição do método de entrada na janela do aplicativo" + + #: ../setup/setup.ui.h:32 + msgid "Use custom font:" +@@ -160,19 +166,26 @@ + + #: ../setup/setup.ui.h:35 + msgid "Add the selected input method into the enabled input methods" +-msgstr "Adicione o método de entrada selecionado nos métodos de entrada ativados" ++msgstr "" ++"Adicione o método de entrada selecionado nos métodos de entrada ativados" + + #: ../setup/setup.ui.h:36 + msgid "Remove the selected input method from the enabled input methods" +-msgstr "Remova o método de entrada selecionado a partir dos métodos de entrada ativados" ++msgstr "" ++"Remova o método de entrada selecionado a partir dos métodos de entrada " ++"ativados" + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "Mova para cima o método de entrada selecionado na lista dos métodos de entrada" ++msgstr "" ++"Mova para cima o método de entrada selecionado na lista dos métodos de " ++"entrada" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +-msgstr "Mova o método de entrada selecionado para baixo nos métodos de entrada ativados" ++msgstr "" ++"Mova o método de entrada selecionado para baixo nos métodos de entrada " ++"ativados" + + #: ../setup/setup.ui.h:39 + msgid "Show information of the selected input method" +@@ -186,7 +199,10 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "O método de entrada padrão é o número um da lista. Você pode usar os botões para mover o cursor para cima e para baixo para alterá-lo." ++msgstr "" ++"O método de entrada padrão é o número um da lista. Você pode usar " ++"os botões para mover o cursor para cima e para baixo para alterá-lo." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64 +@@ -225,7 +241,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nThe intelligent input bus\nHomepage: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"The intelligent input bus\n" ++"Homepage: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -276,7 +298,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Configuração do popup atrasa milisegundos par exibir a janela do alterador IME. O padrão é 400.0 = Exibe a janela imediatamente. 0 < Atrasa milisegundos. 0 > Não exibe a janela e altera motores anterior/próximo." ++msgstr "" ++"Configuração do popup atrasa milisegundos par exibir a janela do alterador " ++"IME. O padrão é 400.0 = Exibe a janela imediatamente. 0 < Atrasa " ++"milisegundos. 0 > Não exibe a janela e altera motores anterior/próximo." + + #: ../data/ibus.schemas.in.h:7 + msgid "Trigger shortcut keys" +@@ -308,7 +333,8 @@ + + #: ../data/ibus.schemas.in.h:15 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "As teclas de atalho para alteração ao próximo método de entrada na lista " ++msgstr "" ++"As teclas de atalho para alteração ao próximo método de entrada na lista " + + #: ../data/ibus.schemas.in.h:16 + msgid "Prev engine shortcut keys" +@@ -326,7 +352,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "O comportamento do painel de linguagem. 0 = Embutido no menu, 1 = Ocultar automaticamente, 2 = Apresentar sempre" ++msgstr "" ++"O comportamento do painel de linguagem. 0 = Embutido no menu, 1 = Ocultar " ++"automaticamente, 2 = Apresentar sempre" + + #: ../data/ibus.schemas.in.h:20 + msgid "Language panel position" +@@ -336,7 +364,10 @@ + 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 "A posição do painel de linguagem. 0 = Canto esquerdo superior, 1 = Canto direito superior, 2 = canto esquerdo inferior, 3 = canto direito inferior, 4 = Padrão " ++msgstr "" ++"A posição do painel de linguagem. 0 = Canto esquerdo superior, 1 = Canto " ++"direito superior, 2 = canto esquerdo inferior, 3 = canto direito inferior, 4 " ++"= Padrão " + + #: ../data/ibus.schemas.in.h:22 + msgid "Orientation of lookup table" +@@ -384,7 +415,9 @@ + + #: ../data/ibus.schemas.in.h:38 + msgid "Enable input method by default when the application gets input focus" +-msgstr "Habilitar método de entrada por padrão quando o aplicativo obtiver o foco de entradas" ++msgstr "" ++"Habilitar método de entrada por padrão quando o aplicativo obtiver o foco de " ++"entradas" + + #: ../data/ibus.schemas.in.h:39 + msgid "DConf preserve name prefixes" +@@ -398,7 +431,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -451,7 +486,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Por favor pressione uma tecla (ou uma combinação de tecla).\nO diálogo será encerrado quando a tecla for liberada." ++msgstr "" ++"Por favor pressione uma tecla (ou uma combinação de tecla).\n" ++"O diálogo será encerrado quando a tecla for liberada." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -459,7 +496,8 @@ + + #: ../setup/main.py:99 ../setup/main.py:398 + msgid "Use shortcut with shift to switch to the previous input method" +-msgstr "Utilize o atalho com o alterador para mudar para o método de entrada anterior" ++msgstr "" ++"Utilize o atalho com o alterador para mudar para o método de entrada anterior" + + #: ../setup/main.py:332 + msgid "The IBus daemon is not running. Do you wish to start it?" +@@ -467,11 +505,18 @@ + + #: ../setup/main.py:353 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "O IBus foi iniciado! Se você não puder utilizar o IBus, adicione as seguintes linhas ao seu $HOME/.bashrc; depois autentique-se novamente no seu desktop.\nexportar GTK_IM_MODULE=ibus\nexportar XMODIFIERS=@im=ibus\nexportar QT_IM_MODULE=ibus" ++msgstr "" ++"O IBus foi iniciado! Se você não puder utilizar o IBus, adicione as " ++"seguintes linhas ao seu $HOME/.bashrc; depois autentique-se novamente no seu " ++"desktop.\n" ++"exportar GTK_IM_MODULE=ibus\n" ++"exportar XMODIFIERS=@im=ibus\n" ++"exportar QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:367 +@@ -526,7 +571,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Uso: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"Uso: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:225 + #, c-format +@@ -553,3 +600,265 @@ + #: ../ui/gtk3/panel.vala:539 + msgid "Restart" + msgstr "Reinicie" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "Padronizar métodos_entrada ativos" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "Padronizar métodos de entrada ativos" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Modo de motor de pré-carregamento " ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"Motores de pré-carregamento são carregados com este modo. 0=motores " ++"padronizados de usuário. 1=motores relacionados ao idioma." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "A tecla motores_pré-carregamento é inicializada" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Usar xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "Executar xmodmap se .xmodmap/.Xmodmap existir." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Layout latin que não possui ASCII" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"Layout do US é adicionado aos layouts em latin. Não é necessário variantes." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "Lista de layout XKB que é exibida em ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"Layout de XKB que é exibida em ibus-setup. O formato é \"layout\" ou " ++"\"layout(variante)\"." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Dispara teclas de atalho sem as teclas modificadoras." ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Dispara teclas de atalho sem as teclas modificadoras. A lista é usada pelo " ++"ibus-gjs." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Lista do layout do grupo de teclado do sistema em ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"A lista de grupo é usada para não exibir todos os layouts de teclados de " ++"sistema por padrão. O ítem da lista será adicionado ao final da tecla gconf. " ++"ex.: .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Lista de idiomas Europeus no ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibuts-setup exibe os idiomas somente na lista de método de entrada quando " ++"você executa ibus-setup em um dos idiomas. Outros idiomas estão escondidos " ++"sob um botão estendido." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Lista de Idiomas Aisáticos no ibus-setup" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Exibe todos os métodos de entrada" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "Exibe somente métodos de entrada para sua região" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"A lista de seus métodos de entrada salvos serão limpos imediatamente e a " ++"lista será configurada pelo idioma de login todas as vezes. Você concorda " ++"com isto?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Selecione o atalho do teclado para %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Desenho do teclado: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"O método de entrada padrão é o número um da lista. Você pode usar " ++"os botões para mover o cursor para cima e para baixo para alterá-lo." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Por favor pressione uma tecla (ou uma combinação de tecla)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "Usa o desenho do teclado do sistema" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "trigger" ++#~ msgstr "trigger" ++ ++#~ msgid "enable" ++#~ msgstr "habilitar" ++ ++#~ msgid "disable" ++#~ msgstr "desabiltar" ++ ++#~ msgid "Previous page" ++#~ msgstr "Página anterior" ++ ++#~ msgid "Next page" ++#~ msgstr "Próxima página" ++ ++#~ msgid "" ++#~ "Some input methods have been installed, removed or updated. Please " ++#~ "restart ibus input platform." ++#~ msgstr "" ++#~ "Alguns métodos de entrada foram instalados, removidos ou atualizados. Por " ++#~ "favor, reinicie a plataforma de entrada do ibus. " ++ ++#~ msgid "Restart Now" ++#~ msgstr "Reinicie Agora" ++ ++#~ msgid "Later" ++#~ msgstr "Mais tarde" ++ ++#~ msgid "IBus input method framework" ++#~ msgstr "Framework do método de entrada IBus" ++ ++#~ msgid "Turn off input method" ++#~ msgstr "Desligue o método de entrada" ++ ++#~ msgid "No input window" ++#~ msgstr "Nenhuma janela de entrada" ++ ++#~ msgid "About the Input Method" ++#~ msgstr "A respeito do Método de Entrada" ++ ++#~ msgid "next input method" ++#~ msgstr "próximo método de entrada" ++ ++#~ msgid "previous input method" ++#~ msgstr "método de entrada anterior" +--- a/po/ru.po ++++ b/po/ru.po +@@ -19,7 +19,8 @@ + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Language: ru\n" +-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" ++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + + #: ../setup/setup.ui.h:1 + msgid "Horizontal" +@@ -135,7 +136,8 @@ + + #: ../setup/setup.ui.h:29 + msgid "Show input method's name on language bar when check the checkbox" +-msgstr "Показывать название метода ввода на языковой панели, когда пункт выбран" ++msgstr "" ++"Показывать название метода ввода на языковой панели, когда пункт выбран" + + #: ../setup/setup.ui.h:30 + msgid "Embed preedit text in application window" +@@ -185,7 +187,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "По умолчанию используется первый в списке метод ввода.\nИспользуйте кнопки вверх/вниз для изменения." ++msgstr "" ++"По умолчанию используется первый в списке метод ввода.\n" ++"Используйте кнопки вверх/вниз для изменения." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -224,7 +228,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nИнтеллектуальная система ввода\nДомашняя страница: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"Интеллектуальная система ввода\n" ++"Домашняя страница: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -263,7 +273,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Настройте задержку показа окна выбора метода ввода, которое по умолчанию будет равно 400 мсек. Возможные значения: 0 - окно будет открыто сразу, 0 < задержка в миллисекундах, 0 > окно не будет показано." ++msgstr "" ++"Настройте задержку показа окна выбора метода ввода, которое по умолчанию " ++"будет равно 400 мсек. Возможные значения: 0 - окно будет открыто сразу, 0 " ++"< задержка в миллисекундах, 0 > окно не будет показано." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -273,7 +286,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "Сохраненный номер версии используется для сравнения предыдущей версии ibus с текущей." ++msgstr "" ++"Сохраненный номер версии используется для сравнения предыдущей версии ibus с " ++"текущей." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -323,7 +338,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "Поведение языковой панели: 0 = встроена в меню, 1 = автоматически скрывать, 2 = всегда показывать" ++msgstr "" ++"Поведение языковой панели: 0 = встроена в меню, 1 = автоматически скрывать, " ++"2 = всегда показывать" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -333,7 +350,9 @@ + 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 = левый нижний угол, 3 = правый нижний угол, 4 = произвольное" ++msgstr "" ++"Расположение языковой панели: 0 = левый верхний угол, 1 = правый верхний " ++"угол, 2 = левый нижний угол, 3 = правый нижний угол, 4 = произвольное" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -381,7 +400,8 @@ + + #: ../data/ibus.schemas.in.h:40 + msgid "Enable input method by default when the application gets input focus" +-msgstr "Включить метод ввода по умолчанию при получении приложением фокуса ввода" ++msgstr "" ++"Включить метод ввода по умолчанию при получении приложением фокуса ввода" + + #: ../data/ibus.schemas.in.h:41 + msgid "DConf preserve name prefixes" +@@ -395,7 +415,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "(c) 2007-2010 Peng Huang\n(c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"(c) 2007-2010 Peng Huang\n" ++"(c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -448,7 +470,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Нажмите клавишу (или сочетание клавиш).\nКогда клавиша будет отпущена, окно закроется." ++msgstr "" ++"Нажмите клавишу (или сочетание клавиш).\n" ++"Когда клавиша будет отпущена, окно закроется." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -464,11 +488,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus запущен. Если у вас нет доступа к IBus, добавьте приведенные ниже строки в $HOME/.bashrc и заново войдите в систему.\nexport GTK_IM_MODULE=ibus\nexport XMODIFIERS=@im=ibus\nexport QT_IM_MODULE=ibus" ++msgstr "" ++"IBus запущен. Если у вас нет доступа к IBus, добавьте приведенные ниже " ++"строки в $HOME/.bashrc и заново войдите в систему.\n" ++"export GTK_IM_MODULE=ibus\n" ++"export XMODIFIERS=@im=ibus\n" ++"export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -580,7 +610,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Формат: %s КОМАНДА [ПАРАМЕТР...]\n\n" ++msgstr "" ++"Формат: %s КОМАНДА [ПАРАМЕТР...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -610,8 +642,272 @@ + + #: ../ui/gtk3/panel.vala:666 + msgid "translator-credits" +-msgstr "Alexey Kotlyarov , 2009.\nYulia , 2010." ++msgstr "" ++"Alexey Kotlyarov , 2009.\n" ++"Yulia , 2010." + + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "Перезапустить" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "Изменить _активные методы ввода" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "Изменить активные методы ввода" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Режим предварительной загрузки молуля" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"Режим предварительной загрузки модулей. 0 для пользовательских модулей, 1 " ++"для языковых модулей. " ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "Инициализация ключевых _модулей" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Использовать xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "Выполнять xmodmap при наличии .xmodmap/.Xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Латинская раскладка без ASCII" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "Раскладка США добавлена к латинским раскладкам. Вариант не требуется." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "Список раскладок XKB, который будет показан при выполнении ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"Список раскладок XKB, который будет показан при выполнении ibus-setup, в " ++"формате «layout» или «layout(variant)»." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Сочетания клавиш без клавиш-модификаторов" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Сочетания клавиш без клавиш-модификаторов. Этот список используется в ibus-" ++"gjs." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Список групп раскладок в ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"Список групп используется для выборочного отоборажения раскладок клавиатуры. " ++"Элементы списка добавляются в конец ключа gconf (например, /xkblayoutconfig/" ++"item1)." ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Список европейских языков в ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup показывает языки в списке методов ввода при запуске ibus-setup на " ++"одном из языков. Другие языки можно просмотреть, нажав дополнительную кнопку." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Список азиатских языков в ibus-setup" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Показать все методы ввода" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "Показать методы для выбранного региона" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"Список сохраненных методов ввода будет очищен и будет заново заполнен во " ++"время следующего входа в систему в зависимости от языка авторизации. " ++"Продолжить?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Выберите комбинацию клавиш для %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Раскладка клавиатуры: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"По умолчанию используется первый в списке метод ввода.\n" ++"Используйте кнопки вверх/вниз для изменения." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Нажмите клавишу (или сочетание клавиш)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"(c) 2007-2010 Peng Huang\n" ++"(c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "Использовать системную раскладку клавиатуры" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "Система методов ввода" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "Запустить систему методов ввода IBus" ++ ++#~ msgid "trigger" ++#~ msgstr "переключатель" ++ ++#~ msgid "Previous page" ++#~ msgstr "Предыдущая страница" ++ ++#~ msgid "Next page" ++#~ msgstr "Следующая страница" ++ ++#~ msgid "" ++#~ "Some input methods have been installed, removed or updated. Please " ++#~ "restart ibus input platform." ++#~ msgstr "" ++#~ "Методы ввода были установлены, удалены или обновлены. Перезапустите " ++#~ "платформу ввода iBus." ++ ++#~ msgid "Restart Now" ++#~ msgstr "Перезапустить сейчас" ++ ++#~ msgid "Later" ++#~ msgstr "Позже" ++ ++#~ msgid "IBus input method framework" ++#~ msgstr "Система методов ввода IBus" ++ ++#~ msgid "Turn off input method" ++#~ msgstr "Отключить метод ввода" ++ ++#~ msgid "No input window" ++#~ msgstr "Нет окна ввода" ++ ++#~ msgid "About the Input Method" ++#~ msgstr "О методе ввода" ++ ++#~ msgid "next input method" ++#~ msgstr "следующий метод ввода" ++ ++#~ msgid "previous input method" ++#~ msgstr "предыдущий метод ввода" +--- a/po/sr.po ++++ b/po/sr.po +@@ -555,6 +555,222 @@ + msgid "Restart" + msgstr "Покрени поново" + ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Изаберите методу уноса" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Изаберите методу уноса" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++#, fuzzy ++msgid "Preload engine mode" ++msgstr "Унапред учитај погоне" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++#, fuzzy ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Пречица окидача" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Назив прилагођеног фонта за језички панел" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "Назив прилагођеног фонта за језички панел" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++#, fuzzy ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "" ++"Пречица претходног погона за пребацивање на претходни погон методе уноса" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#. Translators: %d == 5 currently ++#: ../setup/main.py:413 ++#, python-format ++msgid "IBus daemon could not be started in %d seconds" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "Нема методе уноса" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Изаберите пречицу тастатуре за %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Пречице тастатуре" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Притисните тастер (или комбинацију тастера)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ + #, fuzzy + #~ msgid "Previous page" + #~ msgstr "Претходна метода уноса:" +--- a/po/sr@latin.po ++++ b/po/sr@latin.po +@@ -555,6 +555,222 @@ + msgid "Restart" + msgstr "Pokreni ponovo" + ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Izaberite metodu unosa" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Izaberite metodu unosa" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++#, fuzzy ++msgid "Preload engine mode" ++msgstr "Unapred učitaj pogone" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++#, fuzzy ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Prečica okidača" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Naziv prilagođenog fonta za jezički panel" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "Naziv prilagođenog fonta za jezički panel" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++#, fuzzy ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "" ++"Prečica prethodnog pogona za prebacivanje na prethodni pogon metode unosa" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#. Translators: %d == 5 currently ++#: ../setup/main.py:413 ++#, python-format ++msgid "IBus daemon could not be started in %d seconds" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "Nema metode unosa" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Izaberite prečicu tastature za %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Prečice tastature" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Pritisnite taster (ili kombinaciju tastera)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ + #, fuzzy + #~ msgid "Previous page" + #~ msgstr "Prethodna metoda unosa:" +--- a/po/ta.po ++++ b/po/ta.po +@@ -172,7 +172,8 @@ + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "செயல்படுத்தப்பட்ட உள்ளீடு முறைகள் பட்டியலில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை மேலே நகர்த்து" ++msgstr "" ++"செயல்படுத்தப்பட்ட உள்ளீடு முறைகள் பட்டியலில் தேர்ந்தெடுக்கப்பட்ட உள்ளீடு முறையை மேலே நகர்த்து" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +@@ -190,7 +191,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "பட்டியலில் முன்னிருப்பு உள்ளீடு முறை மேலே இருக்கும்.\nமேல்/கீழ் பொத்தானை பயன்படுத்தி அதனை மாற்றவும்." ++msgstr "" ++"பட்டியலில் முன்னிருப்பு உள்ளீடு முறை மேலே இருக்கும்.\n" ++"மேல்/கீழ் பொத்தானை பயன்படுத்தி அதனை மாற்றவும்." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -229,7 +232,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nThe intelligent input bus\nமுதன்மை பக்கம்: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"The intelligent input bus\n" ++"முதன்மை பக்கம்: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -268,7 +277,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME மாற்ற சாளரத்தைக் காண்பிக்க, பாப்-அப் தாமத மில்லிசெகன்டை அமைக்கவும். முன்னிருப்பு மதிப்பு400 ஆகும். 0 = உடனடியாக சாளரத்தைக் காண்பிக்க. 0 < தாமத மில்லிசெகன்ட். 0 > சாளரத்தைக் காண்பிக்காமல் முந்தைய/அடுத்த எஞ்சின்களுக்கு மாற்ற." ++msgstr "" ++"IME மாற்ற சாளரத்தைக் காண்பிக்க, பாப்-அப் தாமத மில்லிசெகன்டை அமைக்கவும். முன்னிருப்பு " ++"மதிப்பு400 ஆகும். 0 = உடனடியாக சாளரத்தைக் காண்பிக்க. 0 < தாமத மில்லிசெகன்ட். 0 " ++"> சாளரத்தைக் காண்பிக்காமல் முந்தைய/அடுத்த எஞ்சின்களுக்கு மாற்ற." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -278,7 +290,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "சேமிக்கப்பட்ட பதிப்பு எண்ணானது முன்னர் நிறுவப்பட்ட ibus மற்றும் தற்போதுள்ள ibus இல் ஒன்று ஆகியவற்றுக்கு இடையே உள்ள வேறுபாட்டைக் கண்டறியப் பயன்படும்." ++msgstr "" ++"சேமிக்கப்பட்ட பதிப்பு எண்ணானது முன்னர் நிறுவப்பட்ட ibus மற்றும் தற்போதுள்ள ibus இல் ஒன்று " ++"ஆகியவற்றுக்கு இடையே உள்ள வேறுபாட்டைக் கண்டறியப் பயன்படும்." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -328,7 +342,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "மொழி பலகத்தின் பண்புகள். 0 = மெனுவில் உட்பொதியப்பட்டது, 1 = தானாக மறை, 2 = எப்போதும் காட்டு" ++msgstr "" ++"மொழி பலகத்தின் பண்புகள். 0 = மெனுவில் உட்பொதியப்பட்டது, 1 = தானாக மறை, 2 = எப்போதும் " ++"காட்டு" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -338,7 +354,9 @@ + 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 = கீழ் இடது ஓரம், 3 = கீழ் வலது ஓரம், 4 = தனிபயன்" ++msgstr "" ++"மொழி பேனலின் இடம். 0 = மேல் இடது ஓரம், 1 = மேல் வலது ஓரம், 2 = கீழ் இடது ஓரம், 3 = கீழ் " ++"வலது ஓரம், 4 = தனிபயன்" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -400,7 +418,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "பதிப்புரிமை (c) 2007-2010 Peng Huang\nபதிப்புரிமை (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"பதிப்புரிமை (c) 2007-2010 Peng Huang\n" ++"பதிப்புரிமை (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -453,7 +473,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "ஒரு விசையை அழுத்தவும் (அல்லது விசை கலவையை).\nவிசையை விடுத்தால் உரையாடல் மூடப்படும்." ++msgstr "" ++"ஒரு விசையை அழுத்தவும் (அல்லது விசை கலவையை).\n" ++"விசையை விடுத்தால் உரையாடல் மூடப்படும்." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -469,11 +491,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus தொடங்கப்பட்டது! உங்களால் IBus ஐப் பயன்படுத்த முடியாவிட்டால், உங்கள் $HOME/.bashrc; " ++"இல் பின்வரும் வரிகளைச் சேர்த்து உங்கள் டெஸ்க்டாப்பில் மீண்டும் புகுபதிவு செய்யவும்.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus தொடங்கப்பட்டது! உங்களால் IBus ஐப் பயன்படுத்த முடியாவிட்டால், உங்கள் $HOME/.bashrc; இல் பின்வரும் வரிகளைச் சேர்த்து உங்கள் டெஸ்க்டாப்பில் மீண்டும் புகுபதிவு செய்யவும்.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -585,7 +613,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "பயன்பாடு: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"பயன்பாடு: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -620,3 +650,238 @@ + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "மறுதுவக்கம்" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "செயலில் உள்ள உள்ளீட்டு முறைகளை தனிப்பயனாக்கு (_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "செயலில் உள்ள உள்ளீட்டு முறைகளை தனிப்பயனாக்கு" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "ப்ரிலோட் எஞ்சின் பயன்முறை" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"ப்ரிலோடு எஞ்சின்கள் இந்த பயன்முறையில் ஏற்றப்படுகின்றன. 0 = பயனர் தனிப்பயனாக்கிய எஞ்சின்கள். " ++"1 = மொழி தொடர்பான எஞ்சின்கள்." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "விசை ப்ரிலோட் எஞ்சின்கள் துவக்கப்பட்டது (_e)" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap ஐப் பயன்படுத்து" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr ".xmodmap/.Xmodmap இருந்தால் xmodmap ஐ இயக்கு." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "ASCII இல்லாத இலத்தீன் லேயவுட்" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "us லேயவுட் latin லேயவுட்டுகளுடன் இணைக்கப்பட்டுள்ளது. மாற்றவகை தேவையில்லை." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "ibus-setup இல் காண்பிக்கப்படும் XKB லேயவுட் பட்டியல்" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"ibus-setup இல் XKB லேயவுட் பட்டியலானது காண்பிக்கப்படுகிறது. வடிவமைப்பு: \"layout\" " ++"or \"layout(variant)\"." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "மாடிஃபயர் விசைகள் இல்லாமல் குறுக்கு விசைகளை இயக்கு" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"மாடிஃபயர் விசைகள் இன்றி குறுக்கு விசைகளை இயக்கவும். பட்டியல் ibus-gjs ஆல் " ++"பயன்படுத்தப்படுகிறது." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup இல் உள்ள கணினி விசைப்பலகை லேயவுட் குழுக்களின் பட்டியல்" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"குழு பட்டியல் முன்னிருப்பாக கணினி விசைப்பலகை லேயவுட்டுகளை காண்பிக்காமல் இருக்க " ++"பயன்படுத்தப்படுகிறது. பட்டியல் உருப்படியானது gconf விசையின் இறுதியில் ஒட்டப்படும். எ." ++"கா. .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup இல் உள்ள ஐரோப்பிய மொழிகளின் பட்டியல்" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"நீங்கள் ibus-setup ஐ மொழிகளில் ஒன்றில் இயக்கும் போது உள்ளீட்டு முறை பட்டியலில் மட்டுமே " ++"ibus-setup மொழிகளைக் காண்பிக்கும். மற்ற மொழிகள் நீட்டிக்கப்பட்ட பொத்தானின் கீழ் " ++"மறைந்திருக்கும்." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup இல் உள்ள ஆசிய மொழிகளின் பட்டியல்" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "அனைத்து உள்ளீடு முறைகளையும் காண்பி" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "உங்கள் பகுதிக்குரிய உள்ளீட்டு முறைகளை மட்டும் காண்பிக்கவும்" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"உங்கள் சேமிக்கப்பட்ட உள்ளீட்டு முறைகளின் பட்டியல் உடனடியாக அழிக்கப்படும், மேலும் பட்டியலானது " ++"ஒவ்வொரு முறையும் புகுபதிவு மொழியால் அமைவாக்கம் செய்யப்படும். இது உங்களுக்கு சம்மதமா?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "விசைப்பலகை அமைப்பு: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"பட்டியலில் முன்னிருப்பு உள்ளீடு முறை மேலே இருக்கும்.\n" ++"மேல்/கீழ் பொத்தானை பயன்படுத்தி அதனை மாற்றவும்." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "ஒரு விசையை அழுத்தவும் (அல்லது ஒரு விசை கலவையை)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "பதிப்புரிமை (c) 2007-2012 Peng Huang\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "கணினி விசைப்பலகை அமைப்பை பயன்படுத்து" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "உள்ளீடு முறை ஃபிரேம்வொர்க்" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus உள்ளீடு முறை ஃபிரேம்வொர்க்கை துவக்கு" ++ ++#~ msgid "trigger" ++#~ msgstr "ட்ரிகர்" ++ ++#~ msgid "enable" ++#~ msgstr "செயல்படுத்து" ++ ++#~ msgid "disable" ++#~ msgstr "செயல்நீக்கு" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "கட்டளை [OPTIONS]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "xkb லேயவுட்டை %s க்கு மாற்றுதல் தோல்வி." +--- a/po/te.po ++++ b/po/te.po +@@ -187,7 +187,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "జాబితాలో పైన వున్నది అప్రమేయ ఇన్‌పుట్ విధానం అవుతుంది.\nదానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు." ++msgstr "" ++"జాబితాలో పైన వున్నది అప్రమేయ ఇన్‌పుట్ విధానం అవుతుంది.\n" ++"దానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు." + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -226,7 +228,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nతెలివైన ఇన్‌పుట్ బస్\nనివాసపుట: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"తెలివైన ఇన్‌పుట్ బస్\n" ++"నివాసపుట: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -265,7 +273,10 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "IME స్విజర్ విండోను చూపుటకు పాపప్ ఆలస్యాన్ని మిల్లీసెకన్లలో అమర్చు. అప్రమేయం 400. 0 = విండోను తక్షణమే చూపును. 0 < ఆలస్యం మిల్లీసెకన్లలో. 0 > విండోను చూపదు మరియు క్రితం/తరువాతి యింజన్లకు మారును." ++msgstr "" ++"IME స్విజర్ విండోను చూపుటకు పాపప్ ఆలస్యాన్ని మిల్లీసెకన్లలో అమర్చు. అప్రమేయం 400. 0 = విండోను " ++"తక్షణమే చూపును. 0 < ఆలస్యం మిల్లీసెకన్లలో. 0 > విండోను చూపదు మరియు క్రితం/తరువాతి " ++"యింజన్లకు మారును." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -275,7 +286,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "దాచిన వర్షన్ సంఖ్య అనునది గతంలో సంస్థాపించిన ibus వర్షనుకు మరియు ప్రస్తుత ibus వర్షనుకు మధ్యని తేడాను పరిశీలించుటకు వుపయోగించును." ++msgstr "" ++"దాచిన వర్షన్ సంఖ్య అనునది గతంలో సంస్థాపించిన ibus వర్షనుకు మరియు ప్రస్తుత ibus వర్షనుకు మధ్యని " ++"తేడాను పరిశీలించుటకు వుపయోగించును." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -325,7 +338,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "భాషా ప్యానల్ యొక్క ప్రవర్తన. 0 = మెనూనందు యెంబెడ్‌చేయి, 1 = స్వయంచాలకంగా మరుగునవుంచు, 2 = ఎల్లప్పుడూ చూపించు" ++msgstr "" ++"భాషా ప్యానల్ యొక్క ప్రవర్తన. 0 = మెనూనందు యెంబెడ్‌చేయి, 1 = స్వయంచాలకంగా మరుగునవుంచు, 2 = " ++"ఎల్లప్పుడూ చూపించు" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -335,7 +350,9 @@ + 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 = క్రింది ఎడమ మూల, 3 = క్రింది కుడి మూల, 4 = మలచుకొనిన" ++msgstr "" ++"భాషా ప్యానల్ యొక్క స్థానము. 0 = పై ఎడమ మూల, 1 = పై కుడి మూల, 2 = క్రింది ఎడమ మూల, 3 = క్రింది " ++"కుడి మూల, 4 = మలచుకొనిన" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -397,7 +414,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "నకలుహక్కు (c) 2007-2010 Peng Huang\nనకలుహక్కు (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"నకలుహక్కు (c) 2007-2010 Peng Huang\n" ++"నకలుహక్కు (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -450,7 +469,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "దయచేసి వొక కీను వత్తండి (లేదా కీ మిశ్రమాన్ని).\nకీ వదిలినప్పుడు డైలాగు మూయబడుతుంది." ++msgstr "" ++"దయచేసి వొక కీను వత్తండి (లేదా కీ మిశ్రమాన్ని).\n" ++"కీ వదిలినప్పుడు డైలాగు మూయబడుతుంది." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -466,11 +487,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus ప్రారంభమైంది! మీరు IBus వుపయోగించలేకుంటే, మీ $HOME/.bashrc కు కింది పంక్తులను " ++"జతచేయండి; అప్పుడు తిరిగి డెస్కుటాప్‌కు ప్రవేశించండి.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus ప్రారంభమైంది! మీరు IBus వుపయోగించలేకుంటే, మీ $HOME/.bashrc కు కింది పంక్తులను జతచేయండి; అప్పుడు తిరిగి డెస్కుటాప్‌కు ప్రవేశించండి.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -582,7 +609,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "వాడుక: %s COMMAND [OPTION...]\n\n" ++msgstr "" ++"వాడుక: %s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -612,8 +641,240 @@ + + #: ../ui/gtk3/panel.vala:666 + msgid "translator-credits" +-msgstr "కృష్ణబాబు కె 2009.\nప్రవీణ్ యిళ్ళ 2010-11." ++msgstr "" ++"కృష్ణబాబు కె 2009.\n" ++"ప్రవీణ్ యిళ్ళ 2010-11." + + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "పునఃప్రారంభించు" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "క్రియాశీల ఇన్పుట్ పద్దతులు మలచుకొనుము (_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "క్రియాశీల ఇన్పుట్ పద్దతులు మలచుకొనుము" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "ముందుగాలోడగు ఇంజన్ రీతి" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"ముందుగా లోడైన యంత్రములు ఈ రీతితో లోడైనవి. 0 = వాడుకరి ఇష్టానుసారం మలచిన యంత్రములు. 1 = భాషా " ++"సంభందిత యంత్రములు." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "preload_engines కీ సిద్దంచేయబడెను" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "xmodmap వుపయోగించు" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr ".xmodmap/.Xmodmap వుంటే xmodmap నడుపు." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "ASCII లేని లాటిన్ లేఅవుట్" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "us లేఅవుట్ లాటిన్ లేఅవుట్లకు చేర్చబడెను. వేరియంట్ అవసరం లేదు." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "ibus-setup పైన చూపు XKB లేఅవుట్ జాబితా" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"ibus-setup పైన చూపు XKB లేఅవుట్ జాబితా)\". \"layout\" లేదా \"layout(variant)\" ఫార్మాట్." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "సవరణి కీలు లేకుండా షార్టుకట్ కీలు ట్రిగ్గర్ చేయి" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "సవరణి కీలు లేకుండా ట్రిగ్గర్ షార్ట్ కట్ కీలు. జాబితా ibus-gjs చేత వుపయోగించబడెను." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup పైన వ్యవస్థ కీబోర్డు లేఅవుట్ సమూహాల జాబితా" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"అప్రమేయంగా సిస్టమ్ కీబోర్డు లేఅవుట్లు అన్నీ చూపకుండా వుండుటకు సమూహ జాబితా వుపయోగించబడెను. జాబితా " ++"అంశం అనునది gconf కీ చివరన చేర్చబడును. ఉ.దా. .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup పైన యూరోపియన్ భాషల జాబితా" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"మీరు ఏదేని వొక భాషపై ibus-setup నడిపినప్పుడు మాత్రమే ibus-setup భాషలను ఇన్పుట్ మెథడ్ జాబితా నందు " ++"చూపును. ఇతర భాషలు విస్తరింపు బటన్ కిందిన దాగివుండును." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup పైన ఏషియన్ భాషల జాబితా" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "అన్ని ఇన్<200c>పుట్ పద్ధతులు చూపుము" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "మీ ప్రాంతము కొరకు మాత్రమే ఇన్పుట్ పద్దతులు చూపుము" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"ప్రతిసారి లాగిన్ అయినప్పుడు మీరు దాచిన ఇన్పుట్ పద్దతుల జాబితా తుడిచివేయబడి లాగిన్ భాష చేత " ++"ఆకృతీకరించబడును. మీరు దీనికి వొప్పుకుంటారా?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "%s కొరకు కీబోర్డు లఘువును ఎంచుకోండి" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "కీబోర్డు నమూనా: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"జాబితాలో పైన వున్నది అప్రమేయ ఇన్‌పుట్ విధానం అవుతుంది.\n" ++"దానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "దయచేసి కీను వత్తండి (లేదా కీ మిశ్రమాన్ని)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "కాపీరైట్ (c) 2007-2012 Peng Huang\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "వ్యవస్థ కీబోర్డు నమూనా ఉపయోగించు" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "ఇన్‌పుట్ పద్ధతి ఫ్రేమ్‌వర్క్" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "IBus ఇన్‌పుట్ పద్ధతి ఫ్రేమ్‌వర్కును ప్రారంభించు" ++ ++#~ msgid "trigger" ++#~ msgstr "ట్రిగ్గర్" ++ ++#~ msgid "enable" ++#~ msgstr "చేతనపరుచు" ++ ++#~ msgid "disable" ++#~ msgstr "అచేతనపరుచు" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "ఆదేశం [ఐచ్చికాలు]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "xkb లేఅవుట్ %s కు మార్చుట విఫలమైంది." +--- a/po/tg.po ++++ b/po/tg.po +@@ -490,6 +490,211 @@ + msgid "Restart" + msgstr "Бозоғозӣ" + ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#. Translators: %d == 5 currently ++#: ../setup/main.py:413 ++#, python-format ++msgid "IBus daemon could not be started in %d seconds" ++msgstr "" ++ ++#: ../setup/main.py:426 ++msgid "switching input methods" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++msgid "Select keyboard layouts" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Миёнбурҳои клавиатура" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ + #~ msgid "Previous page" + #~ msgstr "Саҳифаи пешина" + +--- a/po/uk.po ++++ b/po/uk.po +@@ -18,7 +18,8 @@ + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Language: uk\n" +-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" ++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + + #: ../setup/setup.ui.h:1 + msgid "Horizontal" +@@ -66,7 +67,8 @@ + + #: ../setup/setup.ui.h:12 + msgid "The shortcut keys for switching to next input method in the list" +-msgstr "Клавіатурні скорочення для перемикання на наступний спосіб введення у списку" ++msgstr "" ++"Клавіатурні скорочення для перемикання на наступний спосіб введення у списку" + + #: ../setup/setup.ui.h:13 + msgid "Next input method:" +@@ -74,7 +76,8 @@ + + #: ../setup/setup.ui.h:14 + msgid "The shortcut keys for switching to previous input method in the list" +-msgstr "Клавіатурне скорочення для перемикання на попередній спосіб введення у списку" ++msgstr "" ++"Клавіатурне скорочення для перемикання на попередній спосіб введення у списку" + + #: ../setup/setup.ui.h:15 + msgid "Previous input method:" +@@ -134,7 +137,8 @@ + + #: ../setup/setup.ui.h:29 + msgid "Show input method's name on language bar when check the checkbox" +-msgstr "Показати назву способу введення на мовній панелі, якщо позначено цей пункт" ++msgstr "" ++"Показати назву способу введення на мовній панелі, якщо позначено цей пункт" + + #: ../setup/setup.ui.h:30 + msgid "Embed preedit text in application window" +@@ -158,19 +162,25 @@ + + #: ../setup/setup.ui.h:35 + msgid "Add the selected input method into the enabled input methods" +-msgstr "Додати позначений спосіб введення до списку увімкнених способів введення" ++msgstr "" ++"Додати позначений спосіб введення до списку увімкнених способів введення" + + #: ../setup/setup.ui.h:36 + msgid "Remove the selected input method from the enabled input methods" +-msgstr "Вилучити позначений спосіб введення зі списку увімкнених способів введення" ++msgstr "" ++"Вилучити позначений спосіб введення зі списку увімкнених способів введення" + + #: ../setup/setup.ui.h:37 + msgid "Move up the selected input method in the enabled input methods list" +-msgstr "Пересунути вгору позначений спосіб введення у списку увімкнених способів введення" ++msgstr "" ++"Пересунути вгору позначений спосіб введення у списку увімкнених способів " ++"введення" + + #: ../setup/setup.ui.h:38 + msgid "Move down the selected input method in the enabled input methods" +-msgstr "Пересунути нижче позначений спосіб введення у списку увімкнених способів введення" ++msgstr "" ++"Пересунути нижче позначений спосіб введення у списку увімкнених способів " ++"введення" + + #: ../setup/setup.ui.h:39 + msgid "Show information of the selected input method" +@@ -185,7 +195,10 @@ + "The active input method can be switched around from the selected " + "ones in the above list by pressing the keyboard shortcut keys or clicking " + "the panel icon." +-msgstr "Активний спосіб введення можна перемкнути у межах визначеного вище списку натисканням клавіатурного скорочення або піктограми на панелі." ++msgstr "" ++"Активний спосіб введення можна перемкнути у межах визначеного вище " ++"списку натисканням клавіатурного скорочення або піктограми на панелі." + + #. create im name & icon column + #: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66 +@@ -224,7 +237,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\nІнтелектуальний канал введення\nДомашня сторінка: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"Інтелектуальний канал введення\n" ++"Домашня сторінка: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:56 + msgid "Start ibus on login" +@@ -263,7 +282,11 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "Встановити затримку появи контекстного вікна перемикача способів введення у мілісекундах. Типовою є 400. 0 = показувати вікно негайно. 0 < — затримка у мілісекундах. 0 > — не показувати вікно і перемикатися на попередній або наступний рушій." ++msgstr "" ++"Встановити затримку появи контекстного вікна перемикача способів введення у " ++"мілісекундах. Типовою є 400. 0 = показувати вікно негайно. 0 < — затримка " ++"у мілісекундах. 0 > — не показувати вікно і перемикатися на попередній " ++"або наступний рушій." + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -273,7 +296,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "Збережений номер версії буде використано для визначення відмінностей між попередньою встановленою версією ibus та поточною версією ibus." ++msgstr "" ++"Збережений номер версії буде використано для визначення відмінностей між " ++"попередньою встановленою версією ibus та поточною версією ibus." + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -305,7 +330,8 @@ + + #: ../data/ibus.schemas.in.h:17 + msgid "The shortcut keys for switching to the next input method in the list" +-msgstr "Клавіатурні скорочення для перемикання на наступний спосіб введення у списку" ++msgstr "" ++"Клавіатурні скорочення для перемикання на наступний спосіб введення у списку" + + #: ../data/ibus.schemas.in.h:18 + msgid "Prev engine shortcut keys" +@@ -323,7 +349,9 @@ + msgid "" + "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = " + "Always show" +-msgstr "Поведінка мовної панелі. 0 = вбудувати до меню, 1 = автоматично ховати, 2 = завжди показувати" ++msgstr "" ++"Поведінка мовної панелі. 0 = вбудувати до меню, 1 = автоматично ховати, 2 = " ++"завжди показувати" + + #: ../data/ibus.schemas.in.h:22 + msgid "Language panel position" +@@ -333,7 +361,10 @@ + 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 = у нижньому лівому куті, 3 = у нижньому правому куті, 4 = нетипове" ++msgstr "" ++"Розташування мовної панелі. 0 = у верхньому лівому куті, 1 = у верхньому " ++"правому куті, 2 = у нижньому лівому куті, 3 = у нижньому правому куті, 4 = " ++"нетипове" + + #: ../data/ibus.schemas.in.h:24 + msgid "Orientation of lookup table" +@@ -395,7 +426,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "© Peng Huang, 2007–2010\n© Red Hat, Inc., 2007–2010" ++msgstr "" ++"© Peng Huang, 2007–2010\n" ++"© Red Hat, Inc., 2007–2010" + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -448,7 +481,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш).\nДіалогове вікно буде закрито після відпускання клавіші." ++msgstr "" ++"Будь ласка, натисніть клавішу (або комбінацію клавіш).\n" ++"Діалогове вікно буде закрито після відпускання клавіші." + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -456,7 +491,9 @@ + + #: ../setup/main.py:99 ../setup/main.py:392 + msgid "Use shortcut with shift to switch to the previous input method" +-msgstr "Використовувати комбінацію з Shift для перемикання на попередній спосіб введення" ++msgstr "" ++"Використовувати комбінацію з Shift для перемикання на попередній спосіб " ++"введення" + + #: ../setup/main.py:326 + msgid "The IBus daemon is not running. Do you wish to start it?" +@@ -464,11 +501,18 @@ + + #: ../setup/main.py:347 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus запущено! Якщо ви не можете скористатися IBus, додайте вказані нижче " ++"рядки до файла $HOME/.bashrc; потім вийдіть зі стільничного середовища і " ++"увійдіть до нього знову.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus запущено! Якщо ви не можете скористатися IBus, додайте вказані нижче рядки до файла $HOME/.bashrc; потім вийдіть зі стільничного середовища і увійдіть до нього знову.\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:361 +@@ -580,7 +624,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n\n" ++msgstr "" ++"Користування: %s КОМАНДА [ПАРАМЕТР...]\n" ++"\n" + + #: ../tools/main.vala:309 + #, c-format +@@ -615,3 +661,247 @@ + #: ../ui/gtk3/panel.vala:697 + msgid "Restart" + msgstr "Перезапустити" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "Налаштувати сп_особи активного введення" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "Налаштувати способи активного введення" ++ ++#: ../setup/setup.ui.h:43 ++msgid "" ++"The default input method is the top one in the list.\n" ++"You may use up/down buttons to change it." ++msgstr "" ++"Типовий спосіб введення — найвищий пункт у списку.\n" ++"Змінити порядок пунктів можна за допомогою кнопок «Вгору/Вниз»." ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "Режим попереднього завантаження рушія" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"У цьому режимі завантажуються рушії попереднього завантаження. 0 = вказані " ++"користувачем рушії. 1 = рушії, що відповідають вибраній мові." ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "Комбінація клавіш ініціалізації рушіїв поп_ереднього завантаження" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "Використовувати xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "Запустити xmodmap, якщо існує файл .xmodmap/.Xmodmap." ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "Розкладка латинки, у якій немає ASCII" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++"До розкладок латиниці додається розкладка американської англійської. Варіант " ++"вказувати не потрібно." ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "Список розкладок XKB, який буде показано у ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"Список розкладок XKB, який буде показано у ibus-setup. Записи слід вказувати " ++"у форматі «розкладка» або «розкладка(варіант)»." ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Клавіші перемикання без клавіш-модифікаторів" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++"Клавіші перемикання без клавіш-модифікаторів. Список використовується " ++"програмою ibus-gjs." ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Список груп розкладок клавіатури у ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"Список груп використовується для того, щоб типово не показувати всі " ++"розкладки клавіатури системи. Пункт списку буде додано наприкінці ключа " ++"gconf. Наприклад .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "Список європейських мов у ibus-setup" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup показує лише ті мови, які є у списку способів введення, якщо ibus-" ++"setup було вказано конкретну мову. Список інших мов можна розгорнути за " ++"допомогою відповідної кнопки." ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "Список азійських мов у ibus-setup" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "Надіслати запит щодо поточної розкладки xkb" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "Встановити вказану розкладку у xkb" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "РОЗКЛАДКА" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "Встановити вказану розкладку у xkb" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "ВАРІАНТ" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "Встановити вказаний параметр xkb" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "ПАРАМЕТР" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "Отримати поточний стан xkb" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "Показати список всіх способів введення" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "" ++"Показати лише способи введення, що використовуються у вказаному вами регіоні" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"Список збережених способів введення можна спорожняти так, щоб цей список " ++"створювався з нуля на основі визначеної під час входу до системи мови. " ++"Погоджуєтеся на таке спорожнення?" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "Типове" ++ ++#: ../setup/xkbsetup.py:207 ++msgid "Select keyboard layouts" ++msgstr "Вибір розкладок клавіатури" ++ ++#: ../setup/xkbsetup.py:212 ++msgid "Keyboard Layouts" ++msgstr "Розкладки клавіатури" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"Можна встановлювати значення порядку розкладки клавіатури системи, " ++"які є меншими або рівними %d.\n" ++"Для зміни порядку ви можете скористатися клавішами зі стрілками вгору (↑) і " ++"вниз (↓)." ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "Будь ласка, перезапустіть IBus, щоб налаштування було перезавантажено." ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "Цей параметр клавіатури вибрати не можна." ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "© Takao Fujiwara, 2012\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "Типова розкладка" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "Налаштовування" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "Налаштувати рушій XKB" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "Отримати дані щодо поточної розкладки xkb" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "Встановити розкладку xkb" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "Встановити модель xkb" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "Встановити параметр xkb" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "Оболонка способів введення" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "Запуск оболонки способів введення IBus" ++ ++#~ msgid "trigger" ++#~ msgstr "перемикач" ++ ++#~ msgid "enable" ++#~ msgstr "увімкнути" ++ ++#~ msgid "disable" ++#~ msgstr "вимкнути" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "команда [ПАРАМЕТРИ]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "Спроба перемикання розкладки xkb на розкладку %s зазнала невдачі." +--- a/po/vi.po ++++ b/po/vi.po +@@ -528,6 +528,228 @@ + msgid "Restart" + msgstr "Khởi động lại" + ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "Giới thiệu về kiểu gõ" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "Giới thiệu về kiểu gõ" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++#, fuzzy ++msgid "Preload engine mode" ++msgstr "Nạp trước các kiểu gõ" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++#, fuzzy ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "Phím tắt kích hoạt" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++#, fuzzy ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "Dùng kiểu bố trí bàn phím của hệ thống" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "Hiển thị tên kiểu gõ" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "Hiển thị tên kiểu gõ" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++#, fuzzy ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "Phím tắt dùng để chuyển về kiểu gõ trước trong danh sách" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#. Translators: %d == 5 currently ++#: ../setup/main.py:413 ++#, python-format ++msgid "IBus daemon could not be started in %d seconds" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "Chuyển kiểu gõ" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "Chọn phím tắt để %s" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "Bố trí bàn phím: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"Kiểu gõ mặc định là kiểu gõ đầu tiên trong danh sách.\n" ++"Bạn có thể dùng nút lên/xuống để thay đổi nó" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "Vui lòng nhấn một phím (hoặc tổ hợp phím)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"Copyright (c) 2007-2010 Peng Huang\n" ++"Copyright (c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "Dùng kiểu bố trí bàn phím của hệ thống" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ + #~ msgid "Previous page" + #~ msgstr "Trang trước" + +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -188,7 +188,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "列表中的第一个输入法是默认输入法。\n您可以使用上/下按钮更改。" ++msgstr "" ++"列表中的第一个输入法是默认输入法。\n" ++"您可以使用上/下按钮更改。" + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -227,7 +229,13 @@ + "\n" + "\n" + "\n" +-msgstr "IBus\n智能输入平台\n主页：http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"IBus\n" ++"智能输入平台\n" ++"主页：http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -266,7 +274,9 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "设定输入法切换窗口弹出的延时微秒数。默认为 400。0 代表立即显示窗口。 0 < 延迟微秒数 0 > 当切换上一个/下一个输入法引擎时不显示窗口。" ++msgstr "" ++"设定输入法切换窗口弹出的延时微秒数。默认为 400。0 代表立即显示窗口。 0 < " ++"延迟微秒数 0 > 当切换上一个/下一个输入法引擎时不显示窗口。" + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -398,7 +408,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "版权所有 (c) 2007-2010 黄鹏\n版权所有 (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"版权所有 (c) 2007-2010 黄鹏\n" ++"版权所有 (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -451,7 +463,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "请按一个键盘按键（或者一个组合按键）\n当您松开任意按键时，对话框会自动关闭。" ++msgstr "" ++"请按一个键盘按键（或者一个组合按键）\n" ++"当您松开任意按键时，对话框会自动关闭。" + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -467,11 +481,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" ++" export GTK_IM_MODULE=ibus\n" ++" export XMODIFIERS=@im=ibus\n" ++" export QT_IM_MODULE=ibus" ++msgstr "" ++"IBus 已经启动！如果您无法使用 IBus，添加以下行至 $HOME/.bashrc；然后请重新登" ++"录您的桌面。\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus 已经启动！如果您无法使用 IBus，添加以下行至 $HOME/.bashrc；然后请重新登录您的桌面。\n export GTK_IM_MODULE=ibus\n export XMODIFIERS=@im=ibus\n export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -583,7 +603,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "用法：%s 命令 [选项...]\n\n" ++msgstr "" ++"用法：%s 命令 [选项...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -613,8 +635,233 @@ + + #: ../ui/gtk3/panel.vala:666 + msgid "translator-credits" +-msgstr "黄鹏 \nFedora 简体中文组 " ++msgstr "" ++"黄鹏 \n" ++"Fedora 简体中文组 " + + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "重新启动" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "自定义活动输入法(M)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "自定义活动输入法" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "预加载引擎模式" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++"在该模式下将加载指定预加载引擎。 0 代表用户自定义引擎。1 代表语言相关引擎。" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "已初始化 preload_engines 键" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "使用 xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "如果 .xmodmap/.Xmodmap 存在则运行 xmodmap。" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "不包含 ASCII 的拉丁语系布局" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "US 布局已被添加至拉丁语系布局。不需要变体。" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "ibus-setup 中的 XKB 布局列表" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "ibus-setup 中的 XKB 布局列表。格式为“布局”或者“布局(变体)”。" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "触发快捷键而无需修饰键" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "触发快捷键而无需修饰键。该列表由 ibus-gjs 使用。" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup 中的系统键盘布局组列表" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"默认情况下组列表将不显示所有系统键盘布局。列表中的项目将被添加到 gconf 键的末" ++"尾。例如 .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup 中的欧洲语言列表" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"ibus-setup 仅显示您运行 ibus-setup 时所用语言的输入法列表。其他语言被隐藏在扩" ++"展按钮下。" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup 中的亚洲语言列表" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "查询当前 XKB 布局" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "设定 XKB 布局" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "布局" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "设定 XKB 变体" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "变体" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "设定 XKB 选项" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "选项" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "获取当前 XKB 状态" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "显示所有输入法" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "只显示您所在区域的输入法" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"您保存的输入法列表将被立即清空，该列表配置将由每次登录时的语言来决定。您同意" ++"这样做吗？" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "默认" ++ ++#: ../setup/xkbsetup.py:207 ++msgid "Select keyboard layouts" ++msgstr "选择键盘布局" ++ ++#: ../setup/xkbsetup.py:212 ++msgid "Keyboard Layouts" ++msgstr "键盘布局" ++ ++#: ../setup/xkbsetup.py:241 ++#, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"系统键盘布局不能设为小于或等于 %d。\n" ++"您可能需要使用向上/向下按钮来改变顺序。" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++msgid "Please restart IBus to reload your configuration." ++msgstr "请重启 IBus 来载入您的配置。" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "无法选择键盘选项。" ++ ++#: ../ui/gtk3/panel.vala:849 ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "版权所有 (c) 2012 Takao Fujiwara\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "默认布局" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "设置" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "配置 XKB 引擎" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "获取当前 XKB 布局" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++msgid "Set xkb layout" ++msgstr "设定 XKB 布局" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "设定 XKB 型号" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "设定 XKB 选项" ++ ++#~ msgid "IBus" ++#~ msgstr "IBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "输入法框架" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "启动 IBus 输入法框架" ++ ++#~ msgid "trigger" ++#~ msgstr "开关" ++ ++#~ msgid "enable" ++#~ msgstr "应用" ++ ++#~ msgid "disable" ++#~ msgstr "禁用" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "命令 [选项]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "切换 xkb 布局至 %s 失败。" +--- a/po/zh_HK.po ++++ b/po/zh_HK.po +@@ -529,6 +529,228 @@ + msgid "Restart" + msgstr "重新啟動" + ++#: ../setup/setup.ui.h:35 ++#, fuzzy ++msgid "Customize active input _methods" ++msgstr "關於輸入法" ++ ++#: ../setup/setup.ui.h:36 ++#, fuzzy ++msgid "Customize active input methods" ++msgstr "關於輸入法" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++#, fuzzy ++msgid "Preload engine mode" ++msgstr "預先載入引擎" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++#, fuzzy ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "觸發用快捷鍵" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++#, fuzzy ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "使用系統鍵盤配置" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++#, fuzzy ++msgid "Show all input methods" ++msgstr "顯示輸入法名稱" ++ ++#: ../setup/enginecombobox.py:230 ++#, fuzzy ++msgid "Show only input methods for your region" ++msgstr "顯示輸入法名稱" ++ ++#: ../setup/main.py:101 ../setup/main.py:444 ++#, fuzzy ++msgid "Use shortcut with shift to switch to the previous input method" ++msgstr "用來切換到清單內上一個輸入法的快捷鍵" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++ ++#. Translators: %d == 5 currently ++#: ../setup/main.py:413 ++#, python-format ++msgid "IBus daemon could not be started in %d seconds" ++msgstr "" ++ ++#: ../setup/main.py:426 ++#, fuzzy ++msgid "switching input methods" ++msgstr "切換輸入法" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "為 %s 選取鍵盤快捷鍵" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "鍵盤配置: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"清單內最頂端的輸入法為預設輸入法。\n" ++"您可以使用 向上/向下 按鈕進行變更。" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "請按一個鍵盤按鍵 (或是按鍵組合)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "" ++"版權所有 (c) 2007-2010 黃鵬\n" ++"版權所有 (c) 2007-2010 Red Hat, Inc." ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "使用系統鍵盤配置" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ + #~ msgid "Previous page" + #~ msgstr "上一頁" + +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -2,7 +2,7 @@ + # Traditional Chinese translation of ibus. + # Copyright (C) 2008-2013 Peng Huang + # This file is distributed under the same license as the ibus package. +-# ++# + # Translators: + # Cheng-Chia Tseng , 2011-2012 + # Ding-Yi Chen 陳定彞 , 2009 +@@ -185,7 +185,9 @@ + msgid "" + "The default input method is the top one in the list.\n" + "You may use up/down buttons to change it." +-msgstr "清單內最頂端的輸入法為預設輸入法。\n您可以以 向上/向下 按鈕進行變更。" ++msgstr "" ++"清單內最頂端的輸入法為預設輸入法。\n" ++"您可以以 向上/向下 按鈕進行變更。" + + #. create im name & icon column + #: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66 +@@ -224,7 +226,13 @@ + "\n" + "\n" + "\n" +-msgstr "iBus\n智慧型輸入框架\n首頁: http://code.google.com/p/ibus\n\n\n\n" ++msgstr "" ++"iBus\n" ++"智慧型輸入框架\n" ++"首頁: http://code.google.com/p/ibus\n" ++"\n" ++"\n" ++"\n" + + #: ../setup/setup.ui.h:57 + msgid "Start ibus on login" +@@ -263,7 +271,9 @@ + "Set popup delay milliseconds to show IME switcher window. The default is " + "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do " + "not show the window and switch prev/next engines." +-msgstr "設定 IME 切換器視窗的彈出顯示毫秒數。預設為 400。0 = 立即顯示視窗。0 < 延遲毫秒。0 > 不要顯示視窗直接往前/往後切換引擎。" ++msgstr "" ++"設定 IME 切換器視窗的彈出顯示毫秒數。預設為 400。0 = 立即顯示視窗。0 < 延" ++"遲毫秒。0 > 不要顯示視窗直接往前/往後切換引擎。" + + #: ../data/ibus.schemas.in.h:7 + msgid "Saved version number" +@@ -273,7 +283,9 @@ + msgid "" + "The saved version number will be used to check the difference between the " + "version of the previous installed ibus and one of the current ibus." +-msgstr "儲存的版本號碼可以用來查看前次安裝的 ibus 版本與目前安裝的 ibus 版本之間的差異。" ++msgstr "" ++"儲存的版本號碼可以用來查看前次安裝的 ibus 版本與目前安裝的 ibus 版本之間的差" ++"異。" + + #: ../data/ibus.schemas.in.h:9 + msgid "Trigger shortcut keys" +@@ -395,7 +407,9 @@ + msgid "" + "Copyright (c) 2007-2010 Peng Huang\n" + "Copyright (c) 2007-2010 Red Hat, Inc." +-msgstr "版權所有 (c) 2007-2010 黃鵬\n版權所有 (c) 2007-2010 Red Hat, Inc." ++msgstr "" ++"版權所有 (c) 2007-2010 黃鵬\n" ++"版權所有 (c) 2007-2010 Red Hat, Inc." + + #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152 + msgid "Other" +@@ -448,7 +462,9 @@ + msgid "" + "Please press a key (or a key combination).\n" + "The dialog will be closed when the key is released." +-msgstr "請按鍵盤按鍵 (或是按鍵組合)\n當您放開按鍵時，對話框會自動關閉。" ++msgstr "" ++"請按鍵盤按鍵 (或是按鍵組合)\n" ++"當您放開按鍵時，對話框會自動關閉。" + + #: ../setup/keyboardshortcut.py:252 + msgid "Please press a key (or a key combination)" +@@ -464,11 +480,17 @@ + + #: ../setup/main.py:352 + msgid "" +-"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" ++"IBus has been started! If you cannot use IBus, add the following lines to " ++"your $HOME/.bashrc; then relog into your desktop.\n" + " export GTK_IM_MODULE=ibus\n" + " export XMODIFIERS=@im=ibus\n" + " export QT_IM_MODULE=ibus" +-msgstr "IBus 已經啟動！若您無法使用 IBus，請將下列文字加入您的 $HOME/.bashrc 中；接著重新登入桌面。\nexport GTK_IM_MODULE=ibus\nexport XMODIFIERS=@im=ibus\nexport QT_IM_MODULE=ibus" ++msgstr "" ++"IBus 已經啟動！若您無法使用 IBus，請將下列文字加入您的 $HOME/.bashrc 中；接著" ++"重新登入桌面。\n" ++"export GTK_IM_MODULE=ibus\n" ++"export XMODIFIERS=@im=ibus\n" ++"export QT_IM_MODULE=ibus" + + #. Translators: %d == 5 currently + #: ../setup/main.py:366 +@@ -580,7 +602,9 @@ + msgid "" + "Usage: %s COMMAND [OPTION...]\n" + "\n" +-msgstr "用法：%s COMMAND [OPTION...]\n\n" ++msgstr "" ++"用法：%s COMMAND [OPTION...]\n" ++"\n" + + #: ../tools/main.vala:308 + #, c-format +@@ -610,8 +634,239 @@ + + #: ../ui/gtk3/panel.vala:666 + msgid "translator-credits" +-msgstr "Ding-Yi Chen 陳定彞 , 2009.\nCheng-Chia Tseng , 2010." ++msgstr "" ++"Ding-Yi Chen 陳定彞 , 2009.\n" ++"Cheng-Chia Tseng , 2010." + + #: ../ui/gtk3/panel.vala:698 + msgid "Restart" + msgstr "重新啟動" ++ ++#: ../setup/setup.ui.h:35 ++msgid "Customize active input _methods" ++msgstr "自訂啟動的輸入法(_m)" ++ ++#: ../setup/setup.ui.h:36 ++msgid "Customize active input methods" ++msgstr "自訂啟動的輸入法" ++ ++#: ../data/ibus-xkb.schemas.in.h:1 ++msgid "Preload engine mode" ++msgstr "預先載入引擎模式" ++ ++#: ../data/ibus-xkb.schemas.in.h:2 ++msgid "" ++"Preload engines are loaded with this mode. 0 = user customized engines. 1 = " ++"language related engines." ++msgstr "預先載入引擎會以此模式載入。0 表示自訂引擎。1 表示與引擎相關的語言。" ++ ++#: ../data/ibus-xkb.schemas.in.h:3 ++msgid "The key preload_engines is initialized" ++msgstr "關鍵的預先載入引擎已經初始化" ++ ++#: ../data/ibus-xkb.schemas.in.h:4 ++msgid "Use xmodmap" ++msgstr "使用 xmodmap" ++ ++#: ../data/ibus-xkb.schemas.in.h:5 ++msgid "Run xmodmap if .xmodmap/.Xmodmap exists." ++msgstr "如果 .xmodmap/.Xmodmap 存在的話，執行 xmodmap。" ++ ++#: ../data/ibus-xkb.schemas.in.h:6 ++msgid "Latin layout which have no ASCII" ++msgstr "沒有 ASCII 的拉丁佈局" ++ ++#: ../data/ibus-xkb.schemas.in.h:7 ++msgid "us layout is appended to the latin layouts. variant is not needed." ++msgstr "us 佈局增加至拉丁佈局。不需要 variant。" ++ ++#: ../data/ibus-xkb.schemas.in.h:8 ++msgid "XKB layout list which is shown on ibus-setup" ++msgstr "ibus-setup 中顯示的 XKB 佈局" ++ ++#: ../data/ibus-xkb.schemas.in.h:9 ++msgid "" ++"XKB layout list which is shown on ibus-setup. The format is \"layout\" or " ++"\"layout(variant)\"." ++msgstr "" ++"ibus-setup 中顯示的 XKB 佈局清單。格式為「layout」（佈局）或" ++"「layout(variant)」。" ++ ++#: ../data/ibus-xkb.schemas.in.h:10 ++msgid "Trigger shortcut keys without modifier keys" ++msgstr "未修改的觸發用快捷鍵" ++ ++#: ../data/ibus-xkb.schemas.in.h:11 ++msgid "" ++"Trigger shortcut keys without modifier keys. The list is used by ibus-gjs." ++msgstr "未修改的觸發快捷鍵。ibus-gjs 會使用此清單。" ++ ++#: ../data/ibus-xkb.schemas.in.h:12 ++msgid "List of system keyboard layout groups on ibus-setup" ++msgstr "ibus-setup 上的系統鍵盤格式群組清單" ++ ++#: ../data/ibus-xkb.schemas.in.h:13 ++msgid "" ++"The group list is used not to show all the system keyboard layouts by " ++"default. The list item will be appended at the end of gconf key. e.g. .../" ++"xkblayoutconfig/item1" ++msgstr "" ++"此群組清單主要不是用來顯示所有預設的系統鍵盤格式。此清單項目將會被附加至 " ++"gconf key 之後，例如 .../xkblayoutconfig/item1" ++ ++#: ../data/ibus-xkb.schemas.in.h:14 ++msgid "List of European languages on ibus-setup" ++msgstr "ibus-setup 上的歐洲語言清單" ++ ++#: ../data/ibus-xkb.schemas.in.h:15 ++msgid "" ++"ibus-setup shows the languages only in input method list when you run ibus-" ++"setup on one of the languages. Other languages are hidden under an extended " ++"button." ++msgstr "" ++"當您在一種語言下執行 ibus-setup 時，ibus-setup 只會在輸入法清單中顯示該語言。" ++"其它語言都隱藏在一個延伸按鈕下。" ++ ++#: ../data/ibus-xkb.schemas.in.h:16 ++msgid "List of Asian languages on ibus-setup" ++msgstr "ibus-setup 的亞洲語言清單" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:47 ++msgid "Query the current xkb layout" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "Set xkb LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:48 ++msgid "LAYOUT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "Set xkb VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:49 ++msgid "VARIANT" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "Set xkb OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:50 ++msgid "OPTION" ++msgstr "" ++ ++#: ../engine/ibus-xkb/ibus-xkb-main.c:51 ../xkb/ibus-xkb-main.c:52 ++msgid "Get current xkb state" ++msgstr "" ++ ++#: ../setup/enginecombobox.py:228 ++msgid "Show all input methods" ++msgstr "顯示所有輸入法" ++ ++#: ../setup/enginecombobox.py:230 ++msgid "Show only input methods for your region" ++msgstr "僅顯示您的區域之輸入法" ++ ++#: ../setup/main.py:354 ++msgid "" ++"The list of your saved input methods will be cleared immediately and the " ++"list will be configured by the login language every time. Do you agree with " ++"this?" ++msgstr "" ++"已儲存輸入法的清單會馬上被清除，且清單會被配置為每次登入時所使用的語言。您同" ++"意嗎？" ++ ++#: ../setup/xkbsetup.py:44 ../setup/xkbsetup.py:112 ../setup/xkbsetup.py:408 ++msgid "Default" ++msgstr "" ++ ++#: ../setup/xkbsetup.py:207 ++#, fuzzy ++msgid "Select keyboard layouts" ++msgstr "為 %s 選取鍵盤快捷鍵" ++ ++#: ../setup/xkbsetup.py:212 ++#, fuzzy ++msgid "Keyboard Layouts" ++msgstr "鍵盤配置: %s\n" ++ ++#: ../setup/xkbsetup.py:241 ++#, fuzzy, python-format ++msgid "" ++"The system keyboard layouts can be set less than or equal to %d.\n" ++"You may use Up/Down buttons to change the order." ++msgstr "" ++"清單內最頂端的輸入法為預設輸入法。\n" ++"您可以以 向上/向下 按鈕進行變更。" ++ ++#: ../setup/xkbsetup.py:380 ../setup/xkbsetup.py:435 ++#, fuzzy ++msgid "Please restart IBus to reload your configuration." ++msgstr "請按鍵盤按鍵 (或是按鍵組合)" ++ ++#: ../setup/xkbsetup.py:425 ++msgid "The keyboard option cannot be chosen." ++msgstr "" ++ ++#: ../ui/gtk3/panel.vala:849 ++#, fuzzy ++msgid "Copyright (c) 2012 Takao Fujiwara\n" ++msgstr "著作權 (c) 2007-2012 黃鵬\n" ++ ++#: ../xkb/ibus-engine-xkb-main.c:201 ++msgid "Default Layout" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:179 ++msgid "Setup" ++msgstr "" ++ ++#: ../xkb/ibus-simple-engine.c:180 ++msgid "Configure XKB engine" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:47 ++msgid "Get current xkb layout" ++msgstr "" ++ ++#. Translators: the "layout" should not be translated due to a variable. ++#: ../xkb/ibus-xkb-main.c:49 ++#, fuzzy ++msgid "Set xkb layout" ++msgstr "使用系統鍵盤配置" ++ ++#: ../xkb/ibus-xkb-main.c:50 ++msgid "Set xkb model" ++msgstr "" ++ ++#: ../xkb/ibus-xkb-main.c:51 ++msgid "Set xkb option" ++msgstr "" ++ ++#~ msgid "IBus" ++#~ msgstr "iBus" ++ ++#~ msgid "Input Method Framework" ++#~ msgstr "輸入法框架" ++ ++#~ msgid "Start IBus Input Method Framework" ++#~ msgstr "啟動 iBus 輸入法框架" ++ ++#~ msgid "trigger" ++#~ msgstr "觸發" ++ ++#~ msgid "enable" ++#~ msgstr "啟用" ++ ++#~ msgid "disable" ++#~ msgstr "停用" ++ ++#~ msgid "command [OPTIONS]" ++#~ msgstr "command [OPTIONS]" ++ ++#~ msgid "Switch xkb layout to %s failed." ++#~ msgstr "無法將 xkb 鍵盤配置切換為 %s。" diff -Nru ibus-1.5.4/debian/patches/ibus-530711-preload-sys.patch ibus-1.5.5/debian/patches/ibus-530711-preload-sys.patch --- ibus-1.5.4/debian/patches/ibus-530711-preload-sys.patch 2013-10-20 00:18:34.000000000 +0900 +++ ibus-1.5.5/debian/patches/ibus-530711-preload-sys.patch 2014-01-14 17:02:13.000000000 +0900 @@ -1,6 +1,6 @@ -From d566bc83a4672b88a38fa5de25741b99ebaeae62 Mon Sep 17 00:00:00 2001 +From a6d4b9ac9a22c5b88c362b659eaf6fd59a0cf5bd Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Fri, 20 Sep 2013 17:20:09 +0900 +Date: Tue, 14 Jan 2014 15:30:24 +0900 Subject: [PATCH] Reload preload engines until users customize the list. The idea is, if users don't customize the preload_engines with ibus-setup, @@ -24,6 +24,8 @@ ui/gtk3/panel.vala | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 210 insertions(+), 9 deletions(-) +diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in +index 8fd7e15..28d2219 100644 --- a/data/ibus.schemas.in +++ b/data/ibus.schemas.in @@ -2,6 +2,30 @@ @@ -57,9 +59,11 @@ /schemas/desktop/ibus/general/preload_engines /desktop/ibus/general/preload_engines ibus +diff --git a/setup/main.py b/setup/main.py +index d3f4414..235ef9c 100644 --- a/setup/main.py +++ b/setup/main.py -@@ -187,16 +187,30 @@ +@@ -187,16 +187,30 @@ class Setup(object): 'active', Gio.SettingsBindFlags.DEFAULT) @@ -94,7 +98,7 @@ self.__treeview = self.__builder.get_object("treeview_engines") self.__treeview.set_engines(engines) -@@ -246,8 +260,8 @@ +@@ -246,8 +260,8 @@ class Setup(object): def __combobox_notify_active_engine_cb(self, combobox, property): engine = self.__combobox.get_active_engine() button = self.__builder.get_object("button_engine_add") @@ -105,7 +109,7 @@ def __get_engine_setup_exec_args(self, engine): args = [] -@@ -267,6 +281,13 @@ +@@ -267,6 +281,13 @@ class Setup(object): args.append(path.basename(setup_path)) return args @@ -119,7 +123,7 @@ def __treeview_notify_cb(self, treeview, prop): if prop.name not in ("active-engine", "engines"): return -@@ -318,6 +339,43 @@ +@@ -318,6 +339,43 @@ class Setup(object): del self.__engine_setup_exec_list[name] self.__engine_setup_exec_list[name] = os.spawnl(os.P_NOWAIT, *args) @@ -163,6 +167,8 @@ def __init_bus(self): self.__bus = IBus.Bus() if self.__bus.is_connected(): +diff --git a/setup/setup.ui b/setup/setup.ui +index 65dcee4..a6a001b 100644 --- a/setup/setup.ui +++ b/setup/setup.ui @@ -669,7 +669,23 @@ @@ -208,9 +214,11 @@ +diff --git a/src/ibustypes.h b/src/ibustypes.h +index 86fc2cc..cb9eb22 100644 --- a/src/ibustypes.h +++ b/src/ibustypes.h -@@ -204,6 +204,16 @@ +@@ -206,6 +206,16 @@ typedef enum { } IBusError; /** @@ -227,9 +235,11 @@ * IBusRectangle: * @x: x coordinate. * @y: y coordinate. +diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala +index 1da7966..fc60fd4 100644 --- a/ui/gtk3/panel.vala +++ b/ui/gtk3/panel.vala -@@ -130,6 +130,10 @@ +@@ -136,6 +136,10 @@ class Panel : IBus.PanelService { null); }); @@ -240,7 +250,7 @@ m_settings_general.changed["switcher-delay-time"].connect((key) => { set_switcher_delay_time(); }); -@@ -493,7 +497,96 @@ +@@ -524,7 +528,96 @@ class Panel : IBus.PanelService { init_gkbd(); } @@ -319,8 +329,8 @@ + preload_engines += name; + } + -+ if ("".joinv(",", orig_preload_engines) != -+ "".joinv(",", preload_engines)) ++ if (string.joinv(",", orig_preload_engines) != ++ string.joinv(",", preload_engines)) + m_settings_general.set_strv("preload-engines", preload_engines); + + return true; @@ -337,3 +347,6 @@ } private void update_xkb_engines() { +-- +1.8.0 + diff -Nru ibus-1.5.4/debian/patches/ibus-541492-xkb.patch ibus-1.5.5/debian/patches/ibus-541492-xkb.patch --- ibus-1.5.4/debian/patches/ibus-541492-xkb.patch 2013-10-20 00:18:34.000000000 +0900 +++ ibus-1.5.5/debian/patches/ibus-541492-xkb.patch 2014-01-14 17:02:13.000000000 +0900 @@ -1,6 +1,6 @@ -From 5c8ce9720f607512c2734f08d3e7141d8f5b9e99 Mon Sep 17 00:00:00 2001 +From 8085ca38cb9c2ea370ebe64d80a4d7894a485960 Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Fri, 20 Sep 2013 17:16:56 +0900 +Date: Tue, 14 Jan 2014 15:27:50 +0900 Subject: [PATCH] Add libgnomekbd and load preload engines. --- @@ -8,6 +8,7 @@ bindings/vala/Makefile.am | 19 +- bindings/vala/Xkl-1.0.metadata | 3 + bindings/vala/gkbd.deps | 3 + + bus/ibusimpl.c | 12 +- configure.ac | 40 ++++ data/ibus.schemas.in | 59 +++++ ibus-1.0.pc.in | 1 + @@ -21,7 +22,7 @@ ui/gtk3/gkbdlayout.vala.true | 108 ++++++++++ ui/gtk3/panel.vala | 196 ++++++++++++++++- ui/gtk3/xkblayout.vala | 429 ++++++++++++++++++++++++++++++++++++ - 17 files changed, 1623 insertions(+), 4 deletions(-) + 18 files changed, 1634 insertions(+), 5 deletions(-) create mode 100644 bindings/vala/Gkbd-3.0.metadata create mode 100644 bindings/vala/Xkl-1.0.metadata create mode 100644 bindings/vala/gkbd.deps @@ -31,13 +32,18 @@ create mode 100644 ui/gtk3/gkbdlayout.vala.true create mode 100644 ui/gtk3/xkblayout.vala +diff --git a/bindings/vala/Gkbd-3.0.metadata b/bindings/vala/Gkbd-3.0.metadata +new file mode 100644 +index 0000000..661e6fd --- /dev/null +++ b/bindings/vala/Gkbd-3.0.metadata @@ -0,0 +1 @@ +Configuration cheader_filename="libgnomekbd/gkbd-configuration.h" +diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am +index 29cc1eb..1d28501 100644 --- a/bindings/vala/Makefile.am +++ b/bindings/vala/Makefile.am -@@ -28,8 +28,6 @@ +@@ -28,8 +28,6 @@ vapi_deps = \ $(top_builddir)/src/IBus-1.0.gir \ $(NULL) @@ -46,7 +52,7 @@ VAPIGEN_VAPIS = ibus-1.0.vapi ibus_1_0_vapi_DEPS = gio-2.0 -@@ -39,18 +37,33 @@ +@@ -39,19 +37,34 @@ ibus_1_0_vapi_FILES = \ $(srcdir)/IBus-1.0-custom.vala \ $(NULL) @@ -75,27 +81,59 @@ IBus-1.0.metadata \ IBus-1.0-custom.vala \ ibus-1.0.deps \ + ibus-private.vapi \ config.vapi \ xi.vapi \ + Xkl-1.0.metadata \ $(NULL) -include $(top_srcdir)/git.mk +diff --git a/bindings/vala/Xkl-1.0.metadata b/bindings/vala/Xkl-1.0.metadata +new file mode 100644 +index 0000000..4961d0c --- /dev/null +++ b/bindings/vala/Xkl-1.0.metadata @@ -0,0 +1,3 @@ +Xkl cheader_filename="libxklavier/xklavier.h" +Engine + .filter_events.evt ref type="X.Event" +diff --git a/bindings/vala/gkbd.deps b/bindings/vala/gkbd.deps +new file mode 100644 +index 0000000..172632c --- /dev/null +++ b/bindings/vala/gkbd.deps @@ -0,0 +1,3 @@ +gtk+-3.0 +glib-2.0 +gmodule-2.0 +diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c +index eec6da3..f84c034 100644 +--- a/bus/ibusimpl.c ++++ b/bus/ibusimpl.c +@@ -1135,7 +1135,17 @@ _ibus_get_engines_by_names (BusIBusImpl *ibus, + g_variant_builder_init (&builder, G_VARIANT_TYPE ("av")); + while (names[i] != NULL) { + IBusEngineDesc *desc = (IBusEngineDesc *) g_hash_table_lookup ( +- ibus->engine_table, names[i++]); ++ ibus->engine_table, names[i]); ++ ++ /* preload engines return user XKB so if the engine does not ++ * exist in simple.xml, fall back to 'us' layout. */ ++ if (desc == NULL && g_str_has_prefix (names[i], "xkb:")) { ++ desc = (IBusEngineDesc *) g_hash_table_lookup ( ++ ibus->engine_table, "xkb:us::eng"); ++ } ++ ++ i++; ++ + if (desc == NULL) + continue; + g_variant_builder_add ( +diff --git a/configure.ac b/configure.ac +index d71c415..779e29e 100644 --- a/configure.ac +++ b/configure.ac -@@ -261,6 +261,45 @@ +@@ -261,6 +261,45 @@ else enable_wayland="no (disabled, use --enable-wayland to enable)" fi @@ -141,7 +179,7 @@ # GObject introspection GOBJECT_INTROSPECTION_CHECK([0.6.8]) -@@ -619,6 +658,7 @@ +@@ -619,6 +658,7 @@ Build options: Panel icon "$IBUS_ICON_KEYBOARD" Enable surrounding-text $enable_surrounding_text Enable libnotify $enable_libnotify @@ -149,6 +187,8 @@ Run test cases $enable_tests ]) +diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in +index d256cbb..8fd7e15 100644 --- a/data/ibus.schemas.in +++ b/data/ibus.schemas.in @@ -56,6 +56,52 @@ @@ -224,9 +264,11 @@ /schemas/desktop/ibus/general/hotkey/enable_unconditional /desktop/ibus/general/hotkey/enable_unconditional ibus +diff --git a/ibus-1.0.pc.in b/ibus-1.0.pc.in +index 9f593ab..c93a0ed 100644 --- a/ibus-1.0.pc.in +++ b/ibus-1.0.pc.in -@@ -4,6 +4,7 @@ +@@ -4,6 +4,7 @@ libdir=@libdir@ includedir=@includedir@ datadir=@datadir@ pkgdatadir=@datadir@/ibus @@ -234,6 +276,8 @@ Name: IBus Description: IBus Library +diff --git a/ibus.spec.in b/ibus.spec.in +index 334f37e..2017af9 100644 --- a/ibus.spec.in +++ b/ibus.spec.in @@ -5,6 +5,7 @@ @@ -244,7 +288,7 @@ %define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999") %define gconf2_version 2.12.0 -@@ -40,6 +41,10 @@ +@@ -40,6 +41,10 @@ BuildRequires: dconf-devel BuildRequires: pygobject2-devel BuildRequires: intltool BuildRequires: iso-codes-devel @@ -255,7 +299,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-gtk2 = %{version}-%{release} -@@ -52,6 +57,9 @@ +@@ -52,6 +57,9 @@ Requires: dbus-python >= %{dbus_python_version} Requires: im-chooser >= %{im_chooser_version} Requires: notify-python Requires: librsvg2 @@ -265,7 +309,7 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -@@ -152,6 +160,10 @@ +@@ -152,6 +160,10 @@ OPTIONS="$OPTIONS --enable-python-library" OPTIONS="$OPTIONS --disable-python-library" %endif @@ -276,9 +320,11 @@ %configure $OPTIONS # make -C po update-gmo +diff --git a/src/Makefile.am b/src/Makefile.am +index 404e1d2..f00fab7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -201,6 +201,9 @@ +@@ -202,6 +202,9 @@ typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA) endif @@ -288,6 +334,8 @@ # gen enum types ibusenumtypes.h: $(ibus_headers) ibusenumtypes.h.template $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \ +diff --git a/src/ibus.h b/src/ibus.h +index d8e226e..f0a9456 100644 --- a/src/ibus.h +++ b/src/ibus.h @@ -47,6 +47,7 @@ @@ -298,6 +346,9 @@ #include #include #include +diff --git a/src/ibusxkbxml.c b/src/ibusxkbxml.c +new file mode 100644 +index 0000000..f815e5d --- /dev/null +++ b/src/ibusxkbxml.c @@ -0,0 +1,466 @@ @@ -767,6 +818,9 @@ + +#undef TABLE_LOOKUP_LIST_FUNC +#undef TABLE_LOOKUP_STRING_FUNC +diff --git a/src/ibusxkbxml.h b/src/ibusxkbxml.h +new file mode 100644 +index 0000000..5aa486d --- /dev/null +++ b/src/ibusxkbxml.h @@ -0,0 +1,187 @@ @@ -957,9 +1011,11 @@ + const gchar *variant); +G_END_DECLS +#endif +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am +index 6012cfa..3dfa0df 100644 --- a/ui/gtk3/Makefile.am +++ b/ui/gtk3/Makefile.am -@@ -44,6 +44,8 @@ +@@ -44,6 +44,8 @@ AM_CPPFLAGS = \ USE_SYMBOL_ICON = FALSE @@ -968,7 +1024,7 @@ AM_CFLAGS = \ @GLIB2_CFLAGS@ \ @GIO2_CFLAGS@ \ -@@ -54,6 +56,8 @@ +@@ -54,6 +56,8 @@ AM_CFLAGS = \ -DBINDIR=\"$(bindir)\" \ -DIBUS_DISABLE_DEPRECATED \ -DSWITCHER_USE_SYMBOL_ICON=$(USE_SYMBOL_ICON) \ @@ -977,7 +1033,7 @@ -Wno-unused-variable \ -Wno-unused-but-set-variable \ -Wno-unused-function \ -@@ -97,12 +101,40 @@ +@@ -97,12 +101,40 @@ AM_VALAFLAGS += \ $(NULL) endif @@ -1018,15 +1074,15 @@ handle.vala \ iconwidget.vala \ keybindingmanager.vala \ -@@ -111,6 +143,7 @@ - property.vala \ +@@ -112,6 +144,7 @@ ibus_ui_gtk3_SOURCES = \ + propertypanel.vala \ separator.vala \ switcher.vala \ + xkblayout.vala \ $(NULL) ibus_ui_gtk3_LDADD = \ -@@ -119,9 +152,12 @@ +@@ -120,9 +153,12 @@ ibus_ui_gtk3_LDADD = \ CLEANFILES = \ gtkpanel.xml \ @@ -1039,6 +1095,9 @@ gtkpanel.xml.in \ $(NULL) +diff --git a/ui/gtk3/gkbdlayout.vala.false b/ui/gtk3/gkbdlayout.vala.false +new file mode 100644 +index 0000000..506aff2 --- /dev/null +++ b/ui/gtk3/gkbdlayout.vala.false @@ -0,0 +1,63 @@ @@ -1105,6 +1164,9 @@ + } + */ +} +diff --git a/ui/gtk3/gkbdlayout.vala.true b/ui/gtk3/gkbdlayout.vala.true +new file mode 100644 +index 0000000..a6e0f8d --- /dev/null +++ b/ui/gtk3/gkbdlayout.vala.true @@ -0,0 +1,108 @@ @@ -1216,9 +1278,11 @@ + } + */ +} +diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala +index a7a0c40..1da7966 100644 --- a/ui/gtk3/panel.vala +++ b/ui/gtk3/panel.vala -@@ -57,6 +57,13 @@ +@@ -58,6 +58,13 @@ class Panel : IBus.PanelService { private Gtk.CssProvider m_css_provider; private int m_switcher_delay_time = 400; private bool m_use_system_keyboard_layout = false; @@ -1232,7 +1296,7 @@ private GLib.List m_keybindings = new GLib.List(); -@@ -102,6 +109,14 @@ +@@ -108,6 +115,14 @@ class Panel : IBus.PanelService { ~Panel() { unbind_switch_shortcut(); @@ -1247,7 +1311,7 @@ } private void init_settings() { -@@ -415,6 +430,7 @@ +@@ -444,6 +459,7 @@ class Panel : IBus.PanelService { } public void load_settings() { @@ -1255,7 +1319,7 @@ // Update m_use_system_keyboard_layout before update_engines() // is called. set_use_system_keyboard_layout(); -@@ -432,6 +448,184 @@ +@@ -463,6 +479,184 @@ class Panel : IBus.PanelService { set_version(); } @@ -1440,7 +1504,7 @@ private void exec_setxkbmap(IBus.EngineDesc engine) { string layout = engine.get_layout(); string variant = engine.get_layout_variant(); -@@ -497,7 +691,7 @@ +@@ -528,7 +722,7 @@ class Panel : IBus.PanelService { // set xkb layout if (!m_use_system_keyboard_layout) @@ -1449,6 +1513,9 @@ engine_contexts_insert(engine); } +diff --git a/ui/gtk3/xkblayout.vala b/ui/gtk3/xkblayout.vala +new file mode 100644 +index 0000000..b7dfb3e --- /dev/null +++ b/ui/gtk3/xkblayout.vala @@ -0,0 +1,429 @@ @@ -1881,3 +1948,6 @@ + } + */ +} +-- +1.8.0 + diff -Nru ibus-1.5.4/debian/patches/ibus-810211-no-switch-by-no-trigger.patch ibus-1.5.5/debian/patches/ibus-810211-no-switch-by-no-trigger.patch --- ibus-1.5.4/debian/patches/ibus-810211-no-switch-by-no-trigger.patch 2013-10-20 00:18:34.000000000 +0900 +++ ibus-1.5.5/debian/patches/ibus-810211-no-switch-by-no-trigger.patch 2014-01-14 17:02:13.000000000 +0900 @@ -7,9 +7,11 @@ ui/gtk3/switcher.vala | 6 ++++++ 1 file changed, 6 insertions(+) +diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala +index 4a02743..c606682 100644 --- a/ui/gtk3/switcher.vala +++ b/ui/gtk3/switcher.vala -@@ -140,6 +140,7 @@ +@@ -140,6 +140,7 @@ class Switcher : Gtk.Window { /* Let gtk recalculate the window size. */ resize(1, 1); @@ -17,7 +19,7 @@ m_selected_engine = index; m_label.set_text(m_buttons[index].longname); m_buttons[index].grab_focus(); -@@ -378,6 +379,11 @@ +@@ -378,6 +379,11 @@ class Switcher : Gtk.Window { break; default: debug("0x%04x", pe->keyval); @@ -29,3 +31,6 @@ break; } } while (false); +-- +1.8.0 + diff -Nru ibus-1.5.4/debian/patches/ibus-HEAD.patch ibus-1.5.5/debian/patches/ibus-HEAD.patch --- ibus-1.5.4/debian/patches/ibus-HEAD.patch 2013-10-20 00:18:34.000000000 +0900 +++ ibus-1.5.5/debian/patches/ibus-HEAD.patch 1970-01-01 09:00:00.000000000 +0900 @@ -1,166 +0,0 @@ -From a3f47e6509f19c6f11fca0328d63e973daec48ab Mon Sep 17 00:00:00 2001 -From: Julien Humbert -Date: Wed, 2 Oct 2013 10:45:32 +0900 -Subject: [PATCH] Add french layout variant oss to simple engine - -Review URL: https://codereview.appspot.com/14115044 -Patch from Julien Humbert . ---- - engine/simple.xml.in | 82 ++++++++++++++++++++++++++++++---------------------- - 1 file changed, 47 insertions(+), 35 deletions(-) - ---- a/engine/simple.xml.in -+++ b/engine/simple.xml.in -@@ -236,41 +236,53 @@ - ibus-keyboard - 99 - -- -- xkb:fr::fra -- fra -- GPL -- Peng Huang <shawn.p.huang@gmail.com> -- fr -- French -- French -+ -+ xkb:fr::fra -+ fra -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ fr -+ French -+ French - ibus-keyboard -- 99 -- -- -- xkb:fr:bepo:fra -- fra -- GPL -- Peng Huang <shawn.p.huang@gmail.com> -- fr -- bepo -- French (Bepo, ergonomic, Dvorak way) -- French (Bepo, ergonomic, Dvorak way) -+ 99 -+ -+ -+ xkb:fr:oss:fra -+ fra -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ fr -+ oss -+ French (alternative) -+ French (alternative) - ibus-keyboard -- 1 -- -- -- xkb:fr:dvorak:fra -- fra -- GPL -- Peng Huang <shawn.p.huang@gmail.com> -- fr -- dvorak -- French (Dvorak) -- French (Dvorak) -+ 99 -+ -+ -+ xkb:fr:bepo:fra -+ fra -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ fr -+ bepo -+ French (Bepo, ergonomic, Dvorak way) -+ French (Bepo, ergonomic, Dvorak way) - ibus-keyboard -- 99 -- -+ 99 -+ -+ -+ xkb:fr:dvorak:fra -+ fra -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ fr -+ dvorak -+ French (Dvorak) -+ French (Dvorak) -+ ibus-keyboard -+ 1 -+ - - xkb:de::ger - ger ---- a/ui/gtk3/panel.vala -+++ b/ui/gtk3/panel.vala -@@ -148,6 +148,10 @@ - m_settings_panel.changed["show-icon-on-systray"].connect((key) => { - set_show_icon_on_systray(); - }); -+ -+ m_settings_panel.changed["lookup-table-orientation"].connect((key) => { -+ set_lookup_table_orientation(); -+ }); - } - - private void keybinding_manager_bind(KeybindingManager keybinding_manager, -@@ -285,7 +289,7 @@ - m_switcher_delay_time = - m_settings_general.get_int("switcher-delay-time"); - -- if (m_switcher_delay_time >= 0) { -+ if (m_switcher != null && m_switcher_delay_time >= 0) { - m_switcher.set_popup_delay_time((uint) m_switcher_delay_time); - } - } -@@ -312,10 +316,22 @@ - } - - private void set_show_icon_on_systray() { -+ if (m_status_icon == null) -+ return; -+ - m_status_icon.set_visible( - m_settings_panel.get_boolean("show-icon-on-systray")); - } - -+ private void set_lookup_table_orientation() { -+ if (m_candidate_panel == null) -+ return; -+ -+ m_candidate_panel.set_vertical( -+ m_settings_panel.get_int("lookup-table-orientation") -+ == IBus.Orientation.VERTICAL); -+ } -+ - private int compare_versions(string version1, string version2) { - string[] version1_list = version1.split("."); - string[] version2_list = version2.split("."); -@@ -411,6 +427,7 @@ - set_embed_preedit_text(); - set_custom_font(); - set_show_icon_on_systray(); -+ set_lookup_table_orientation(); - - set_version(); - } ---- a/bus/engineproxy.c -+++ b/bus/engineproxy.c -@@ -1159,6 +1159,11 @@ - NULL, - NULL, - NULL); -+ -+ /* Need to update the cache by manual since there is a timing issue. */ -+ g_dbus_proxy_set_cached_property ((GDBusProxy *) engine, -+ "ContentType", -+ content_type); - } - - if (cached_content_type != NULL) diff -Nru ibus-1.5.4/debian/patches/ibus-xx-ctrl-space.patch ibus-1.5.5/debian/patches/ibus-xx-ctrl-space.patch --- ibus-1.5.4/debian/patches/ibus-xx-ctrl-space.patch 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.5.5/debian/patches/ibus-xx-ctrl-space.patch 2014-01-14 17:02:13.000000000 +0900 @@ -0,0 +1,33 @@ +diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in +index 007fc66..6c75562 100644 +--- a/data/ibus.schemas.in ++++ b/data/ibus.schemas.in +@@ -143,7 +143,7 @@ se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn + ibus + list + string +- [<Super>space] ++ [<Control>space] + + Trigger shortcut keys for gtk_accelerator_parse + The shortcut keys for turning input method on or off +diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala +index 54251e7..867dbd2 100644 +--- a/ui/gtk3/panel.vala ++++ b/ui/gtk3/panel.vala +@@ -354,6 +354,7 @@ class Panel : IBus.PanelService { + } + + private void update_version_1_5_3() { ++#if 0 + #if ENABLE_LIBNOTIFY + if (!Notify.is_initted()) { + Notify.init ("ibus"); +@@ -374,6 +375,7 @@ class Panel : IBus.PanelService { + #else + warning(_("Super+space is now the default hotkey.")); + #endif ++#endif + } + + private void set_version() { diff -Nru ibus-1.5.4/debian/patches/ibus-xx-f19-password-gtk3.patch ibus-1.5.5/debian/patches/ibus-xx-f19-password-gtk3.patch --- ibus-1.5.4/debian/patches/ibus-xx-f19-password-gtk3.patch 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.5.5/debian/patches/ibus-xx-f19-password-gtk3.patch 2014-01-26 11:04:54.000000000 +0900 @@ -0,0 +1,25 @@ +From: FC19 +Description: sed s/gtk2/gtk3/g ibus-xx-f19-password.patch +diff --git a/client/gtk3/ibusimcontext.c b/client/gtk3/ibusimcontext.c +index eef062c..d644d69 100644 +--- a/client/gtk3/ibusimcontext.c ++++ b/client/gtk3/ibusimcontext.c +@@ -845,6 +845,18 @@ ibus_im_context_focus_in (GtkIMContext *context) + return; + + /* don't set focus on password entry */ ++#if GTK_CHECK_VERSION (3, 6, 0) ++ { ++ GtkInputPurpose purpose; ++ ++ g_object_get (G_OBJECT (context), ++ "input-purpose", &purpose, ++ NULL); ++ ++ if (purpose == GTK_INPUT_PURPOSE_PASSWORD) ++ return; ++ } ++#endif + if (ibusimcontext->client_window != NULL) { + GtkWidget *widget; + diff -Nru ibus-1.5.4/debian/patches/ibus-xx-f19-password.patch ibus-1.5.5/debian/patches/ibus-xx-f19-password.patch --- ibus-1.5.4/debian/patches/ibus-xx-f19-password.patch 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.5.5/debian/patches/ibus-xx-f19-password.patch 2014-01-26 10:56:35.000000000 +0900 @@ -0,0 +1,23 @@ +diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c +index eef062c..d644d69 100644 +--- a/client/gtk2/ibusimcontext.c ++++ b/client/gtk2/ibusimcontext.c +@@ -845,6 +845,18 @@ ibus_im_context_focus_in (GtkIMContext *context) + return; + + /* don't set focus on password entry */ ++#if GTK_CHECK_VERSION (3, 6, 0) ++ { ++ GtkInputPurpose purpose; ++ ++ g_object_get (G_OBJECT (context), ++ "input-purpose", &purpose, ++ NULL); ++ ++ if (purpose == GTK_INPUT_PURPOSE_PASSWORD) ++ return; ++ } ++#endif + if (ibusimcontext->client_window != NULL) { + GtkWidget *widget; + diff -Nru ibus-1.5.4/debian/patches/ibus-xx-setup-frequent-lang.patch ibus-1.5.5/debian/patches/ibus-xx-setup-frequent-lang.patch --- ibus-1.5.4/debian/patches/ibus-xx-setup-frequent-lang.patch 2013-10-20 00:18:34.000000000 +0900 +++ ibus-1.5.5/debian/patches/ibus-xx-setup-frequent-lang.patch 2014-01-14 17:02:13.000000000 +0900 @@ -1,6 +1,6 @@ -From 0e3608c614c2dee3c504a21cf5054ff621633585 Mon Sep 17 00:00:00 2001 +From 6c5b4f197afde5185c23ed725eecb36da43507e6 Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Fri, 20 Sep 2013 17:20:23 +0900 +Date: Tue, 14 Jan 2014 15:30:54 +0900 Subject: [PATCH] Enable ibus-setup to show the frequently used languages only in IME list. @@ -9,9 +9,11 @@ setup/enginecombobox.py | 148 +++++++++++++++++++++++++++++++++++------- 2 files changed, 292 insertions(+), 24 deletions(-) +diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in +index 28d2219..0600133 100644 --- a/data/ibus.schemas.in +++ b/data/ibus.schemas.in -@@ -339,6 +339,174 @@ +@@ -351,6 +351,174 @@ se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn @@ -186,6 +188,8 @@ /schemas/desktop/ibus/panel/custom_font /desktop/ibus/panel/custom_font ibus +diff --git a/setup/enginecombobox.py b/setup/enginecombobox.py +index b45ad56..830f0e8 100644 --- a/setup/enginecombobox.py +++ b/setup/enginecombobox.py @@ -22,6 +22,7 @@ @@ -196,7 +200,7 @@ from gi.repository import GObject from gi.repository import Gtk from gi.repository import IBus -@@ -45,6 +46,10 @@ +@@ -45,6 +46,10 @@ class EngineComboBox(Gtk.ComboBox): self.connect("notify::active", self.__notify_active_cb) self.__model = None @@ -207,23 +211,12 @@ renderer = Gtk.CellRendererPixbuf() renderer.set_property("xalign", 0) -@@ -58,20 +63,45 @@ +@@ -58,20 +63,45 @@ class EngineComboBox(Gtk.ComboBox): self.pack_start(renderer, True) self.set_cell_data_func(renderer, self.__name_cell_data_cb, None) - def set_engines(self, engines): - self.__model = Gtk.TreeStore(object) -- -- iter1 = self.__model.append(None) -- self.__model.set(iter1, 0, 0) -- langs = {} -- for e in engines: -- l = IBus.get_language_name(e.get_language()) -- if l == None: -- l = "" -- if l not in langs: -- langs[l] = [] -- langs[l].append(e) + def __gconf_get_lang_list_from_locale(self): + common_list = ['en', 'Other'] + loc = None @@ -252,7 +245,17 @@ + if lang_list == None: + return [loc] + common_list + return lang_list + common_list -+ + +- iter1 = self.__model.append(None) +- self.__model.set(iter1, 0, 0) +- langs = {} +- for e in engines: +- l = IBus.get_language_name(e.get_language()) +- if l == None: +- l = "" +- if l not in langs: +- langs[l] = [] +- langs[l].append(e) + def __has_engine_in_lang_list(self, engine, lang_list): + retval = False + for lang in lang_list: @@ -266,7 +269,7 @@ keys = langs.keys() keys.sort(locale.strcoll) loc = locale.getlocale()[0] -@@ -89,29 +119,86 @@ +@@ -89,29 +119,86 @@ class EngineComboBox(Gtk.ComboBox): keys.remove(IBus.get_language_name("Other")) keys += [IBus.get_language_name("Other")] for l in keys: @@ -361,7 +364,7 @@ else: renderer.set_property("visible", True) renderer.set_property("sensitive", True) -@@ -119,7 +206,8 @@ +@@ -119,7 +206,8 @@ class EngineComboBox(Gtk.ComboBox): renderer.set_property("pixbuf", pixbuf) def __name_cell_data_cb(self, celllayout, renderer, model, iter, data): @@ -371,7 +374,7 @@ if isinstance (engine, str) or isinstance (engine, unicode): renderer.set_property("sensitive", False) -@@ -127,8 +215,15 @@ +@@ -127,8 +215,15 @@ class EngineComboBox(Gtk.ComboBox): renderer.set_property("weight", Pango.Weight.NORMAL) elif isinstance(engine, int): renderer.set_property("sensitive", True) @@ -389,7 +392,7 @@ else: renderer.set_property("sensitive", True) renderer.set_property("text", engine.get_longname()) -@@ -144,7 +239,12 @@ +@@ -144,7 +239,12 @@ class EngineComboBox(Gtk.ComboBox): if i == 0 or i == -1: return None iter = self.get_active_iter() @@ -403,3 +406,6 @@ else: raise AttributeError, 'unknown property %s' % property.name +-- +1.8.0 + diff -Nru ibus-1.5.4/debian/patches/series ibus-1.5.5/debian/patches/series --- ibus-1.5.4/debian/patches/series 2014-01-08 05:16:17.000000000 +0900 +++ ibus-1.5.5/debian/patches/series 2014-02-03 22:33:46.000000000 +0900 @@ -1,7 +1,99 @@ -ibus-HEAD.patch -02_title_update.patch +# cross reference with ibus.spec: ibus-1.5.5-1.fc19.src.rpm +# useful parts +### # Upstreamed patches. +### # Patch0: %%{name}-HEAD.patch +### # https://bugzilla.redhat.com/show_bug.cgi?id=810211 +### Patch1: %{name}-810211-no-switch-by-no-trigger.patch +### # https://bugzilla.redhat.com/show_bug.cgi?id=541492 +### Patch2: %{name}-541492-xkb.patch +### # https://bugzilla.redhat.com/show_bug.cgi?id=530711 +### Patch3: %{name}-530711-preload-sys.patch +### # Hide minor input method engines on ibus-setup by locale +### Patch4: %{name}-xx-setup-frequent-lang.patch +### +### # Removed the target. +### # Even if fedpkg srpm's target is rhel, it can run on fedora box. +### # Keep the default triggers for the back compatiblity. +### Patch95: %{name}-xx-ctrl-space.patch +### # Disable IME on gnome-shell password for the back compatiblity. +### Patch96: %{name}-xx-f19-password.patch +# +### %if (0%{?fedora} < 20 && 0%{?rhel} < 8) +### %patch96 -p1 -b .passwd +# +ibus-xx-f19-password.patch +# +### %endif +### cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || +# +# instead, add a new patch for client/gtk3/ibusimcontext.c +# sed s/gtk2/gtk3/g ibus-xx-f19-password.patch +# +ibus-xx-f19-password-gtk3.patch +# +### %patch1 -p1 -b .noswitch +# ibus-810211-no-switch-by-no-trigger.patch +# +### %if %with_preload_xkb_engine +### %patch2 -p1 -b .preload-xkb +# ibus-541492-xkb.patch +# +### rm -f bindings/vala/ibus-1.0.vapi +### rm -f data/dconf/00-upstream-settings +# +# debian/rules: override_dh_auto_clean +# +### %endif +### %patch3 -p1 -b .preload-sys +# ibus-530711-preload-sys.patch +# +### %patch4 -p1 -b .setup-frequent-lang +# ibus-xx-setup-frequent-lang.patch +# +### +### %if (0%{?fedora} < 19 && 0%{?rhel} < 7) +### %patch95 -p1 -b .ctrl +# +ibus-xx-ctrl-space.patch +# +### %endif +# +# check manually with update-po script +# +### zcat %SOURCE3 | tar xf - +### POS=`(cd ibus-xkb-%ibus_xkb_version/po; ls *.po)` +### for PO in $POS +### do +### cp po/$PO po/$PO.orig +### msgcat --use-first po/$PO ibus-xkb-%ibus_xkb_version/po/$PO -o po/$PO +### done +# +### %changelog +### * Tue Jan 14 2014 Takao Fujiwara - 1.5.5-1 +### - Bumped to 1.5.5 +### - Deleted notify-python in Requires +### +### * Fri Oct 04 2013 Takao Fujiwara - 1.5.4-2 +### - Added ibus-HEAD.patch to sync upstream. +### +### * Fri Sep 20 2013 Takao Fujiwara - 1.5.4-1 +### - Bumped to 1.5.4 +### - Added ibus.conf.5 +### - Added ibus-xkb-1.5.0.tar.gz for po files. +### - Added ibus-xx-f19-password.patch for back compatibility. +### - Added ibus-wayland in f20 or later. +### +### * Fri Jul 26 2013 Takao Fujiwara - 1.5.3-1 +### - Bumped to 1.5.3 +### - Deleted ibus-xx-g-s-disable-preedit.patch as EOL. +### - Deleted ibus-gjs as EOL. +### - Removed imsettings-gnome, im-chooser, libgnomekbd dependencies. +### +999-update-po.patch +02_title_update.patch ibus-no-notification.patch +03_dont_run_dconf_update.patch diff -Nru ibus-1.5.4/debian/rules ibus-1.5.5/debian/rules --- ibus-1.5.4/debian/rules 2014-01-08 05:10:10.000000000 +0900 +++ ibus-1.5.5/debian/rules 2014-02-03 22:40:06.000000000 +0900 @@ -1,8 +1,12 @@ #!/usr/bin/make -f -CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +#DH_VERBOSE = 1 +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh $@ --with autoreconf,gir,python2,translations diff -Nru ibus-1.5.4/debian/update-po ibus-1.5.5/debian/update-po --- ibus-1.5.4/debian/update-po 2013-10-20 00:18:34.000000000 +0900 +++ ibus-1.5.5/debian/update-po 2014-01-26 14:30:33.000000000 +0900 @@ -1,27 +1,46 @@ -#!/bin/sh +#!/bin/bash # no patch generated as of now. No need to use this now but ... #################################################################### # rough outline of use -# $ dquilt push -a -# $ dquilt new 999-update-po.patch -# $ dquilt add po/*.po -# $ cp path/to/*.po debian/po/ -# $ debian/update-po -# $ dquilt refresh -# $ dquilt pop -a -# $ rm -rf .pc -# $ git add po/*.po; git commit -m "update PO" -# # To use this script to update the /po/*.po files, you need to extract *.po files -# in the ibus-xkb-1.5.0.tar.gz and place them under the debian/po/ directory -# first. -# -# Upon running this script, the /debian/po/*.po files are erased and the /po/*.po -# files are updated. -# +# in the ibus-xkb-1.5.*.tar.gz provided by the Fedora package and +# place them under the debian/po/ directory first. +# +# cp path/to/*.po debian/po/ +# +# invoke this as "debian/update-po" +# +set -e -x + +dquilt() { +quilt --quiltrc=${HOME}/.quiltrc-dpkg "$@" +} + +dquilt push -a +dquilt new 999-update-po.patch +dquilt add po/*.po + +POS=$(cd ./debian/po >/dev/null; ls *.po) + +for PO in $POS; do + echo "Update: $PO" + msgcat --use-first po/$PO debian/po/$PO -o po/$PO +done + # The modification to the /po/*.po files should be recorded as the quilt patch in # the debian/patches/ directory for use with the Debian package. -# +dquilt refresh +dquilt pop -a +rm -rf .pc +git add po/*.po debian/patches/999-update-po.patch debian/patches/series +git commit -m "update PO from ibus-xkb-1.5.*.tar.gz" + +# Upon running this script, the /debian/po/*.po files are erased and the /po/*.po +# files are updated. + +echo "Remove debian/po/*" +rm -rf debian/po + # This generated quilt patch corresponds to the following SPEC file. # === pertinent part of SPEC file === # # Actual path is https://github.com/.../%%{ibus_xkb_version}.tar.gz @@ -37,13 +56,3 @@ # done # ==================== -POS=$(cd ./debian/po >/dev/null; ls *.po) - -for PO in $POS; do - echo "Update: $PO" - msgcat --use-first po/$PO debian/po/$PO -o po/$PO -done - -echo "Remove debian/po/*" -rm -rf debian/po - diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusAttribute.html ibus-1.5.5/docs/reference/ibus/html/IBusAttribute.html --- ibus-1.5.4/docs/reference/ibus/html/IBusAttribute.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/IBusAttribute.html 2014-01-14 13:03:37.000000000 +0900 @@ -88,7 +88,8 @@

Description

An IBusAttribute represents an attribute that associate to IBusText. -It decorates preedit buffer and auxiliary text with underline, foreground and background colors. +It decorates preedit buffer and auxiliary text with underline, foreground +and background colors.

diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusConfig.html ibus-1.5.5/docs/reference/ibus/html/IBusConfig.html --- ibus-1.5.4/docs/reference/ibus/html/IBusConfig.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/IBusConfig.html 2014-01-14 13:03:37.000000000 +0900 @@ -221,9 +221,6 @@ 
IBusConfig *        ibus_config_new_async_finish        (GAsyncResult *res,
                                                          GError **error);

-returns: A newly allocated IBusConfig. -

-

Finishes an operation started with ibus_config_new_async().

@@ -241,6 +238,10 @@ + + + +

error :

 Return location for error or NULL.

Returns :

A newly allocated IBusConfig.
diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusConfigService.html ibus-1.5.5/docs/reference/ibus/html/IBusConfigService.html --- ibus-1.5.4/docs/reference/ibus/html/IBusConfigService.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/IBusConfigService.html 2014-01-14 13:03:37.000000000 +0900 @@ -213,7 +213,6 @@ * @config: An IBusConfig. * @section: section name * @name: value name - * * @returns: (transfer full): The value in config associated with section and name. * */ diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusEngineDesc.html ibus-1.5.5/docs/reference/ibus/html/IBusEngineDesc.html --- ibus-1.5.4/docs/reference/ibus/html/IBusEngineDesc.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/IBusEngineDesc.html 2014-01-14 13:03:37.000000000 +0900 @@ -124,7 +124,7 @@ which also includes engine description data.

-see_also: IBusComponent, IBusEngine +see_also: IBusComponent, IBusEngine

diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusFactory.html ibus-1.5.5/docs/reference/ibus/html/IBusFactory.html --- ibus-1.5.4/docs/reference/ibus/html/IBusFactory.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/IBusFactory.html 2014-01-14 13:03:37.000000000 +0900 @@ -79,7 +79,7 @@ and returns the D-Bus object path to IBus daemon.

-see_also: IBusEngine +see_also: IBusEngine

diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusInputContext.html ibus-1.5.5/docs/reference/ibus/html/IBusInputContext.html --- ibus-1.5.4/docs/reference/ibus/html/IBusInputContext.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/IBusInputContext.html 2014-01-14 13:03:37.000000000 +0900 @@ -1509,8 +1509,8 @@

The "update-auxiliary-text" signal

void                user_function                      (IBusInputContext *context,
-                                                        IBusText         *arg1,
-                                                        gboolean          arg2,
+                                                        IBusText         *text,
+                                                        gboolean          visible,
                                                         gpointer          user_data)      : Run Last

Emitted to hide auxilary text. @@ -1531,6 +1531,15 @@ An IBusInputContext. +

text :

+An auxiliary text + + +

visible :

+The visibility of text + + +

user_data :

user data set when the signal handler was connected. diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusKeymap.html ibus-1.5.5/docs/reference/ibus/html/IBusKeymap.html --- ibus-1.5.4/docs/reference/ibus/html/IBusKeymap.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/IBusKeymap.html 2014-01-14 13:03:37.000000000 +0900 @@ -77,7 +77,7 @@ convert scancodes back to the key symbols.

-see_also: IBusComponent, IBusEngineDesc +see_also: IBusComponent, IBusEngineDesc

@@ -175,7 +175,9 @@

Returns :

-An IBusKeymap associated with the giving name; or NULL if failed. +An IBusKeymap associated with the giving name; +or NULL if failed. [transfer full] +
diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusLookupTable.html ibus-1.5.5/docs/reference/ibus/html/IBusLookupTable.html --- ibus-1.5.4/docs/reference/ibus/html/IBusLookupTable.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/IBusLookupTable.html 2014-01-14 13:03:37.000000000 +0900 @@ -100,13 +100,17 @@

Description

-An IBusLookuptable stores the candidate words or phrases for users to choose from. +An IBusLookuptable stores the candidate words or phrases for users to +choose from.

Use ibus_engine_update_lookup_table(), ibus_engine_show_lookup_table(), and ibus_engine_hide_lookup_table() to update, show and hide the lookup table.

+

+see_also: IBusEngine +

Details

@@ -791,10 +795,6 @@
-
-

See Also

-IBusEngine -
diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusObservedPath.html ibus-1.5.5/docs/reference/ibus/html/IBusObservedPath.html --- ibus-1.5.4/docs/reference/ibus/html/IBusObservedPath.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/IBusObservedPath.html 2014-01-14 13:03:37.000000000 +0900 @@ -192,7 +192,8 @@ 
GList *             ibus_observed_path_traverse         (IBusObservedPath *path,
                                                          gboolean dir_only);

-Recursively traverse the path and put the files and subdirectory in to a newly allocated +Recursively traverse the path and put the files and subdirectory in to +a newly allocated GLists, if the path is a directory. Otherwise returns NULL.

@@ -211,7 +212,8 @@ - diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusPanelService.html ibus-1.5.5/docs/reference/ibus/html/IBusPanelService.html --- ibus-1.5.4/docs/reference/ibus/html/IBusPanelService.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/IBusPanelService.html 2014-01-14 13:03:37.000000000 +0900 @@ -403,7 +403,7 @@

Signal Details

The "cursor-down-lookup-table" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the cursor-down-lookup-table.
@@ -423,16 +423,23 @@
- + + + + + + - + +

Returns :

A newly allocate GList which holds content in path; NULL if path is not directory. [element-type IBusObservedPath] +A newly allocate +GList which holds content in path; NULL if path is not directory. [transfer full][element-type IBusObservedPath]

panel :

An IBusPanelService +

user_data :

 user data set when the signal handler was connected.

The "cursor-up-lookup-table" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the cursor-up-lookup-table.
@@ -452,17 +459,24 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "destroy-context" signal

-
void                user_function                      (IBusPanelService *input_context_path,
-                                                        gchar            *arg1,
+
void                user_function                      (IBusPanelService *panel,
+                                                        gchar            *input_context_path,
                                                         gpointer          user_data)               : Run Last

 

 Emitted when the client application destroys.
@@ -484,6 +498,11 @@
 
 
 
+
panel :

+An IBusPanelService
+
+
+
 
input_context_path :

 Object path of InputContext.
 
@@ -497,8 +516,8 @@
 

 

 
The "focus-in" signal

-
void                user_function                      (IBusPanelService *input_context_path,
-                                                        gchar            *arg1,
+
void                user_function                      (IBusPanelService *panel,
+                                                        gchar            *input_context_path,
                                                         gpointer          user_data)               : Run Last

 

 Emitted when the client application get the focus-in.
@@ -520,6 +539,11 @@
 
 
 
+
panel :

+An IBusPanelService
+
+
+
 
input_context_path :

 Object path of InputContext.
 
@@ -533,8 +557,8 @@
 

 

 
The "focus-out" signal

-
void                user_function                      (IBusPanelService *input_context_path,
-                                                        gchar            *arg1,
+
void                user_function                      (IBusPanelService *panel,
+                                                        gchar            *input_context_path,
                                                         gpointer          user_data)               : Run Last

 

 Emitted when the client application get the focus-out.
@@ -556,6 +580,11 @@
 
 
 
+
panel :

+An IBusPanelService
+
+
+
 
input_context_path :

 Object path of InputContext.
 
@@ -569,7 +598,7 @@
 

 

 
The "hide-auxiliary-text" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the hide-auxiliary-text.
@@ -589,16 +618,23 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+
 

 

 

 

 
The "hide-language-bar" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the hide-language-bar.
@@ -618,16 +654,23 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+
 

 

 

 

 
The "hide-lookup-table" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the hide-lookup-table.
@@ -647,16 +690,23 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "hide-preedit-text" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the hide-preedit-text.
@@ -676,16 +726,23 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "page-down-lookup-table" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the page-down-lookup-table.
@@ -705,16 +762,23 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "page-up-lookup-table" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the page-up-lookup-table.
@@ -734,17 +798,24 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "register-properties" signal

-
void                user_function                      (IBusPanelService *prop_list,
-                                                        IBusPropList     *arg1,
+
void                user_function                      (IBusPanelService *panel,
+                                                        IBusPropList     *prop_list,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the register-properties.
@@ -766,6 +837,11 @@
 
 
 
+
panel :

+An IBusPanelService
+
+
+
 
prop_list :

 An IBusPropList that contains properties.
 
@@ -779,7 +855,7 @@
 

 

 
The "reset" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the reset.
@@ -799,20 +875,27 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "set-cursor-location" signal

-
void                user_function                      (IBusPanelService *x,
+
void                user_function                      (IBusPanelService *panel,
+                                                        gint              x,
                                                         gint              y,
                                                         gint              w,
                                                         gint              h,
-                                                        gint              arg4,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the set-cursor-location.
@@ -834,6 +917,11 @@
 
 
 
+
panel :

+An IBusPanelService
+
+
+
 
x :

 X coordinate of the cursor.
 
@@ -859,7 +947,7 @@
 

 

 
The "show-auxiliary-text" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the show-auxiliary-text.
@@ -879,16 +967,23 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "show-language-bar" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the show-language-bar.
@@ -908,16 +1003,23 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "show-lookup-table" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the show-lookup-table.
@@ -937,16 +1039,23 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "show-preedit-text" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the show-preedit-text.
@@ -966,16 +1075,23 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "start-setup" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the start-setup.
@@ -995,16 +1111,23 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "state-changed" signal

-
void                user_function                      (IBusPanelService *arg0,
+
void                user_function                      (IBusPanelService *panel,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the state-changed.
@@ -1024,18 +1147,25 @@
 
 
 
-
+
+
+
panel :

+An IBusPanelService
+
+
+
 
user_data :

 user data set when the signal handler was connected.
-
+
+

The "update-auxiliary-text" signal

-
void                user_function                      (IBusPanelService *text,
-                                                        IBusText         *visible,
-                                                        gboolean          arg2,
+
void                user_function                      (IBusPanelService *panel,
+                                                        IBusText         *text,
+                                                        gboolean          visible,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the update-auxiliary-text.
@@ -1057,6 +1187,11 @@
 
 
 
+
panel :

+An IBusPanelService
+
+
+
 
text :

 A preedit text to be updated.
 
@@ -1074,9 +1209,9 @@
 

 

 
The "update-lookup-table" signal

-
void                user_function                      (IBusPanelService *lookup_table,
-                                                        IBusLookupTable  *visible,
-                                                        gboolean          arg2,
+
void                user_function                      (IBusPanelService *panel,
+                                                        IBusLookupTable  *lookup_table,
+                                                        gboolean          visible,
                                                         gpointer          user_data)         : Run Last

 

 Emitted when the client application get the update-lookup-table.
@@ -1098,6 +1233,11 @@
 
 
 
+
panel :

+An IBusPanelService
+
+
+
 
lookup_table :

 A lookup table to be updated.
 
@@ -1115,10 +1255,10 @@
 

 

 
The "update-preedit-text" signal

-
void                user_function                      (IBusPanelService *text,
-                                                        IBusText         *cursor_pos,
-                                                        guint             visible,
-                                                        gboolean          arg3,
+
void                user_function                      (IBusPanelService *panel,
+                                                        IBusText         *text,
+                                                        guint             cursor_pos,
+                                                        gboolean          visible,
                                                         gpointer          user_data)       : Run Last

 

 Emitted when the client application get the update-preedit-text.
@@ -1140,6 +1280,11 @@
 
 
 
+
panel :

+An IBusPanelService
+
+
+
 
text :

 A preedit text to be updated.
 
@@ -1161,8 +1306,8 @@
 

 

 
The "update-property" signal

-
void                user_function                      (IBusPanelService *prop,
-                                                        IBusProperty     *arg1,
+
void                user_function                      (IBusPanelService *panel,
+                                                        IBusProperty     *prop,
                                                         gpointer          user_data)      : Run Last

 

 Emitted when the client application get the update-property.
@@ -1184,6 +1329,11 @@
 
 
 
+
panel :

+An IBusPanelService
+
+
+
 
prop :

 The IBusProperty to be updated.
 
diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusPropList.html ibus-1.5.5/docs/reference/ibus/html/IBusPropList.html
--- ibus-1.5.4/docs/reference/ibus/html/IBusPropList.html	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/IBusPropList.html	2014-01-14 13:03:37.000000000 +0900
@@ -67,7 +67,7 @@
 

 
Description

 

-See_also: IBusProperty, IBusEngine
+See_also: IBusProperty, IBusEngine
 

 

 

diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusProxy.html ibus-1.5.5/docs/reference/ibus/html/IBusProxy.html
--- ibus-1.5.4/docs/reference/ibus/html/IBusProxy.html	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/IBusProxy.html	2014-01-14 13:03:37.000000000 +0900
@@ -84,9 +84,12 @@
 
Description

 

 An IBusProxy is the base of all proxy objects,
-which communicate the corresponding IBusServices on the other end of IBusConnection.
-For example, IBus clients (such as editors, web browsers) invoke the proxy object,
-IBusInputContext to communicate with the InputContext service of the ibus-daemon.
+which communicate the corresponding IBusServices on the other end of
+IBusConnection.
+For example, IBus clients (such as editors, web browsers) invoke the proxy
+object,
+IBusInputContext to communicate with the InputContext service of the
+ibus-daemon.
 

 

 Almost all services have corresponding proxies, except very simple services.
diff -Nru ibus-1.5.4/docs/reference/ibus/html/IBusText.html ibus-1.5.5/docs/reference/ibus/html/IBusText.html
--- ibus-1.5.4/docs/reference/ibus/html/IBusText.html	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/IBusText.html	2014-01-14 13:03:37.000000000 +0900
@@ -78,6 +78,9 @@
 e.g. the foreground/background color, underline, and
 applied scope.
 

+

+see_also: IBusAttribute
+

 

 

 
Details

@@ -423,10 +426,6 @@
 

 

 

-

-
See Also

-IBusAttribute
-

 

 

 

diff -Nru ibus-1.5.4/docs/reference/ibus/html/annotation-glossary.html ibus-1.5.5/docs/reference/ibus/html/annotation-glossary.html
--- ibus-1.5.4/docs/reference/ibus/html/annotation-glossary.html	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/annotation-glossary.html	2014-01-14 13:03:37.000000000 +0900
@@ -24,9 +24,15 @@
                       | 
                    A
                       | 
+                   T
+                      | 
                    E
                       | 
                    T
+                      | 
+                   A
+                      | 
+                   T
 
 
 

@@ -38,18 +44,21 @@
 
A

 
array

 
Parameter points to an array of items.

-
allow-none

-
NULL is ok, both for passing and for returning.

+
T

+
transfer none

+
Don't free data after the code is done.

 
E

 
element-type

 
Generics and defining elements of containers and arrays.

 
T

-
transfer container

-
Free data container after the code is done.

 
transfer full

 
Free data after the code is done.

-
transfer none

-
Don't free data after the code is done.

+
A

+
allow-none

+
NULL is ok, both for passing and for returning.

+
T

+
transfer container

+
Free data container after the code is done.

 

 

 

diff -Nru ibus-1.5.4/docs/reference/ibus/html/api-index-full.html ibus-1.5.5/docs/reference/ibus/html/api-index-full.html
--- ibus-1.5.4/docs/reference/ibus/html/api-index-full.html	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/api-index-full.html	2014-01-14 13:03:37.000000000 +0900
@@ -269,11 +269,11 @@
 

 
A

 

-IBUS_a, macro in ibuskeysyms-compat
+IBUS_A, macro in ibuskeysyms-compat
 

 

 

-IBUS_A, macro in ibuskeysyms-compat
+IBUS_a, macro in ibuskeysyms-compat
 

 

 

@@ -305,15 +305,11 @@
 

 

 

-IBUS_Abreveacute, macro in ibuskeysyms-compat
-

-

-

 IBUS_abreveacute, macro in ibuskeysyms-compat
 

 

 

-IBUS_Abrevebelowdot, macro in ibuskeysyms-compat
+IBUS_Abreveacute, macro in ibuskeysyms-compat
 

 

 

@@ -321,7 +317,7 @@
 

 

 

-IBUS_abrevegrave, macro in ibuskeysyms-compat
+IBUS_Abrevebelowdot, macro in ibuskeysyms-compat
 

 

 

@@ -329,6 +325,10 @@
 

 

 

+IBUS_abrevegrave, macro in ibuskeysyms-compat
+

+

+

 IBUS_Abrevehook, macro in ibuskeysyms-compat
 

 

@@ -337,11 +337,11 @@
 
 

 

-IBUS_Abrevetilde, macro in ibuskeysyms-compat
+IBUS_abrevetilde, macro in ibuskeysyms-compat
 

 

 

-IBUS_abrevetilde, macro in ibuskeysyms-compat
+IBUS_Abrevetilde, macro in ibuskeysyms-compat
 

 

 

@@ -353,19 +353,19 @@
 

 

 

-IBUS_acircumflex, macro in ibuskeysyms-compat
+IBUS_Acircumflex, macro in ibuskeysyms-compat
 

 

 

-IBUS_Acircumflex, macro in ibuskeysyms-compat
+IBUS_acircumflex, macro in ibuskeysyms-compat
 

 

 

-IBUS_acircumflexacute, macro in ibuskeysyms-compat
+IBUS_Acircumflexacute, macro in ibuskeysyms-compat
 

 

 

-IBUS_Acircumflexacute, macro in ibuskeysyms-compat
+IBUS_acircumflexacute, macro in ibuskeysyms-compat
 

 

 

@@ -377,11 +377,11 @@
 

 

 

-IBUS_Acircumflexgrave, macro in ibuskeysyms-compat
+IBUS_acircumflexgrave, macro in ibuskeysyms-compat
 

 

 

-IBUS_acircumflexgrave, macro in ibuskeysyms-compat
+IBUS_Acircumflexgrave, macro in ibuskeysyms-compat
 

 

 

@@ -393,11 +393,11 @@
 

 

 

-IBUS_Acircumflextilde, macro in ibuskeysyms-compat
+IBUS_acircumflextilde, macro in ibuskeysyms-compat
 

 

 

-IBUS_acircumflextilde, macro in ibuskeysyms-compat
+IBUS_Acircumflextilde, macro in ibuskeysyms-compat
 

 

 

@@ -421,11 +421,11 @@
 

 

 

-IBUS_Agrave, macro in ibuskeysyms-compat
+IBUS_agrave, macro in ibuskeysyms-compat
 

 

 

-IBUS_agrave, macro in ibuskeysyms-compat
+IBUS_Agrave, macro in ibuskeysyms-compat
 

 

 

@@ -457,11 +457,11 @@
 

 

 

-IBUS_Aogonek, macro in ibuskeysyms-compat
+IBUS_aogonek, macro in ibuskeysyms-compat
 

 

 

-IBUS_aogonek, macro in ibuskeysyms-compat
+IBUS_Aogonek, macro in ibuskeysyms-compat
 

 

 

@@ -817,11 +817,11 @@
 

 

 

-IBUS_Armenian_AT, macro in ibuskeysyms-compat
+IBUS_Armenian_at, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_at, macro in ibuskeysyms-compat
+IBUS_Armenian_AT, macro in ibuskeysyms-compat
 

 

 

@@ -869,11 +869,11 @@
 

 

 

-IBUS_Armenian_E, macro in ibuskeysyms-compat
+IBUS_Armenian_e, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_e, macro in ibuskeysyms-compat
+IBUS_Armenian_E, macro in ibuskeysyms-compat
 

 

 

@@ -893,11 +893,11 @@
 

 

 

-IBUS_Armenian_GHAT, macro in ibuskeysyms-compat
+IBUS_Armenian_ghat, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_ghat, macro in ibuskeysyms-compat
+IBUS_Armenian_GHAT, macro in ibuskeysyms-compat
 

 

 

@@ -917,11 +917,11 @@
 

 

 

-IBUS_Armenian_HO, macro in ibuskeysyms-compat
+IBUS_Armenian_ho, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_ho, macro in ibuskeysyms-compat
+IBUS_Armenian_HO, macro in ibuskeysyms-compat
 

 

 

@@ -937,15 +937,11 @@
 

 

 

-IBUS_Armenian_je, macro in ibuskeysyms-compat
-

-

-

 IBUS_Armenian_JE, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_ke, macro in ibuskeysyms-compat
+IBUS_Armenian_je, macro in ibuskeysyms-compat
 

 

 

@@ -953,7 +949,7 @@
 

 

 

-IBUS_Armenian_KEN, macro in ibuskeysyms-compat
+IBUS_Armenian_ke, macro in ibuskeysyms-compat
 

 

 

@@ -961,6 +957,10 @@
 

 

 

+IBUS_Armenian_KEN, macro in ibuskeysyms-compat
+

+

+

 IBUS_Armenian_KHE, macro in ibuskeysyms-compat
 

 

@@ -981,19 +981,19 @@
 
 

 

-IBUS_Armenian_men, macro in ibuskeysyms-compat
+IBUS_Armenian_MEN, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_MEN, macro in ibuskeysyms-compat
+IBUS_Armenian_men, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_nu, macro in ibuskeysyms-compat
+IBUS_Armenian_NU, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_NU, macro in ibuskeysyms-compat
+IBUS_Armenian_nu, macro in ibuskeysyms-compat
 

 

 

@@ -1009,11 +1009,11 @@
 

 

 

-IBUS_Armenian_PE, macro in ibuskeysyms-compat
+IBUS_Armenian_pe, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_pe, macro in ibuskeysyms-compat
+IBUS_Armenian_PE, macro in ibuskeysyms-compat
 

 

 

@@ -1029,15 +1029,11 @@
 

 

 

-IBUS_Armenian_RA, macro in ibuskeysyms-compat
-

-

-

 IBUS_Armenian_ra, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_RE, macro in ibuskeysyms-compat
+IBUS_Armenian_RA, macro in ibuskeysyms-compat
 

 

 

@@ -1045,7 +1041,7 @@
 

 

 

-IBUS_Armenian_se, macro in ibuskeysyms-compat
+IBUS_Armenian_RE, macro in ibuskeysyms-compat
 

 

 

@@ -1053,11 +1049,11 @@
 

 

 

-IBUS_Armenian_separation_mark, macro in ibuskeysyms-compat
+IBUS_Armenian_se, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_sha, macro in ibuskeysyms-compat
+IBUS_Armenian_separation_mark, macro in ibuskeysyms-compat
 

 

 

@@ -1065,11 +1061,11 @@
 

 

 

-IBUS_Armenian_shesht, macro in ibuskeysyms-compat
+IBUS_Armenian_sha, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_tche, macro in ibuskeysyms-compat
+IBUS_Armenian_shesht, macro in ibuskeysyms-compat
 

 

 

@@ -1077,7 +1073,7 @@
 

 

 

-IBUS_Armenian_to, macro in ibuskeysyms-compat
+IBUS_Armenian_tche, macro in ibuskeysyms-compat
 

 

 

@@ -1085,6 +1081,10 @@
 

 

 

+IBUS_Armenian_to, macro in ibuskeysyms-compat
+

+

+

 IBUS_Armenian_TSA, macro in ibuskeysyms-compat
 

 

@@ -1093,11 +1093,11 @@
 
 

 

-IBUS_Armenian_tso, macro in ibuskeysyms-compat
+IBUS_Armenian_TSO, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_TSO, macro in ibuskeysyms-compat
+IBUS_Armenian_tso, macro in ibuskeysyms-compat
 

 

 

@@ -1129,15 +1129,11 @@
 

 

 

-IBUS_Armenian_VYUN, macro in ibuskeysyms-compat
-

-

-

 IBUS_Armenian_vyun, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_YECH, macro in ibuskeysyms-compat
+IBUS_Armenian_VYUN, macro in ibuskeysyms-compat
 

 

 

@@ -1145,11 +1141,11 @@
 

 

 

-IBUS_Armenian_yentamna, macro in ibuskeysyms-compat
+IBUS_Armenian_YECH, macro in ibuskeysyms-compat
 

 

 

-IBUS_Armenian_ZA, macro in ibuskeysyms-compat
+IBUS_Armenian_yentamna, macro in ibuskeysyms-compat
 

 

 

@@ -1157,7 +1153,7 @@
 

 

 

-IBUS_Armenian_ZHE, macro in ibuskeysyms-compat
+IBUS_Armenian_ZA, macro in ibuskeysyms-compat
 

 

 

@@ -1165,6 +1161,10 @@
 

 

 

+IBUS_Armenian_ZHE, macro in ibuskeysyms-compat
+

+

+

 IBUS_asciicircum, macro in ibuskeysyms-compat
 

 

@@ -1181,11 +1181,11 @@
 
 

 

-IBUS_Atilde, macro in ibuskeysyms-compat
+IBUS_atilde, macro in ibuskeysyms-compat
 

 

 

-IBUS_atilde, macro in ibuskeysyms-compat
+IBUS_Atilde, macro in ibuskeysyms-compat
 

 

 

@@ -2762,24 +2762,20 @@
 

 

 

-IBUS_Byelorussian_shortu, macro in ibuskeysyms-compat
-

-

-

 IBUS_Byelorussian_SHORTU, macro in ibuskeysyms-compat
 

 

-
C

 

-IBUS_C, macro in ibuskeysyms-compat
+IBUS_Byelorussian_shortu, macro in ibuskeysyms-compat
 

 

+
C

 

 IBUS_c, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cabovedot, macro in ibuskeysyms-compat
+IBUS_C, macro in ibuskeysyms-compat
 

 

 

@@ -2787,7 +2783,7 @@
 

 

 

-IBUS_Cacute, macro in ibuskeysyms-compat
+IBUS_Cabovedot, macro in ibuskeysyms-compat
 

 

 

@@ -2795,6 +2791,10 @@
 

 

 

+IBUS_Cacute, macro in ibuskeysyms-compat
+

+

+

 IBUS_Cancel, macro in ibuskeysyms-compat
 

 

@@ -2835,11 +2835,11 @@
 
 

 

-IBUS_Ccircumflex, macro in ibuskeysyms-compat
+IBUS_ccircumflex, macro in ibuskeysyms-compat
 

 

 

-IBUS_ccircumflex, macro in ibuskeysyms-compat
+IBUS_Ccircumflex, macro in ibuskeysyms-compat
 

 

 

@@ -3007,6 +3007,14 @@
 

 

 

+IBusComposeTable, struct in ibuscomposetable
+

+

+

+IBusComposeTableLocaleList, struct in ibuscomposetable
+

+

+

 IBusConfig, struct in IBusConfig
 

 

@@ -3143,11 +3151,11 @@
 
 

 

-IBUS_Cyrillic_BE, macro in ibuskeysyms-compat
+IBUS_Cyrillic_be, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_be, macro in ibuskeysyms-compat
+IBUS_Cyrillic_BE, macro in ibuskeysyms-compat
 

 

 

@@ -3191,15 +3199,11 @@
 

 

 

-IBUS_Cyrillic_e, macro in ibuskeysyms-compat
-

-

-

 IBUS_Cyrillic_E, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_EF, macro in ibuskeysyms-compat
+IBUS_Cyrillic_e, macro in ibuskeysyms-compat
 

 

 

@@ -3207,7 +3211,7 @@
 

 

 

-IBUS_Cyrillic_EL, macro in ibuskeysyms-compat
+IBUS_Cyrillic_EF, macro in ibuskeysyms-compat
 

 

 

@@ -3215,6 +3219,10 @@
 

 

 

+IBUS_Cyrillic_EL, macro in ibuskeysyms-compat
+

+

+

 IBUS_Cyrillic_em, macro in ibuskeysyms-compat
 

 

@@ -3239,19 +3247,19 @@
 
 

 

-IBUS_Cyrillic_er, macro in ibuskeysyms-compat
+IBUS_Cyrillic_ER, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_ER, macro in ibuskeysyms-compat
+IBUS_Cyrillic_er, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_es, macro in ibuskeysyms-compat
+IBUS_Cyrillic_ES, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_ES, macro in ibuskeysyms-compat
+IBUS_Cyrillic_es, macro in ibuskeysyms-compat
 

 

 

@@ -3271,11 +3279,11 @@
 

 

 

-IBUS_Cyrillic_ha, macro in ibuskeysyms-compat
+IBUS_Cyrillic_HA, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_HA, macro in ibuskeysyms-compat
+IBUS_Cyrillic_ha, macro in ibuskeysyms-compat
 

 

 

@@ -3287,11 +3295,11 @@
 

 

 

-IBUS_Cyrillic_HA_descender, macro in ibuskeysyms-compat
+IBUS_Cyrillic_ha_descender, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_ha_descender, macro in ibuskeysyms-compat
+IBUS_Cyrillic_HA_descender, macro in ibuskeysyms-compat
 

 

 

@@ -3311,15 +3319,11 @@
 

 

 

-IBUS_Cyrillic_io, macro in ibuskeysyms-compat
-

-

-

 IBUS_Cyrillic_IO, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_I_macron, macro in ibuskeysyms-compat
+IBUS_Cyrillic_io, macro in ibuskeysyms-compat
 

 

 

@@ -3327,7 +3331,7 @@
 

 

 

-IBUS_Cyrillic_JE, macro in ibuskeysyms-compat
+IBUS_Cyrillic_I_macron, macro in ibuskeysyms-compat
 

 

 

@@ -3335,7 +3339,7 @@
 

 

 

-IBUS_Cyrillic_ka, macro in ibuskeysyms-compat
+IBUS_Cyrillic_JE, macro in ibuskeysyms-compat
 

 

 

@@ -3343,7 +3347,7 @@
 

 

 

-IBUS_Cyrillic_KA_descender, macro in ibuskeysyms-compat
+IBUS_Cyrillic_ka, macro in ibuskeysyms-compat
 

 

 

@@ -3351,7 +3355,7 @@
 

 

 

-IBUS_Cyrillic_ka_vertstroke, macro in ibuskeysyms-compat
+IBUS_Cyrillic_KA_descender, macro in ibuskeysyms-compat
 

 

 

@@ -3359,7 +3363,7 @@
 

 

 

-IBUS_Cyrillic_lje, macro in ibuskeysyms-compat
+IBUS_Cyrillic_ka_vertstroke, macro in ibuskeysyms-compat
 

 

 

@@ -3367,7 +3371,7 @@
 

 

 

-IBUS_Cyrillic_nje, macro in ibuskeysyms-compat
+IBUS_Cyrillic_lje, macro in ibuskeysyms-compat
 

 

 

@@ -3375,7 +3379,7 @@
 

 

 

-IBUS_Cyrillic_O, macro in ibuskeysyms-compat
+IBUS_Cyrillic_nje, macro in ibuskeysyms-compat
 

 

 

@@ -3383,6 +3387,10 @@
 

 

 

+IBUS_Cyrillic_O, macro in ibuskeysyms-compat
+

+

+

 IBUS_Cyrillic_O_bar, macro in ibuskeysyms-compat
 

 

@@ -3399,19 +3407,19 @@
 
 

 

-IBUS_Cyrillic_schwa, macro in ibuskeysyms-compat
+IBUS_Cyrillic_SCHWA, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_SCHWA, macro in ibuskeysyms-compat
+IBUS_Cyrillic_schwa, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_sha, macro in ibuskeysyms-compat
+IBUS_Cyrillic_SHA, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_SHA, macro in ibuskeysyms-compat
+IBUS_Cyrillic_sha, macro in ibuskeysyms-compat
 

 

 

@@ -3431,15 +3439,11 @@
 

 

 

-IBUS_Cyrillic_SHORTI, macro in ibuskeysyms-compat
-

-

-

 IBUS_Cyrillic_shorti, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_softsign, macro in ibuskeysyms-compat
+IBUS_Cyrillic_SHORTI, macro in ibuskeysyms-compat
 

 

 

@@ -3447,7 +3451,7 @@
 

 

 

-IBUS_Cyrillic_te, macro in ibuskeysyms-compat
+IBUS_Cyrillic_softsign, macro in ibuskeysyms-compat
 

 

 

@@ -3455,7 +3459,7 @@
 

 

 

-IBUS_Cyrillic_tse, macro in ibuskeysyms-compat
+IBUS_Cyrillic_te, macro in ibuskeysyms-compat
 

 

 

@@ -3463,7 +3467,7 @@
 

 

 

-IBUS_Cyrillic_U, macro in ibuskeysyms-compat
+IBUS_Cyrillic_tse, macro in ibuskeysyms-compat
 

 

 

@@ -3471,6 +3475,10 @@
 

 

 

+IBUS_Cyrillic_U, macro in ibuskeysyms-compat
+

+

+

 IBUS_Cyrillic_u_macron, macro in ibuskeysyms-compat
 

 

@@ -3479,11 +3487,11 @@
 
 

 

-IBUS_Cyrillic_U_straight, macro in ibuskeysyms-compat
+IBUS_Cyrillic_u_straight, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_u_straight, macro in ibuskeysyms-compat
+IBUS_Cyrillic_U_straight, macro in ibuskeysyms-compat
 

 

 

@@ -3503,11 +3511,11 @@
 

 

 

-IBUS_Cyrillic_YA, macro in ibuskeysyms-compat
+IBUS_Cyrillic_ya, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_ya, macro in ibuskeysyms-compat
+IBUS_Cyrillic_YA, macro in ibuskeysyms-compat
 

 

 

@@ -3519,19 +3527,19 @@
 

 

 

-IBUS_Cyrillic_YU, macro in ibuskeysyms-compat
+IBUS_Cyrillic_yu, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_yu, macro in ibuskeysyms-compat
+IBUS_Cyrillic_YU, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_ze, macro in ibuskeysyms-compat
+IBUS_Cyrillic_ZE, macro in ibuskeysyms-compat
 

 

 

-IBUS_Cyrillic_ZE, macro in ibuskeysyms-compat
+IBUS_Cyrillic_ze, macro in ibuskeysyms-compat
 

 

 

@@ -3552,19 +3560,19 @@
 

 
D

 

-IBUS_d, macro in ibuskeysyms-compat
+IBUS_D, macro in ibuskeysyms-compat
 

 

 

-IBUS_D, macro in ibuskeysyms-compat
+IBUS_d, macro in ibuskeysyms-compat
 

 

 

-IBUS_dabovedot, macro in ibuskeysyms-compat
+IBUS_Dabovedot, macro in ibuskeysyms-compat
 

 

 

-IBUS_Dabovedot, macro in ibuskeysyms-compat
+IBUS_dabovedot, macro in ibuskeysyms-compat
 

 

 

@@ -3572,11 +3580,11 @@
 

 

 

-IBUS_Dcaron, macro in ibuskeysyms-compat
+IBUS_dcaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_dcaron, macro in ibuskeysyms-compat
+IBUS_Dcaron, macro in ibuskeysyms-compat
 

 

 

@@ -3797,19 +3805,19 @@
 

 
E

 

-IBUS_E, macro in ibuskeysyms-compat
+IBUS_e, macro in ibuskeysyms-compat
 

 

 

-IBUS_e, macro in ibuskeysyms-compat
+IBUS_E, macro in ibuskeysyms-compat
 

 

 

-IBUS_Eabovedot, macro in ibuskeysyms-compat
+IBUS_eabovedot, macro in ibuskeysyms-compat
 

 

 

-IBUS_eabovedot, macro in ibuskeysyms-compat
+IBUS_Eabovedot, macro in ibuskeysyms-compat
 

 

 

@@ -3821,11 +3829,11 @@
 

 

 

-IBUS_Ebelowdot, macro in ibuskeysyms-compat
+IBUS_ebelowdot, macro in ibuskeysyms-compat
 

 

 

-IBUS_ebelowdot, macro in ibuskeysyms-compat
+IBUS_Ebelowdot, macro in ibuskeysyms-compat
 

 

 

@@ -3853,15 +3861,11 @@
 

 

 

-IBUS_ecircumflexbelowdot, macro in ibuskeysyms-compat
-

-

-

 IBUS_Ecircumflexbelowdot, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ecircumflexgrave, macro in ibuskeysyms-compat
+IBUS_ecircumflexbelowdot, macro in ibuskeysyms-compat
 

 

 

@@ -3869,7 +3873,7 @@
 

 

 

-IBUS_Ecircumflexhook, macro in ibuskeysyms-compat
+IBUS_Ecircumflexgrave, macro in ibuskeysyms-compat
 

 

 

@@ -3877,7 +3881,7 @@
 

 

 

-IBUS_ecircumflextilde, macro in ibuskeysyms-compat
+IBUS_Ecircumflexhook, macro in ibuskeysyms-compat
 

 

 

@@ -3885,11 +3889,11 @@
 

 

 

-IBUS_EcuSign, macro in ibuskeysyms-compat
+IBUS_ecircumflextilde, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ediaeresis, macro in ibuskeysyms-compat
+IBUS_EcuSign, macro in ibuskeysyms-compat
 

 

 

@@ -3897,6 +3901,10 @@
 

 

 

+IBUS_Ediaeresis, macro in ibuskeysyms-compat
+

+

+

 IBUS_egrave, macro in ibuskeysyms-compat
 

 

@@ -3997,11 +4005,11 @@
 
 

 

-IBUS_ENG, macro in ibuskeysyms-compat
+IBUS_eng, macro in ibuskeysyms-compat
 

 

 

-IBUS_eng, macro in ibuskeysyms-compat
+IBUS_ENG, macro in ibuskeysyms-compat
 

 

 

@@ -4321,6 +4329,10 @@
 

 

 

+ibus_engine_simple_add_table_by_locale, function in IBusEngineSimple
+

+

+

 ibus_engine_update_auxiliary_text, function in IBusEngine
 

 

@@ -4357,11 +4369,11 @@
 
 

 

-IBUS_Eogonek, macro in ibuskeysyms-compat
+IBUS_eogonek, macro in ibuskeysyms-compat
 

 

 

-IBUS_eogonek, macro in ibuskeysyms-compat
+IBUS_Eogonek, macro in ibuskeysyms-compat
 

 

 

@@ -4369,11 +4381,11 @@
 

 

 

-IBusError, enum in ibustypes
+IBUS_ERROR, macro in ibuserror
 

 

 

-IBUS_ERROR, macro in ibuserror
+IBusError, enum in ibustypes
 

 

 

@@ -4389,11 +4401,11 @@
 

 

 

-IBUS_Eth, macro in ibuskeysyms-compat
+IBUS_ETH, macro in ibuskeysyms-compat
 

 

 

-IBUS_ETH, macro in ibuskeysyms-compat
+IBUS_Eth, macro in ibuskeysyms-compat
 

 

 

@@ -4570,11 +4582,11 @@
 

 

 

-IBUS_fabovedot, macro in ibuskeysyms-compat
+IBUS_Fabovedot, macro in ibuskeysyms-compat
 

 

 

-IBUS_Fabovedot, macro in ibuskeysyms-compat
+IBUS_fabovedot, macro in ibuskeysyms-compat
 

 

 

@@ -4983,11 +4995,11 @@
 

 

 

-IBUS_Greek_alpha, macro in ibuskeysyms-compat
+IBUS_Greek_ALPHA, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_ALPHA, macro in ibuskeysyms-compat
+IBUS_Greek_alpha, macro in ibuskeysyms-compat
 

 

 

@@ -5031,11 +5043,11 @@
 

 

 

-IBUS_Greek_epsilonaccent, macro in ibuskeysyms-compat
+IBUS_Greek_EPSILONaccent, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_EPSILONaccent, macro in ibuskeysyms-compat
+IBUS_Greek_epsilonaccent, macro in ibuskeysyms-compat
 

 

 

@@ -5071,19 +5083,19 @@
 

 

 

-IBUS_Greek_IOTA, macro in ibuskeysyms-compat
+IBUS_Greek_iota, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_iota, macro in ibuskeysyms-compat
+IBUS_Greek_IOTA, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_iotaaccent, macro in ibuskeysyms-compat
+IBUS_Greek_IOTAaccent, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_IOTAaccent, macro in ibuskeysyms-compat
+IBUS_Greek_iotaaccent, macro in ibuskeysyms-compat
 

 

 

@@ -5111,19 +5123,19 @@
 

 

 

-IBUS_Greek_lambda, macro in ibuskeysyms-compat
+IBUS_Greek_LAMBDA, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_LAMBDA, macro in ibuskeysyms-compat
+IBUS_Greek_lambda, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_lamda, macro in ibuskeysyms-compat
+IBUS_Greek_LAMDA, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_LAMDA, macro in ibuskeysyms-compat
+IBUS_Greek_lamda, macro in ibuskeysyms-compat
 

 

 

@@ -5143,19 +5155,19 @@
 

 

 

-IBUS_Greek_omega, macro in ibuskeysyms-compat
+IBUS_Greek_OMEGA, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_OMEGA, macro in ibuskeysyms-compat
+IBUS_Greek_omega, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_OMEGAaccent, macro in ibuskeysyms-compat
+IBUS_Greek_omegaaccent, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_omegaaccent, macro in ibuskeysyms-compat
+IBUS_Greek_OMEGAaccent, macro in ibuskeysyms-compat
 

 

 

@@ -5167,11 +5179,11 @@
 

 

 

-IBUS_Greek_omicronaccent, macro in ibuskeysyms-compat
+IBUS_Greek_OMICRONaccent, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_OMICRONaccent, macro in ibuskeysyms-compat
+IBUS_Greek_omicronaccent, macro in ibuskeysyms-compat
 

 

 

@@ -5183,11 +5195,11 @@
 

 

 

-IBUS_Greek_PI, macro in ibuskeysyms-compat
+IBUS_Greek_pi, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_pi, macro in ibuskeysyms-compat
+IBUS_Greek_PI, macro in ibuskeysyms-compat
 

 

 

@@ -5207,11 +5219,11 @@
 

 

 

-IBUS_Greek_SIGMA, macro in ibuskeysyms-compat
+IBUS_Greek_sigma, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_sigma, macro in ibuskeysyms-compat
+IBUS_Greek_SIGMA, macro in ibuskeysyms-compat
 

 

 

@@ -5227,19 +5239,19 @@
 

 

 

-IBUS_Greek_THETA, macro in ibuskeysyms-compat
+IBUS_Greek_theta, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_theta, macro in ibuskeysyms-compat
+IBUS_Greek_THETA, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_upsilon, macro in ibuskeysyms-compat
+IBUS_Greek_UPSILON, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_UPSILON, macro in ibuskeysyms-compat
+IBUS_Greek_upsilon, macro in ibuskeysyms-compat
 

 

 

@@ -5255,15 +5267,11 @@
 

 

 

-IBUS_Greek_upsilondieresis, macro in ibuskeysyms-compat
-

-

-

 IBUS_Greek_UPSILONdieresis, macro in ibuskeysyms-compat
 

 

 

-IBUS_Greek_xi, macro in ibuskeysyms-compat
+IBUS_Greek_upsilondieresis, macro in ibuskeysyms-compat
 

 

 

@@ -5271,7 +5279,7 @@
 

 

 

-IBUS_Greek_ZETA, macro in ibuskeysyms-compat
+IBUS_Greek_xi, macro in ibuskeysyms-compat
 

 

 

@@ -5279,6 +5287,10 @@
 

 

 

+IBUS_Greek_ZETA, macro in ibuskeysyms-compat
+

+

+

 IBUS_guillemotleft, macro in ibuskeysyms-compat
 

 

@@ -5288,11 +5300,11 @@
 

 
H

 

-IBUS_H, macro in ibuskeysyms-compat
+IBUS_h, macro in ibuskeysyms-compat
 

 

 

-IBUS_h, macro in ibuskeysyms-compat
+IBUS_H, macro in ibuskeysyms-compat
 

 

 

@@ -5728,11 +5740,11 @@
 

 

 

-IBUS_Hcircumflex, macro in ibuskeysyms-compat
+IBUS_hcircumflex, macro in ibuskeysyms-compat
 

 

 

-IBUS_hcircumflex, macro in ibuskeysyms-compat
+IBUS_Hcircumflex, macro in ibuskeysyms-compat
 

 

 

@@ -6025,11 +6037,11 @@
 

 

 

-IBUS_iacute, macro in ibuskeysyms-compat
+IBUS_Iacute, macro in ibuskeysyms-compat
 

 

 

-IBUS_Iacute, macro in ibuskeysyms-compat
+IBUS_iacute, macro in ibuskeysyms-compat
 

 

 

@@ -6085,19 +6097,19 @@
 

 

 

-IBUS_Ihook, macro in ibuskeysyms-compat
+IBUS_ihook, macro in ibuskeysyms-compat
 

 

 

-IBUS_ihook, macro in ibuskeysyms-compat
+IBUS_Ihook, macro in ibuskeysyms-compat
 

 

 

-IBUS_imacron, macro in ibuskeysyms-compat
+IBUS_Imacron, macro in ibuskeysyms-compat
 

 

 

-IBUS_Imacron, macro in ibuskeysyms-compat
+IBUS_imacron, macro in ibuskeysyms-compat
 

 

 

@@ -6353,11 +6365,11 @@
 

 

 

-IBUS_Iogonek, macro in ibuskeysyms-compat
+IBUS_iogonek, macro in ibuskeysyms-compat
 

 

 

-IBUS_iogonek, macro in ibuskeysyms-compat
+IBUS_Iogonek, macro in ibuskeysyms-compat
 

 

 

@@ -6521,11 +6533,11 @@
 

 

 

-IBUS_itilde, macro in ibuskeysyms-compat
+IBUS_Itilde, macro in ibuskeysyms-compat
 

 

 

-IBUS_Itilde, macro in ibuskeysyms-compat
+IBUS_itilde, macro in ibuskeysyms-compat
 

 

 
J

@@ -6551,11 +6563,11 @@
 

 
K

 

-IBUS_k, macro in ibuskeysyms-compat
+IBUS_K, macro in ibuskeysyms-compat
 

 

 

-IBUS_K, macro in ibuskeysyms-compat
+IBUS_k, macro in ibuskeysyms-compat
 

 

 

@@ -6619,11 +6631,11 @@
 

 

 

-IBUS_kana_i, macro in ibuskeysyms-compat
+IBUS_kana_I, macro in ibuskeysyms-compat
 

 

 

-IBUS_kana_I, macro in ibuskeysyms-compat
+IBUS_kana_i, macro in ibuskeysyms-compat
 

 

 

@@ -6775,19 +6787,19 @@
 

 

 

-IBUS_kana_TSU, macro in ibuskeysyms-compat
+IBUS_kana_tsu, macro in ibuskeysyms-compat
 

 

 

-IBUS_kana_tsu, macro in ibuskeysyms-compat
+IBUS_kana_TSU, macro in ibuskeysyms-compat
 

 

 

-IBUS_kana_TU, macro in ibuskeysyms-compat
+IBUS_kana_tu, macro in ibuskeysyms-compat
 

 

 

-IBUS_kana_tu, macro in ibuskeysyms-compat
+IBUS_kana_TU, macro in ibuskeysyms-compat
 

 

 

@@ -6815,11 +6827,11 @@
 

 

 

-IBUS_kana_YO, macro in ibuskeysyms-compat
+IBUS_kana_yo, macro in ibuskeysyms-compat
 

 

 

-IBUS_kana_yo, macro in ibuskeysyms-compat
+IBUS_kana_YO, macro in ibuskeysyms-compat
 

 

 

@@ -6847,11 +6859,11 @@
 

 

 

-IBUS_Kcedilla, macro in ibuskeysyms-compat
+IBUS_kcedilla, macro in ibuskeysyms-compat
 

 

 

-IBUS_kcedilla, macro in ibuskeysyms-compat
+IBUS_Kcedilla, macro in ibuskeysyms-compat
 

 

 

@@ -7047,15 +7059,11 @@
 

 

 

-IBUS_KEY_A, macro in IBusKeysyms
-

-

-

 IBUS_KEY_a, macro in IBusKeysyms
 

 

 

-IBUS_KEY_aacute, macro in IBusKeysyms
+IBUS_KEY_A, macro in IBusKeysyms
 

 

 

@@ -7063,7 +7071,7 @@
 

 

 

-IBUS_KEY_abelowdot, macro in IBusKeysyms
+IBUS_KEY_aacute, macro in IBusKeysyms
 

 

 

@@ -7071,6 +7079,10 @@
 

 

 

+IBUS_KEY_abelowdot, macro in IBusKeysyms
+

+

+

 IBUS_KEY_abovedot, macro in IBusKeysyms
 

 

@@ -7083,11 +7095,11 @@
 
 

 

-IBUS_KEY_abreveacute, macro in IBusKeysyms
+IBUS_KEY_Abreveacute, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Abreveacute, macro in IBusKeysyms
+IBUS_KEY_abreveacute, macro in IBusKeysyms
 

 

 

@@ -7099,11 +7111,11 @@
 

 

 

-IBUS_KEY_Abrevegrave, macro in IBusKeysyms
+IBUS_KEY_abrevegrave, macro in IBusKeysyms
 

 

 

-IBUS_KEY_abrevegrave, macro in IBusKeysyms
+IBUS_KEY_Abrevegrave, macro in IBusKeysyms
 

 

 

@@ -7115,11 +7127,11 @@
 

 

 

-IBUS_KEY_Abrevetilde, macro in IBusKeysyms
+IBUS_KEY_abrevetilde, macro in IBusKeysyms
 

 

 

-IBUS_KEY_abrevetilde, macro in IBusKeysyms
+IBUS_KEY_Abrevetilde, macro in IBusKeysyms
 

 

 

@@ -7131,11 +7143,11 @@
 

 

 

-IBUS_KEY_acircumflex, macro in IBusKeysyms
+IBUS_KEY_Acircumflex, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Acircumflex, macro in IBusKeysyms
+IBUS_KEY_acircumflex, macro in IBusKeysyms
 

 

 

@@ -7155,15 +7167,11 @@
 

 

 

-IBUS_KEY_Acircumflexgrave, macro in IBusKeysyms
-

-

-

 IBUS_KEY_acircumflexgrave, macro in IBusKeysyms
 

 

 

-IBUS_KEY_acircumflexhook, macro in IBusKeysyms
+IBUS_KEY_Acircumflexgrave, macro in IBusKeysyms
 

 

 

@@ -7171,7 +7179,7 @@
 

 

 

-IBUS_KEY_acircumflextilde, macro in IBusKeysyms
+IBUS_KEY_acircumflexhook, macro in IBusKeysyms
 

 

 

@@ -7179,6 +7187,10 @@
 

 

 

+IBUS_KEY_acircumflextilde, macro in IBusKeysyms
+

+

+

 IBUS_KEY_acute, macro in IBusKeysyms
 

 

@@ -7191,19 +7203,19 @@
 
 

 

-IBUS_KEY_ae, macro in IBusKeysyms
+IBUS_KEY_AE, macro in IBusKeysyms
 

 

 

-IBUS_KEY_AE, macro in IBusKeysyms
+IBUS_KEY_ae, macro in IBusKeysyms
 

 

 

-IBUS_KEY_agrave, macro in IBusKeysyms
+IBUS_KEY_Agrave, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Agrave, macro in IBusKeysyms
+IBUS_KEY_agrave, macro in IBusKeysyms
 

 

 

@@ -7223,11 +7235,11 @@
 

 

 

-IBUS_KEY_Amacron, macro in IBusKeysyms
+IBUS_KEY_amacron, macro in IBusKeysyms
 

 

 

-IBUS_KEY_amacron, macro in IBusKeysyms
+IBUS_KEY_Amacron, macro in IBusKeysyms
 

 

 

@@ -7603,11 +7615,11 @@
 

 

 

-IBUS_KEY_Armenian_AYB, macro in IBusKeysyms
+IBUS_KEY_Armenian_ayb, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_ayb, macro in IBusKeysyms
+IBUS_KEY_Armenian_AYB, macro in IBusKeysyms
 

 

 

@@ -7671,11 +7683,11 @@
 

 

 

-IBUS_KEY_Armenian_GHAT, macro in IBusKeysyms
+IBUS_KEY_Armenian_ghat, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_ghat, macro in IBusKeysyms
+IBUS_KEY_Armenian_GHAT, macro in IBusKeysyms
 

 

 

@@ -7695,19 +7707,15 @@
 

 

 

-IBUS_KEY_Armenian_HO, macro in IBusKeysyms
-

-

-

 IBUS_KEY_Armenian_ho, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_hyphen, macro in IBusKeysyms
+IBUS_KEY_Armenian_HO, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_ini, macro in IBusKeysyms
+IBUS_KEY_Armenian_hyphen, macro in IBusKeysyms
 

 

 

@@ -7715,7 +7723,7 @@
 

 

 

-IBUS_KEY_Armenian_JE, macro in IBusKeysyms
+IBUS_KEY_Armenian_ini, macro in IBusKeysyms
 

 

 

@@ -7723,7 +7731,7 @@
 

 

 

-IBUS_KEY_Armenian_KE, macro in IBusKeysyms
+IBUS_KEY_Armenian_JE, macro in IBusKeysyms
 

 

 

@@ -7731,7 +7739,7 @@
 

 

 

-IBUS_KEY_Armenian_KEN, macro in IBusKeysyms
+IBUS_KEY_Armenian_KE, macro in IBusKeysyms
 

 

 

@@ -7739,7 +7747,7 @@
 

 

 

-IBUS_KEY_Armenian_khe, macro in IBusKeysyms
+IBUS_KEY_Armenian_KEN, macro in IBusKeysyms
 

 

 

@@ -7747,11 +7755,11 @@
 

 

 

-IBUS_KEY_Armenian_ligature_ew, macro in IBusKeysyms
+IBUS_KEY_Armenian_khe, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_LYUN, macro in IBusKeysyms
+IBUS_KEY_Armenian_ligature_ew, macro in IBusKeysyms
 

 

 

@@ -7759,15 +7767,15 @@
 

 

 

-IBUS_KEY_Armenian_MEN, macro in IBusKeysyms
+IBUS_KEY_Armenian_LYUN, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_men, macro in IBusKeysyms
+IBUS_KEY_Armenian_MEN, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_nu, macro in IBusKeysyms
+IBUS_KEY_Armenian_men, macro in IBusKeysyms
 

 

 

@@ -7775,7 +7783,7 @@
 

 

 

-IBUS_KEY_Armenian_O, macro in IBusKeysyms
+IBUS_KEY_Armenian_nu, macro in IBusKeysyms
 

 

 

@@ -7783,11 +7791,11 @@
 

 

 

-IBUS_KEY_Armenian_paruyk, macro in IBusKeysyms
+IBUS_KEY_Armenian_O, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_pe, macro in IBusKeysyms
+IBUS_KEY_Armenian_paruyk, macro in IBusKeysyms
 

 

 

@@ -7795,7 +7803,7 @@
 

 

 

-IBUS_KEY_Armenian_PYUR, macro in IBusKeysyms
+IBUS_KEY_Armenian_pe, macro in IBusKeysyms
 

 

 

@@ -7803,11 +7811,11 @@
 

 

 

-IBUS_KEY_Armenian_question, macro in IBusKeysyms
+IBUS_KEY_Armenian_PYUR, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_ra, macro in IBusKeysyms
+IBUS_KEY_Armenian_question, macro in IBusKeysyms
 

 

 

@@ -7815,6 +7823,10 @@
 

 

 

+IBUS_KEY_Armenian_ra, macro in IBusKeysyms
+

+

+

 IBUS_KEY_Armenian_RE, macro in IBusKeysyms
 

 

@@ -7835,11 +7847,11 @@
 
 

 

-IBUS_KEY_Armenian_sha, macro in IBusKeysyms
+IBUS_KEY_Armenian_SHA, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_SHA, macro in IBusKeysyms
+IBUS_KEY_Armenian_sha, macro in IBusKeysyms
 

 

 

@@ -7879,11 +7891,11 @@
 

 

 

-IBUS_KEY_Armenian_tyun, macro in IBusKeysyms
+IBUS_KEY_Armenian_TYUN, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_TYUN, macro in IBusKeysyms
+IBUS_KEY_Armenian_tyun, macro in IBusKeysyms
 

 

 

@@ -7891,19 +7903,19 @@
 

 

 

-IBUS_KEY_Armenian_VEV, macro in IBusKeysyms
+IBUS_KEY_Armenian_vev, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_vev, macro in IBusKeysyms
+IBUS_KEY_Armenian_VEV, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_vo, macro in IBusKeysyms
+IBUS_KEY_Armenian_VO, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Armenian_VO, macro in IBusKeysyms
+IBUS_KEY_Armenian_vo, macro in IBusKeysyms
 

 

 

@@ -7959,11 +7971,11 @@
 

 

 

-IBUS_KEY_Atilde, macro in IBusKeysyms
+IBUS_KEY_atilde, macro in IBusKeysyms
 

 

 

-IBUS_KEY_atilde, macro in IBusKeysyms
+IBUS_KEY_Atilde, macro in IBusKeysyms
 

 

 

@@ -7971,11 +7983,11 @@
 

 

 

-IBUS_KEY_B, macro in IBusKeysyms
+IBUS_KEY_b, macro in IBusKeysyms
 

 

 

-IBUS_KEY_b, macro in IBusKeysyms
+IBUS_KEY_B, macro in IBusKeysyms
 

 

 

@@ -9155,15 +9167,11 @@
 

 

 

-IBUS_KEY_C, macro in IBusKeysyms
-

-

-

 IBUS_KEY_c, macro in IBusKeysyms
 

 

 

-IBUS_KEY_cabovedot, macro in IBusKeysyms
+IBUS_KEY_C, macro in IBusKeysyms
 

 

 

@@ -9171,7 +9179,7 @@
 

 

 

-IBUS_KEY_Cacute, macro in IBusKeysyms
+IBUS_KEY_cabovedot, macro in IBusKeysyms
 

 

 

@@ -9179,6 +9187,10 @@
 

 

 

+IBUS_KEY_Cacute, macro in IBusKeysyms
+

+

+

 IBUS_KEY_Cancel, macro in IBusKeysyms
 

 

@@ -9199,11 +9211,11 @@
 
 

 

-IBUS_KEY_Ccaron, macro in IBusKeysyms
+IBUS_KEY_ccaron, macro in IBusKeysyms
 

 

 

-IBUS_KEY_ccaron, macro in IBusKeysyms
+IBUS_KEY_Ccaron, macro in IBusKeysyms
 

 

 

@@ -9215,11 +9227,11 @@
 

 

 

-IBUS_KEY_ccircumflex, macro in IBusKeysyms
+IBUS_KEY_Ccircumflex, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ccircumflex, macro in IBusKeysyms
+IBUS_KEY_ccircumflex, macro in IBusKeysyms
 

 

 

@@ -9231,7 +9243,7 @@
 

 

 

-IBUS_KEY_Ch, macro in IBusKeysyms
+IBUS_KEY_CH, macro in IBusKeysyms
 

 

 

@@ -9239,7 +9251,7 @@
 

 

 

-IBUS_KEY_CH, macro in IBusKeysyms
+IBUS_KEY_Ch, macro in IBusKeysyms
 

 

 

@@ -9351,19 +9363,19 @@
 

 

 

-IBUS_KEY_Cyrillic_che_vertstroke, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_CHE_vertstroke, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_CHE_vertstroke, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_che_vertstroke, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_de, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_DE, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_DE, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_de, macro in IBusKeysyms
 

 

 

@@ -9391,11 +9403,11 @@
 

 

 

-IBUS_KEY_Cyrillic_EL, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_el, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_el, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_EL, macro in IBusKeysyms
 

 

 

@@ -9415,11 +9427,11 @@
 

 

 

-IBUS_KEY_Cyrillic_EN_descender, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_en_descender, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_en_descender, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_EN_descender, macro in IBusKeysyms
 

 

 

@@ -9439,11 +9451,11 @@
 

 

 

-IBUS_KEY_Cyrillic_GHE, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_ghe, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_ghe, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_GHE, macro in IBusKeysyms
 

 

 

@@ -9455,11 +9467,11 @@
 

 

 

-IBUS_KEY_Cyrillic_HA, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_ha, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_ha, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_HA, macro in IBusKeysyms
 

 

 

@@ -9479,11 +9491,11 @@
 

 

 

-IBUS_KEY_Cyrillic_I, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_i, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_i, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_I, macro in IBusKeysyms
 

 

 

@@ -9495,19 +9507,19 @@
 

 

 

-IBUS_KEY_Cyrillic_io, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_IO, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_IO, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_io, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_i_macron, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_I_macron, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_I_macron, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_i_macron, macro in IBusKeysyms
 

 

 

@@ -9527,19 +9539,19 @@
 

 

 

-IBUS_KEY_Cyrillic_KA_descender, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_ka_descender, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_ka_descender, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_KA_descender, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_ka_vertstroke, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_KA_vertstroke, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_KA_vertstroke, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_ka_vertstroke, macro in IBusKeysyms
 

 

 

@@ -9551,11 +9563,11 @@
 

 

 

-IBUS_KEY_Cyrillic_nje, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_NJE, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_NJE, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_nje, macro in IBusKeysyms
 

 

 

@@ -9567,19 +9579,19 @@
 

 

 

-IBUS_KEY_Cyrillic_o_bar, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_O_bar, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_O_bar, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_o_bar, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_PE, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_pe, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_pe, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_PE, macro in IBusKeysyms
 

 

 

@@ -9607,11 +9619,11 @@
 

 

 

-IBUS_KEY_Cyrillic_shha, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_SHHA, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_SHHA, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_shha, macro in IBusKeysyms
 

 

 

@@ -9623,11 +9635,11 @@
 

 

 

-IBUS_KEY_Cyrillic_SOFTSIGN, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_softsign, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_softsign, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_SOFTSIGN, macro in IBusKeysyms
 

 

 

@@ -9647,11 +9659,11 @@
 

 

 

-IBUS_KEY_Cyrillic_U, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_u, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_u, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_U, macro in IBusKeysyms
 

 

 

@@ -9663,19 +9675,19 @@
 

 

 

-IBUS_KEY_Cyrillic_U_straight, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_u_straight, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_u_straight, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_U_straight, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_U_straight_bar, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_u_straight_bar, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_u_straight_bar, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_U_straight_bar, macro in IBusKeysyms
 

 

 

@@ -9687,19 +9699,19 @@
 

 

 

-IBUS_KEY_Cyrillic_ya, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_YA, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_YA, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_ya, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_YERU, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_yeru, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_yeru, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_YERU, macro in IBusKeysyms
 

 

 

@@ -9719,15 +9731,11 @@
 

 

 

-IBUS_KEY_Cyrillic_ZHE, macro in IBusKeysyms
-

-

-

 IBUS_KEY_Cyrillic_zhe, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Cyrillic_ZHE_descender, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_ZHE, macro in IBusKeysyms
 

 

 

@@ -9735,7 +9743,7 @@
 

 

 

-IBUS_KEY_C_H, macro in IBusKeysyms
+IBUS_KEY_Cyrillic_ZHE_descender, macro in IBusKeysyms
 

 

 

@@ -9743,6 +9751,10 @@
 

 

 

+IBUS_KEY_C_H, macro in IBusKeysyms
+

+

+

 IBUS_KEY_c_h, macro in IBusKeysyms
 

 

@@ -9755,11 +9767,11 @@
 
 

 

-IBUS_KEY_Dabovedot, macro in IBusKeysyms
+IBUS_KEY_dabovedot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_dabovedot, macro in IBusKeysyms
+IBUS_KEY_Dabovedot, macro in IBusKeysyms
 

 

 

@@ -9767,19 +9779,19 @@
 

 

 

-IBUS_KEY_dcaron, macro in IBusKeysyms
+IBUS_KEY_Dcaron, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Dcaron, macro in IBusKeysyms
+IBUS_KEY_dcaron, macro in IBusKeysyms
 

 

 

-IBUS_KEY_dead_a, macro in IBusKeysyms
+IBUS_KEY_dead_A, macro in IBusKeysyms
 

 

 

-IBUS_KEY_dead_A, macro in IBusKeysyms
+IBUS_KEY_dead_a, macro in IBusKeysyms
 

 

 

@@ -9887,6 +9899,10 @@
 

 

 

+IBUS_KEY_dead_greek, macro in IBusKeysyms
+

+

+

 IBUS_KEY_dead_hook, macro in IBusKeysyms
 

 

@@ -9915,11 +9931,11 @@
 
 

 

-IBUS_KEY_dead_o, macro in IBusKeysyms
+IBUS_KEY_dead_O, macro in IBusKeysyms
 

 

 

-IBUS_KEY_dead_O, macro in IBusKeysyms
+IBUS_KEY_dead_o, macro in IBusKeysyms
 

 

 

@@ -10043,11 +10059,11 @@
 

 

 

-IBUS_KEY_Dstroke, macro in IBusKeysyms
+IBUS_KEY_dstroke, macro in IBusKeysyms
 

 

 

-IBUS_KEY_dstroke, macro in IBusKeysyms
+IBUS_KEY_Dstroke, macro in IBusKeysyms
 

 

 

@@ -10059,15 +10075,11 @@
 

 

 

-IBUS_KEY_Eabovedot, macro in IBusKeysyms
-

-

-

 IBUS_KEY_eabovedot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_eacute, macro in IBusKeysyms
+IBUS_KEY_Eabovedot, macro in IBusKeysyms
 

 

 

@@ -10075,7 +10087,7 @@
 

 

 

-IBUS_KEY_ebelowdot, macro in IBusKeysyms
+IBUS_KEY_eacute, macro in IBusKeysyms
 

 

 

@@ -10083,6 +10095,10 @@
 

 

 

+IBUS_KEY_ebelowdot, macro in IBusKeysyms
+

+

+

 IBUS_KEY_ecaron, macro in IBusKeysyms
 

 

@@ -10099,19 +10115,19 @@
 
 

 

-IBUS_KEY_ecircumflexacute, macro in IBusKeysyms
+IBUS_KEY_Ecircumflexacute, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ecircumflexacute, macro in IBusKeysyms
+IBUS_KEY_ecircumflexacute, macro in IBusKeysyms
 

 

 

-IBUS_KEY_ecircumflexbelowdot, macro in IBusKeysyms
+IBUS_KEY_Ecircumflexbelowdot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ecircumflexbelowdot, macro in IBusKeysyms
+IBUS_KEY_ecircumflexbelowdot, macro in IBusKeysyms
 

 

 

@@ -10123,11 +10139,11 @@
 

 

 

-IBUS_KEY_ecircumflexhook, macro in IBusKeysyms
+IBUS_KEY_Ecircumflexhook, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ecircumflexhook, macro in IBusKeysyms
+IBUS_KEY_ecircumflexhook, macro in IBusKeysyms
 

 

 

@@ -10151,11 +10167,11 @@
 

 

 

-IBUS_KEY_Egrave, macro in IBusKeysyms
+IBUS_KEY_egrave, macro in IBusKeysyms
 

 

 

-IBUS_KEY_egrave, macro in IBusKeysyms
+IBUS_KEY_Egrave, macro in IBusKeysyms
 

 

 

@@ -10251,11 +10267,11 @@
 

 

 

-IBUS_KEY_eng, macro in IBusKeysyms
+IBUS_KEY_ENG, macro in IBusKeysyms
 

 

 

-IBUS_KEY_ENG, macro in IBusKeysyms
+IBUS_KEY_eng, macro in IBusKeysyms
 

 

 

@@ -10287,11 +10303,11 @@
 

 

 

-IBUS_KEY_ETH, macro in IBusKeysyms
+IBUS_KEY_eth, macro in IBusKeysyms
 

 

 

-IBUS_KEY_eth, macro in IBusKeysyms
+IBUS_KEY_ETH, macro in IBusKeysyms
 

 

 

@@ -10331,6 +10347,14 @@
 

 

 

+IBUS_KEY_ezh, macro in IBusKeysyms
+

+

+

+IBUS_KEY_EZH, macro in IBusKeysyms
+

+

+

 IBUS_KEY_F, macro in IBusKeysyms
 

 

@@ -10831,11 +10855,11 @@
 
 

 

-IBUS_KEY_Greek_alpha, macro in IBusKeysyms
+IBUS_KEY_Greek_ALPHA, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_ALPHA, macro in IBusKeysyms
+IBUS_KEY_Greek_alpha, macro in IBusKeysyms
 

 

 

@@ -10847,19 +10871,19 @@
 

 

 

-IBUS_KEY_Greek_beta, macro in IBusKeysyms
+IBUS_KEY_Greek_BETA, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_BETA, macro in IBusKeysyms
+IBUS_KEY_Greek_beta, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_chi, macro in IBusKeysyms
+IBUS_KEY_Greek_CHI, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_CHI, macro in IBusKeysyms
+IBUS_KEY_Greek_chi, macro in IBusKeysyms
 

 

 

@@ -10895,11 +10919,11 @@
 

 

 

-IBUS_KEY_Greek_etaaccent, macro in IBusKeysyms
+IBUS_KEY_Greek_ETAaccent, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_ETAaccent, macro in IBusKeysyms
+IBUS_KEY_Greek_etaaccent, macro in IBusKeysyms
 

 

 

@@ -10907,11 +10931,11 @@
 

 

 

-IBUS_KEY_Greek_GAMMA, macro in IBusKeysyms
+IBUS_KEY_Greek_gamma, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_gamma, macro in IBusKeysyms
+IBUS_KEY_Greek_GAMMA, macro in IBusKeysyms
 

 

 

@@ -10959,11 +10983,11 @@
 

 

 

-IBUS_KEY_Greek_LAMBDA, macro in IBusKeysyms
+IBUS_KEY_Greek_lambda, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_lambda, macro in IBusKeysyms
+IBUS_KEY_Greek_LAMBDA, macro in IBusKeysyms
 

 

 

@@ -10991,11 +11015,11 @@
 

 

 

-IBUS_KEY_Greek_OMEGA, macro in IBusKeysyms
+IBUS_KEY_Greek_omega, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_omega, macro in IBusKeysyms
+IBUS_KEY_Greek_OMEGA, macro in IBusKeysyms
 

 

 

@@ -11015,11 +11039,11 @@
 

 

 

-IBUS_KEY_Greek_omicronaccent, macro in IBusKeysyms
+IBUS_KEY_Greek_OMICRONaccent, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_OMICRONaccent, macro in IBusKeysyms
+IBUS_KEY_Greek_omicronaccent, macro in IBusKeysyms
 

 

 

@@ -11039,11 +11063,11 @@
 

 

 

-IBUS_KEY_Greek_PSI, macro in IBusKeysyms
+IBUS_KEY_Greek_psi, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_psi, macro in IBusKeysyms
+IBUS_KEY_Greek_PSI, macro in IBusKeysyms
 

 

 

@@ -11055,11 +11079,11 @@
 

 

 

-IBUS_KEY_Greek_sigma, macro in IBusKeysyms
+IBUS_KEY_Greek_SIGMA, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_SIGMA, macro in IBusKeysyms
+IBUS_KEY_Greek_sigma, macro in IBusKeysyms
 

 

 

@@ -11083,19 +11107,19 @@
 

 

 

-IBUS_KEY_Greek_UPSILON, macro in IBusKeysyms
+IBUS_KEY_Greek_upsilon, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_upsilon, macro in IBusKeysyms
+IBUS_KEY_Greek_UPSILON, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_UPSILONaccent, macro in IBusKeysyms
+IBUS_KEY_Greek_upsilonaccent, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_upsilonaccent, macro in IBusKeysyms
+IBUS_KEY_Greek_UPSILONaccent, macro in IBusKeysyms
 

 

 

@@ -11111,11 +11135,11 @@
 

 

 

-IBUS_KEY_Greek_XI, macro in IBusKeysyms
+IBUS_KEY_Greek_xi, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Greek_xi, macro in IBusKeysyms
+IBUS_KEY_Greek_XI, macro in IBusKeysyms
 

 

 

@@ -11835,11 +11859,11 @@
 

 

 

-IBUS_KEY_Iacute, macro in IBusKeysyms
+IBUS_KEY_iacute, macro in IBusKeysyms
 

 

 

-IBUS_KEY_iacute, macro in IBusKeysyms
+IBUS_KEY_Iacute, macro in IBusKeysyms
 

 

 

@@ -11851,11 +11875,11 @@
 

 

 

-IBUS_KEY_ibreve, macro in IBusKeysyms
+IBUS_KEY_Ibreve, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ibreve, macro in IBusKeysyms
+IBUS_KEY_ibreve, macro in IBusKeysyms
 

 

 

@@ -11871,11 +11895,11 @@
 

 

 

-IBUS_KEY_idiaeresis, macro in IBusKeysyms
+IBUS_KEY_Idiaeresis, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Idiaeresis, macro in IBusKeysyms
+IBUS_KEY_idiaeresis, macro in IBusKeysyms
 

 

 

@@ -11887,19 +11911,19 @@
 

 

 

-IBUS_KEY_igrave, macro in IBusKeysyms
+IBUS_KEY_Igrave, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Igrave, macro in IBusKeysyms
+IBUS_KEY_igrave, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ihook, macro in IBusKeysyms
+IBUS_KEY_ihook, macro in IBusKeysyms
 

 

 

-IBUS_KEY_ihook, macro in IBusKeysyms
+IBUS_KEY_Ihook, macro in IBusKeysyms
 

 

 

@@ -12115,11 +12139,11 @@
 

 

 

-IBUS_KEY_j, macro in IBusKeysyms
+IBUS_KEY_J, macro in IBusKeysyms
 

 

 

-IBUS_KEY_J, macro in IBusKeysyms
+IBUS_KEY_j, macro in IBusKeysyms
 

 

 

@@ -12167,11 +12191,11 @@
 

 

 

-IBUS_KEY_kana_E, macro in IBusKeysyms
+IBUS_KEY_kana_e, macro in IBusKeysyms
 

 

 

-IBUS_KEY_kana_e, macro in IBusKeysyms
+IBUS_KEY_kana_E, macro in IBusKeysyms
 

 

 

@@ -12203,11 +12227,11 @@
 

 

 

-IBUS_KEY_kana_i, macro in IBusKeysyms
+IBUS_KEY_kana_I, macro in IBusKeysyms
 

 

 

-IBUS_KEY_kana_I, macro in IBusKeysyms
+IBUS_KEY_kana_i, macro in IBusKeysyms
 

 

 

@@ -12391,11 +12415,11 @@
 

 

 

-IBUS_KEY_kana_ya, macro in IBusKeysyms
+IBUS_KEY_kana_YA, macro in IBusKeysyms
 

 

 

-IBUS_KEY_kana_YA, macro in IBusKeysyms
+IBUS_KEY_kana_ya, macro in IBusKeysyms
 

 

 

@@ -12407,11 +12431,11 @@
 

 

 

-IBUS_KEY_kana_YU, macro in IBusKeysyms
+IBUS_KEY_kana_yu, macro in IBusKeysyms
 

 

 

-IBUS_KEY_kana_yu, macro in IBusKeysyms
+IBUS_KEY_kana_YU, macro in IBusKeysyms
 

 

 

@@ -12595,11 +12619,11 @@
 

 

 

-IBUS_KEY_L, macro in IBusKeysyms
+IBUS_KEY_l, macro in IBusKeysyms
 

 

 

-IBUS_KEY_l, macro in IBusKeysyms
+IBUS_KEY_L, macro in IBusKeysyms
 

 

 

@@ -12643,11 +12667,11 @@
 

 

 

-IBUS_KEY_Lacute, macro in IBusKeysyms
+IBUS_KEY_lacute, macro in IBusKeysyms
 

 

 

-IBUS_KEY_lacute, macro in IBusKeysyms
+IBUS_KEY_Lacute, macro in IBusKeysyms
 

 

 

@@ -12675,11 +12699,11 @@
 

 

 

-IBUS_KEY_Lcedilla, macro in IBusKeysyms
+IBUS_KEY_lcedilla, macro in IBusKeysyms
 

 

 

-IBUS_KEY_lcedilla, macro in IBusKeysyms
+IBUS_KEY_Lcedilla, macro in IBusKeysyms
 

 

 

@@ -12771,11 +12795,11 @@
 

 

 

-IBUS_KEY_lstroke, macro in IBusKeysyms
+IBUS_KEY_Lstroke, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Lstroke, macro in IBusKeysyms
+IBUS_KEY_lstroke, macro in IBusKeysyms
 

 

 

@@ -12787,11 +12811,11 @@
 

 

 

-IBUS_KEY_Mabovedot, macro in IBusKeysyms
+IBUS_KEY_mabovedot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_mabovedot, macro in IBusKeysyms
+IBUS_KEY_Mabovedot, macro in IBusKeysyms
 

 

 

@@ -12811,11 +12835,11 @@
 

 

 

-IBUS_KEY_Macedonia_KJE, macro in IBusKeysyms
+IBUS_KEY_Macedonia_kje, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Macedonia_kje, macro in IBusKeysyms
+IBUS_KEY_Macedonia_KJE, macro in IBusKeysyms
 

 

 

@@ -12999,11 +13023,11 @@
 

 

 

-IBUS_KEY_ntilde, macro in IBusKeysyms
+IBUS_KEY_Ntilde, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ntilde, macro in IBusKeysyms
+IBUS_KEY_ntilde, macro in IBusKeysyms
 

 

 

@@ -13035,11 +13059,11 @@
 

 

 

-IBUS_KEY_obarred, macro in IBusKeysyms
+IBUS_KEY_Obarred, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Obarred, macro in IBusKeysyms
+IBUS_KEY_obarred, macro in IBusKeysyms
 

 

 

@@ -13075,19 +13099,19 @@
 

 

 

-IBUS_KEY_ocircumflexbelowdot, macro in IBusKeysyms
+IBUS_KEY_Ocircumflexbelowdot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ocircumflexbelowdot, macro in IBusKeysyms
+IBUS_KEY_ocircumflexbelowdot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_ocircumflexgrave, macro in IBusKeysyms
+IBUS_KEY_Ocircumflexgrave, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ocircumflexgrave, macro in IBusKeysyms
+IBUS_KEY_ocircumflexgrave, macro in IBusKeysyms
 

 

 

@@ -13107,15 +13131,11 @@
 

 

 

-IBUS_KEY_Odiaeresis, macro in IBusKeysyms
-

-

-

 IBUS_KEY_odiaeresis, macro in IBusKeysyms
 

 

 

-IBUS_KEY_odoubleacute, macro in IBusKeysyms
+IBUS_KEY_Odiaeresis, macro in IBusKeysyms
 

 

 

@@ -13123,7 +13143,7 @@
 

 

 

-IBUS_KEY_oe, macro in IBusKeysyms
+IBUS_KEY_odoubleacute, macro in IBusKeysyms
 

 

 

@@ -13131,11 +13151,11 @@
 

 

 

-IBUS_KEY_ogonek, macro in IBusKeysyms
+IBUS_KEY_oe, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ograve, macro in IBusKeysyms
+IBUS_KEY_ogonek, macro in IBusKeysyms
 

 

 

@@ -13143,7 +13163,7 @@
 

 

 

-IBUS_KEY_ohook, macro in IBusKeysyms
+IBUS_KEY_Ograve, macro in IBusKeysyms
 

 

 

@@ -13151,7 +13171,7 @@
 

 

 

-IBUS_KEY_Ohorn, macro in IBusKeysyms
+IBUS_KEY_ohook, macro in IBusKeysyms
 

 

 

@@ -13159,6 +13179,10 @@
 

 

 

+IBUS_KEY_Ohorn, macro in IBusKeysyms
+

+

+

 IBUS_KEY_Ohornacute, macro in IBusKeysyms
 

 

@@ -13167,11 +13191,11 @@
 
 

 

-IBUS_KEY_Ohornbelowdot, macro in IBusKeysyms
+IBUS_KEY_ohornbelowdot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_ohornbelowdot, macro in IBusKeysyms
+IBUS_KEY_Ohornbelowdot, macro in IBusKeysyms
 

 

 

@@ -13183,11 +13207,11 @@
 

 

 

-IBUS_KEY_Ohornhook, macro in IBusKeysyms
+IBUS_KEY_ohornhook, macro in IBusKeysyms
 

 

 

-IBUS_KEY_ohornhook, macro in IBusKeysyms
+IBUS_KEY_Ohornhook, macro in IBusKeysyms
 

 

 

@@ -13199,11 +13223,11 @@
 

 

 

-IBUS_KEY_omacron, macro in IBusKeysyms
+IBUS_KEY_Omacron, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Omacron, macro in IBusKeysyms
+IBUS_KEY_omacron, macro in IBusKeysyms
 

 

 

@@ -13239,11 +13263,11 @@
 

 

 

-IBUS_KEY_Ooblique, macro in IBusKeysyms
+IBUS_KEY_ooblique, macro in IBusKeysyms
 

 

 

-IBUS_KEY_ooblique, macro in IBusKeysyms
+IBUS_KEY_Ooblique, macro in IBusKeysyms
 

 

 

@@ -13275,11 +13299,11 @@
 

 

 

-IBUS_KEY_otilde, macro in IBusKeysyms
+IBUS_KEY_Otilde, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Otilde, macro in IBusKeysyms
+IBUS_KEY_otilde, macro in IBusKeysyms
 

 

 

@@ -13299,11 +13323,11 @@
 

 

 

-IBUS_KEY_P, macro in IBusKeysyms
+IBUS_KEY_p, macro in IBusKeysyms
 

 

 

-IBUS_KEY_p, macro in IBusKeysyms
+IBUS_KEY_P, macro in IBusKeysyms
 

 

 

@@ -13523,11 +13547,11 @@
 

 

 

-IBUS_KEY_q, macro in IBusKeysyms
+IBUS_KEY_Q, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Q, macro in IBusKeysyms
+IBUS_KEY_q, macro in IBusKeysyms
 

 

 

@@ -13623,11 +13647,11 @@
 

 

 

-IBUS_KEY_Racute, macro in IBusKeysyms
+IBUS_KEY_racute, macro in IBusKeysyms
 

 

 

-IBUS_KEY_racute, macro in IBusKeysyms
+IBUS_KEY_Racute, macro in IBusKeysyms
 

 

 

@@ -13643,11 +13667,11 @@
 

 

 

-IBUS_KEY_rcedilla, macro in IBusKeysyms
+IBUS_KEY_Rcedilla, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Rcedilla, macro in IBusKeysyms
+IBUS_KEY_rcedilla, macro in IBusKeysyms
 

 

 

@@ -13751,19 +13775,19 @@
 

 

 

-IBUS_KEY_Scaron, macro in IBusKeysyms
+IBUS_KEY_scaron, macro in IBusKeysyms
 

 

 

-IBUS_KEY_scaron, macro in IBusKeysyms
+IBUS_KEY_Scaron, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Scedilla, macro in IBusKeysyms
+IBUS_KEY_scedilla, macro in IBusKeysyms
 

 

 

-IBUS_KEY_scedilla, macro in IBusKeysyms
+IBUS_KEY_Scedilla, macro in IBusKeysyms
 

 

 

@@ -13811,11 +13835,11 @@
 

 

 

-IBUS_KEY_Serbian_dje, macro in IBusKeysyms
+IBUS_KEY_Serbian_DJE, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Serbian_DJE, macro in IBusKeysyms
+IBUS_KEY_Serbian_dje, macro in IBusKeysyms
 

 

 

@@ -13827,15 +13851,11 @@
 

 

 

-IBUS_KEY_Serbian_je, macro in IBusKeysyms
-

-

-

 IBUS_KEY_Serbian_JE, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Serbian_LJE, macro in IBusKeysyms
+IBUS_KEY_Serbian_je, macro in IBusKeysyms
 

 

 

@@ -13843,7 +13863,7 @@
 

 

 

-IBUS_KEY_Serbian_NJE, macro in IBusKeysyms
+IBUS_KEY_Serbian_LJE, macro in IBusKeysyms
 

 

 

@@ -13851,6 +13871,10 @@
 

 

 

+IBUS_KEY_Serbian_NJE, macro in IBusKeysyms
+

+

+

 IBUS_KEY_Serbian_tshe, macro in IBusKeysyms
 

 

@@ -14671,7 +14695,7 @@
 
 

 

-IBUS_KEY_THORN, macro in IBusKeysyms
+IBUS_KEY_Thorn, macro in IBusKeysyms
 

 

 

@@ -14679,7 +14703,7 @@
 

 

 

-IBUS_KEY_Thorn, macro in IBusKeysyms
+IBUS_KEY_THORN, macro in IBusKeysyms
 

 

 

@@ -14759,11 +14783,11 @@
 

 

 

-IBUS_KEY_Tslash, macro in IBusKeysyms
+IBUS_KEY_tslash, macro in IBusKeysyms
 

 

 

-IBUS_KEY_tslash, macro in IBusKeysyms
+IBUS_KEY_Tslash, macro in IBusKeysyms
 

 

 

@@ -14783,15 +14807,11 @@
 

 

 

-IBUS_KEY_u, macro in IBusKeysyms
-

-

-

 IBUS_KEY_U, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Uacute, macro in IBusKeysyms
+IBUS_KEY_u, macro in IBusKeysyms
 

 

 

@@ -14799,7 +14819,7 @@
 

 

 

-IBUS_KEY_ubelowdot, macro in IBusKeysyms
+IBUS_KEY_Uacute, macro in IBusKeysyms
 

 

 

@@ -14807,7 +14827,7 @@
 

 

 

-IBUS_KEY_ubreve, macro in IBusKeysyms
+IBUS_KEY_ubelowdot, macro in IBusKeysyms
 

 

 

@@ -14815,7 +14835,7 @@
 

 

 

-IBUS_KEY_Ucircumflex, macro in IBusKeysyms
+IBUS_KEY_ubreve, macro in IBusKeysyms
 

 

 

@@ -14823,6 +14843,10 @@
 

 

 

+IBUS_KEY_Ucircumflex, macro in IBusKeysyms
+

+

+

 IBUS_KEY_udiaeresis, macro in IBusKeysyms
 

 

@@ -14839,11 +14863,11 @@
 
 

 

-IBUS_KEY_ugrave, macro in IBusKeysyms
+IBUS_KEY_Ugrave, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ugrave, macro in IBusKeysyms
+IBUS_KEY_ugrave, macro in IBusKeysyms
 

 

 

@@ -14863,19 +14887,19 @@
 

 

 

-IBUS_KEY_uhornacute, macro in IBusKeysyms
+IBUS_KEY_Uhornacute, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Uhornacute, macro in IBusKeysyms
+IBUS_KEY_uhornacute, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Uhornbelowdot, macro in IBusKeysyms
+IBUS_KEY_uhornbelowdot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_uhornbelowdot, macro in IBusKeysyms
+IBUS_KEY_Uhornbelowdot, macro in IBusKeysyms
 

 

 

@@ -14895,11 +14919,11 @@
 

 

 

-IBUS_KEY_Uhorntilde, macro in IBusKeysyms
+IBUS_KEY_uhorntilde, macro in IBusKeysyms
 

 

 

-IBUS_KEY_uhorntilde, macro in IBusKeysyms
+IBUS_KEY_Uhorntilde, macro in IBusKeysyms
 

 

 

@@ -14927,15 +14951,11 @@
 

 

 

-IBUS_KEY_Ukrainian_YI, macro in IBusKeysyms
-

-

-

 IBUS_KEY_Ukrainian_yi, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ukranian_I, macro in IBusKeysyms
+IBUS_KEY_Ukrainian_YI, macro in IBusKeysyms
 

 

 

@@ -14943,7 +14963,7 @@
 

 

 

-IBUS_KEY_Ukranian_JE, macro in IBusKeysyms
+IBUS_KEY_Ukranian_I, macro in IBusKeysyms
 

 

 

@@ -14951,7 +14971,7 @@
 

 

 

-IBUS_KEY_Ukranian_YI, macro in IBusKeysyms
+IBUS_KEY_Ukranian_JE, macro in IBusKeysyms
 

 

 

@@ -14959,6 +14979,10 @@
 

 

 

+IBUS_KEY_Ukranian_YI, macro in IBusKeysyms
+

+

+

 IBUS_KEY_umacron, macro in IBusKeysyms
 

 

@@ -15023,11 +15047,11 @@
 
 

 

-IBUS_KEY_uring, macro in IBusKeysyms
+IBUS_KEY_Uring, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Uring, macro in IBusKeysyms
+IBUS_KEY_uring, macro in IBusKeysyms
 

 

 

@@ -15039,11 +15063,11 @@
 

 

 

-IBUS_KEY_v, macro in IBusKeysyms
+IBUS_KEY_V, macro in IBusKeysyms
 

 

 

-IBUS_KEY_V, macro in IBusKeysyms
+IBUS_KEY_v, macro in IBusKeysyms
 

 

 

@@ -15079,19 +15103,19 @@
 

 

 

-IBUS_KEY_Wacute, macro in IBusKeysyms
+IBUS_KEY_wacute, macro in IBusKeysyms
 

 

 

-IBUS_KEY_wacute, macro in IBusKeysyms
+IBUS_KEY_Wacute, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Wcircumflex, macro in IBusKeysyms
+IBUS_KEY_wcircumflex, macro in IBusKeysyms
 

 

 

-IBUS_KEY_wcircumflex, macro in IBusKeysyms
+IBUS_KEY_Wcircumflex, macro in IBusKeysyms
 

 

 

@@ -15123,11 +15147,11 @@
 

 

 

-IBUS_KEY_xabovedot, macro in IBusKeysyms
+IBUS_KEY_Xabovedot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Xabovedot, macro in IBusKeysyms
+IBUS_KEY_xabovedot, macro in IBusKeysyms
 

 

 

@@ -15147,19 +15171,19 @@
 

 

 

-IBUS_KEY_ybelowdot, macro in IBusKeysyms
+IBUS_KEY_Ybelowdot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ybelowdot, macro in IBusKeysyms
+IBUS_KEY_ybelowdot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Ycircumflex, macro in IBusKeysyms
+IBUS_KEY_ycircumflex, macro in IBusKeysyms
 

 

 

-IBUS_KEY_ycircumflex, macro in IBusKeysyms
+IBUS_KEY_Ycircumflex, macro in IBusKeysyms
 

 

 

@@ -15175,15 +15199,11 @@
 

 

 

-IBUS_KEY_ygrave, macro in IBusKeysyms
-

-

-

 IBUS_KEY_Ygrave, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Yhook, macro in IBusKeysyms
+IBUS_KEY_ygrave, macro in IBusKeysyms
 

 

 

@@ -15191,7 +15211,7 @@
 

 

 

-IBUS_KEY_ytilde, macro in IBusKeysyms
+IBUS_KEY_Yhook, macro in IBusKeysyms
 

 

 

@@ -15199,6 +15219,10 @@
 

 

 

+IBUS_KEY_ytilde, macro in IBusKeysyms
+

+

+

 IBUS_KEY_Z, macro in IBusKeysyms
 

 

@@ -15207,11 +15231,11 @@
 
 

 

-IBUS_KEY_zabovedot, macro in IBusKeysyms
+IBUS_KEY_Zabovedot, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Zabovedot, macro in IBusKeysyms
+IBUS_KEY_zabovedot, macro in IBusKeysyms
 

 

 

@@ -15223,11 +15247,11 @@
 

 

 

-IBUS_KEY_zcaron, macro in IBusKeysyms
+IBUS_KEY_Zcaron, macro in IBusKeysyms
 

 

 

-IBUS_KEY_Zcaron, macro in IBusKeysyms
+IBUS_KEY_zcaron, macro in IBusKeysyms
 

 

 

@@ -15416,11 +15440,11 @@
 

 
L

 

-IBUS_L, macro in ibuskeysyms-compat
+IBUS_l, macro in ibuskeysyms-compat
 

 

 

-IBUS_l, macro in ibuskeysyms-compat
+IBUS_L, macro in ibuskeysyms-compat
 

 

 

@@ -15488,19 +15512,19 @@
 

 

 

-IBUS_Lcaron, macro in ibuskeysyms-compat
+IBUS_lcaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_lcaron, macro in ibuskeysyms-compat
+IBUS_Lcaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_lcedilla, macro in ibuskeysyms-compat
+IBUS_Lcedilla, macro in ibuskeysyms-compat
 

 

 

-IBUS_Lcedilla, macro in ibuskeysyms-compat
+IBUS_lcedilla, macro in ibuskeysyms-compat
 

 

 

@@ -15701,19 +15725,19 @@
 

 
M

 

-IBUS_m, macro in ibuskeysyms-compat
+IBUS_M, macro in ibuskeysyms-compat
 

 

 

-IBUS_M, macro in ibuskeysyms-compat
+IBUS_m, macro in ibuskeysyms-compat
 

 

 

-IBUS_Mabovedot, macro in ibuskeysyms-compat
+IBUS_mabovedot, macro in ibuskeysyms-compat
 

 

 

-IBUS_mabovedot, macro in ibuskeysyms-compat
+IBUS_Mabovedot, macro in ibuskeysyms-compat
 

 

 

@@ -15725,19 +15749,19 @@
 

 

 

-IBUS_Macedonia_GJE, macro in ibuskeysyms-compat
+IBUS_Macedonia_gje, macro in ibuskeysyms-compat
 

 

 

-IBUS_Macedonia_gje, macro in ibuskeysyms-compat
+IBUS_Macedonia_GJE, macro in ibuskeysyms-compat
 

 

 

-IBUS_Macedonia_KJE, macro in ibuskeysyms-compat
+IBUS_Macedonia_kje, macro in ibuskeysyms-compat
 

 

 

-IBUS_Macedonia_kje, macro in ibuskeysyms-compat
+IBUS_Macedonia_KJE, macro in ibuskeysyms-compat
 

 

 

@@ -15858,11 +15882,11 @@
 

 
N

 

-IBUS_N, macro in ibuskeysyms-compat
+IBUS_n, macro in ibuskeysyms-compat
 

 

 

-IBUS_n, macro in ibuskeysyms-compat
+IBUS_N, macro in ibuskeysyms-compat
 

 

 

@@ -15882,19 +15906,19 @@
 

 

 

-IBUS_ncaron, macro in ibuskeysyms-compat
+IBUS_Ncaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ncaron, macro in ibuskeysyms-compat
+IBUS_ncaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ncedilla, macro in ibuskeysyms-compat
+IBUS_ncedilla, macro in ibuskeysyms-compat
 

 

 

-IBUS_ncedilla, macro in ibuskeysyms-compat
+IBUS_Ncedilla, macro in ibuskeysyms-compat
 

 

 

@@ -15967,19 +15991,19 @@
 

 
O

 

-IBUS_O, macro in ibuskeysyms-compat
+IBUS_o, macro in ibuskeysyms-compat
 

 

 

-IBUS_o, macro in ibuskeysyms-compat
+IBUS_O, macro in ibuskeysyms-compat
 

 

 

-IBUS_Oacute, macro in ibuskeysyms-compat
+IBUS_oacute, macro in ibuskeysyms-compat
 

 

 

-IBUS_oacute, macro in ibuskeysyms-compat
+IBUS_Oacute, macro in ibuskeysyms-compat
 

 

 

@@ -15991,11 +16015,11 @@
 

 

 

-IBUS_obelowdot, macro in ibuskeysyms-compat
+IBUS_Obelowdot, macro in ibuskeysyms-compat
 

 

 

-IBUS_Obelowdot, macro in ibuskeysyms-compat
+IBUS_obelowdot, macro in ibuskeysyms-compat
 

 

 

@@ -16055,19 +16079,19 @@
 

 

 

-IBUS_ocaron, macro in ibuskeysyms-compat
+IBUS_Ocaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ocaron, macro in ibuskeysyms-compat
+IBUS_ocaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_ocircumflex, macro in ibuskeysyms-compat
+IBUS_Ocircumflex, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ocircumflex, macro in ibuskeysyms-compat
+IBUS_ocircumflex, macro in ibuskeysyms-compat
 

 

 

@@ -16095,15 +16119,11 @@
 

 

 

-IBUS_ocircumflexhook, macro in ibuskeysyms-compat
-

-

-

 IBUS_Ocircumflexhook, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ocircumflextilde, macro in ibuskeysyms-compat
+IBUS_ocircumflexhook, macro in ibuskeysyms-compat
 

 

 

@@ -16111,7 +16131,7 @@
 

 

 

-IBUS_Odiaeresis, macro in ibuskeysyms-compat
+IBUS_Ocircumflextilde, macro in ibuskeysyms-compat
 

 

 

@@ -16119,7 +16139,7 @@
 

 

 

-IBUS_Odoubleacute, macro in ibuskeysyms-compat
+IBUS_Odiaeresis, macro in ibuskeysyms-compat
 

 

 

@@ -16127,6 +16147,10 @@
 

 

 

+IBUS_Odoubleacute, macro in ibuskeysyms-compat
+

+

+

 IBUS_OE, macro in ibuskeysyms-compat
 

 

@@ -16155,15 +16179,11 @@
 
 

 

-IBUS_ohorn, macro in ibuskeysyms-compat
-

-

-

 IBUS_Ohorn, macro in ibuskeysyms-compat
 

 

 

-IBUS_ohornacute, macro in ibuskeysyms-compat
+IBUS_ohorn, macro in ibuskeysyms-compat
 

 

 

@@ -16171,7 +16191,7 @@
 

 

 

-IBUS_Ohornbelowdot, macro in ibuskeysyms-compat
+IBUS_ohornacute, macro in ibuskeysyms-compat
 

 

 

@@ -16179,6 +16199,10 @@
 

 

 

+IBUS_Ohornbelowdot, macro in ibuskeysyms-compat
+

+

+

 IBUS_Ohorngrave, macro in ibuskeysyms-compat
 

 

@@ -16203,11 +16227,11 @@
 
 

 

-IBUS_Omacron, macro in ibuskeysyms-compat
+IBUS_omacron, macro in ibuskeysyms-compat
 

 

 

-IBUS_omacron, macro in ibuskeysyms-compat
+IBUS_Omacron, macro in ibuskeysyms-compat
 

 

 

@@ -16275,19 +16299,19 @@
 

 

 

-IBUS_oslash, macro in ibuskeysyms-compat
+IBUS_Oslash, macro in ibuskeysyms-compat
 

 

 

-IBUS_Oslash, macro in ibuskeysyms-compat
+IBUS_oslash, macro in ibuskeysyms-compat
 

 

 

-IBUS_otilde, macro in ibuskeysyms-compat
+IBUS_Otilde, macro in ibuskeysyms-compat
 

 

 

-IBUS_Otilde, macro in ibuskeysyms-compat
+IBUS_otilde, macro in ibuskeysyms-compat
 

 

 

@@ -16316,11 +16340,11 @@
 

 

 

-IBUS_Pabovedot, macro in ibuskeysyms-compat
+IBUS_pabovedot, macro in ibuskeysyms-compat
 

 

 

-IBUS_pabovedot, macro in ibuskeysyms-compat
+IBUS_Pabovedot, macro in ibuskeysyms-compat
 

 

 

@@ -16934,11 +16958,11 @@
 

 
R

 

-IBUS_r, macro in ibuskeysyms-compat
+IBUS_R, macro in ibuskeysyms-compat
 

 

 

-IBUS_R, macro in ibuskeysyms-compat
+IBUS_r, macro in ibuskeysyms-compat
 

 

 

@@ -17002,11 +17026,11 @@
 

 

 

-IBUS_racute, macro in ibuskeysyms-compat
+IBUS_Racute, macro in ibuskeysyms-compat
 

 

 

-IBUS_Racute, macro in ibuskeysyms-compat
+IBUS_racute, macro in ibuskeysyms-compat
 

 

 

@@ -17014,19 +17038,19 @@
 

 

 

-IBUS_rcaron, macro in ibuskeysyms-compat
+IBUS_Rcaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_Rcaron, macro in ibuskeysyms-compat
+IBUS_rcaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_Rcedilla, macro in ibuskeysyms-compat
+IBUS_rcedilla, macro in ibuskeysyms-compat
 

 

 

-IBUS_rcedilla, macro in ibuskeysyms-compat
+IBUS_Rcedilla, macro in ibuskeysyms-compat
 

 

 

@@ -17187,11 +17211,11 @@
 

 

 

-IBUS_sacute, macro in ibuskeysyms-compat
+IBUS_Sacute, macro in ibuskeysyms-compat
 

 

 

-IBUS_Sacute, macro in ibuskeysyms-compat
+IBUS_sacute, macro in ibuskeysyms-compat
 

 

 

@@ -17203,15 +17227,11 @@
 

 

 

-IBUS_Scedilla, macro in ibuskeysyms-compat
-

-

-

 IBUS_scedilla, macro in ibuskeysyms-compat
 

 

 

-IBUS_schwa, macro in ibuskeysyms-compat
+IBUS_Scedilla, macro in ibuskeysyms-compat
 

 

 

@@ -17219,7 +17239,7 @@
 

 

 

-IBUS_scircumflex, macro in ibuskeysyms-compat
+IBUS_schwa, macro in ibuskeysyms-compat
 

 

 

@@ -17227,6 +17247,10 @@
 

 

 

+IBUS_scircumflex, macro in ibuskeysyms-compat
+

+

+

 IBUS_script_switch, macro in ibuskeysyms-compat
 

 

@@ -17255,11 +17279,11 @@
 
 

 

-IBUS_Serbian_dje, macro in ibuskeysyms-compat
+IBUS_Serbian_DJE, macro in ibuskeysyms-compat
 

 

 

-IBUS_Serbian_DJE, macro in ibuskeysyms-compat
+IBUS_Serbian_dje, macro in ibuskeysyms-compat
 

 

 

@@ -17279,11 +17303,11 @@
 

 

 

-IBUS_Serbian_LJE, macro in ibuskeysyms-compat
+IBUS_Serbian_lje, macro in ibuskeysyms-compat
 

 

 

-IBUS_Serbian_lje, macro in ibuskeysyms-compat
+IBUS_Serbian_LJE, macro in ibuskeysyms-compat
 

 

 

@@ -17524,11 +17548,11 @@
 

 
T

 

-IBUS_t, macro in ibuskeysyms-compat
+IBUS_T, macro in ibuskeysyms-compat
 

 

 

-IBUS_T, macro in ibuskeysyms-compat
+IBUS_t, macro in ibuskeysyms-compat
 

 

 

@@ -17544,19 +17568,19 @@
 

 

 

-IBUS_tcaron, macro in ibuskeysyms-compat
+IBUS_Tcaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_Tcaron, macro in ibuskeysyms-compat
+IBUS_tcaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_tcedilla, macro in ibuskeysyms-compat
+IBUS_Tcedilla, macro in ibuskeysyms-compat
 

 

 

-IBUS_Tcedilla, macro in ibuskeysyms-compat
+IBUS_tcedilla, macro in ibuskeysyms-compat
 

 

 

@@ -17968,7 +17992,7 @@
 

 

 

-IBUS_THORN, macro in ibuskeysyms-compat
+IBUS_thorn, macro in ibuskeysyms-compat
 

 

 

@@ -17976,7 +18000,7 @@
 

 

 

-IBUS_thorn, macro in ibuskeysyms-compat
+IBUS_THORN, macro in ibuskeysyms-compat
 

 

 

@@ -18161,11 +18185,11 @@
 

 

 

-IBUS_uhornacute, macro in ibuskeysyms-compat
+IBUS_Uhornacute, macro in ibuskeysyms-compat
 

 

 

-IBUS_Uhornacute, macro in ibuskeysyms-compat
+IBUS_uhornacute, macro in ibuskeysyms-compat
 

 

 

@@ -18185,11 +18209,11 @@
 

 

 

-IBUS_Uhornhook, macro in ibuskeysyms-compat
+IBUS_uhornhook, macro in ibuskeysyms-compat
 

 

 

-IBUS_uhornhook, macro in ibuskeysyms-compat
+IBUS_Uhornhook, macro in ibuskeysyms-compat
 

 

 

@@ -18209,11 +18233,11 @@
 

 

 

-IBUS_Ukrainian_I, macro in ibuskeysyms-compat
+IBUS_Ukrainian_i, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ukrainian_i, macro in ibuskeysyms-compat
+IBUS_Ukrainian_I, macro in ibuskeysyms-compat
 

 

 

@@ -18225,19 +18249,19 @@
 

 

 

-IBUS_Ukrainian_YI, macro in ibuskeysyms-compat
+IBUS_Ukrainian_yi, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ukrainian_yi, macro in ibuskeysyms-compat
+IBUS_Ukrainian_YI, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ukranian_I, macro in ibuskeysyms-compat
+IBUS_Ukranian_i, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ukranian_i, macro in ibuskeysyms-compat
+IBUS_Ukranian_I, macro in ibuskeysyms-compat
 

 

 

@@ -18249,11 +18273,11 @@
 

 

 

-IBUS_Ukranian_yi, macro in ibuskeysyms-compat
+IBUS_Ukranian_YI, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ukranian_YI, macro in ibuskeysyms-compat
+IBUS_Ukranian_yi, macro in ibuskeysyms-compat
 

 

 

@@ -18289,11 +18313,11 @@
 

 

 

-IBUS_Uogonek, macro in ibuskeysyms-compat
+IBUS_uogonek, macro in ibuskeysyms-compat
 

 

 

-IBUS_uogonek, macro in ibuskeysyms-compat
+IBUS_Uogonek, macro in ibuskeysyms-compat
 

 

 

@@ -18337,11 +18361,11 @@
 

 

 

-IBUS_utilde, macro in ibuskeysyms-compat
+IBUS_Utilde, macro in ibuskeysyms-compat
 

 

 

-IBUS_Utilde, macro in ibuskeysyms-compat
+IBUS_utilde, macro in ibuskeysyms-compat
 

 

 
V

@@ -18387,11 +18411,11 @@
 
 

 

-IBUS_wacute, macro in ibuskeysyms-compat
+IBUS_Wacute, macro in ibuskeysyms-compat
 

 

 

-IBUS_Wacute, macro in ibuskeysyms-compat
+IBUS_wacute, macro in ibuskeysyms-compat
 

 

 

@@ -18399,11 +18423,11 @@
 

 

 

-IBUS_wcircumflex, macro in ibuskeysyms-compat
+IBUS_Wcircumflex, macro in ibuskeysyms-compat
 

 

 

-IBUS_Wcircumflex, macro in ibuskeysyms-compat
+IBUS_wcircumflex, macro in ibuskeysyms-compat
 

 

 

@@ -18415,11 +18439,11 @@
 

 

 

-IBUS_wgrave, macro in ibuskeysyms-compat
+IBUS_Wgrave, macro in ibuskeysyms-compat
 

 

 

-IBUS_Wgrave, macro in ibuskeysyms-compat
+IBUS_wgrave, macro in ibuskeysyms-compat
 

 

 

@@ -18469,19 +18493,19 @@
 

 
Y

 

-IBUS_y, macro in ibuskeysyms-compat
+IBUS_Y, macro in ibuskeysyms-compat
 

 

 

-IBUS_Y, macro in ibuskeysyms-compat
+IBUS_y, macro in ibuskeysyms-compat
 

 

 

-IBUS_Yacute, macro in ibuskeysyms-compat
+IBUS_yacute, macro in ibuskeysyms-compat
 

 

 

-IBUS_yacute, macro in ibuskeysyms-compat
+IBUS_Yacute, macro in ibuskeysyms-compat
 

 

 

@@ -18529,11 +18553,11 @@
 

 

 

-IBUS_ytilde, macro in ibuskeysyms-compat
+IBUS_Ytilde, macro in ibuskeysyms-compat
 

 

 

-IBUS_Ytilde, macro in ibuskeysyms-compat
+IBUS_ytilde, macro in ibuskeysyms-compat
 

 

 
Z

@@ -18562,11 +18586,11 @@
 
 

 

-IBUS_Zcaron, macro in ibuskeysyms-compat
+IBUS_zcaron, macro in ibuskeysyms-compat
 

 

 

-IBUS_zcaron, macro in ibuskeysyms-compat
+IBUS_Zcaron, macro in ibuskeysyms-compat
 

 

 

@@ -18590,11 +18614,11 @@
 

 

 

-IBUS_Zstroke, macro in ibuskeysyms-compat
+IBUS_zstroke, macro in ibuskeysyms-compat
 

 

 

-IBUS_zstroke, macro in ibuskeysyms-compat
+IBUS_Zstroke, macro in ibuskeysyms-compat
 

 

 

diff -Nru ibus-1.5.4/docs/reference/ibus/html/ch06.html ibus-1.5.5/docs/reference/ibus/html/ch06.html
--- ibus-1.5.4/docs/reference/ibus/html/ch06.html	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/ch06.html	2014-01-14 13:03:37.000000000 +0900
@@ -27,7 +27,7 @@
 ibusdebug — Debug message output.
 
 

-ibuserror
+ibuserror — Error functions and definition.
 

 

 IBusObject — Base object of IBus.
diff -Nru ibus-1.5.4/docs/reference/ibus/html/ibus-IBusEngineSimple.html ibus-1.5.5/docs/reference/ibus/html/ibus-IBusEngineSimple.html
--- ibus-1.5.4/docs/reference/ibus/html/ibus-IBusEngineSimple.html	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/ibus-IBusEngineSimple.html	2014-01-14 13:03:37.000000000 +0900
@@ -44,6 +44,9 @@
                                                          const guint16 *data,
                                                          gint max_seq_len,
                                                          gint n_seqs);
+gboolean            ibus_engine_simple_add_table_by_locale
+                                                        (IBusEngineSimple *simple,
+                                                         const gchar *locale);
@@ -120,6 +123,39 @@
+ +
+
+

ibus_engine_simple_add_table_by_locale ()

+
gboolean            ibus_engine_simple_add_table_by_locale
+                                                        (IBusEngineSimple *simple,
+                                                         const gchar *locale);
+

+Call ibus_engine_simple_add_table() internally by locale. +

+
++++ + + + + + + + + + + + + + + +

simple :

An IBusEngineSimple.

locale :

The locale name. If the locale is NULL, +the current locale is used. [allow-none] +

Returns :

 +TRUE if the locale is matched to the table.
diff -Nru ibus-1.5.4/docs/reference/ibus/html/ibus-IBusKeysyms.html ibus-1.5.5/docs/reference/ibus/html/ibus-IBusKeysyms.html --- ibus-1.5.4/docs/reference/ibus/html/ibus-IBusKeysyms.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/ibus-IBusKeysyms.html 2014-01-14 13:03:37.000000000 +0900 @@ -300,6 +300,7 @@ #define IBUS_KEY_dead_U #define IBUS_KEY_dead_small_schwa #define IBUS_KEY_dead_capital_schwa +#define IBUS_KEY_dead_greek #define IBUS_KEY_First_Virtual_Screen #define IBUS_KEY_Prev_Virtual_Screen #define IBUS_KEY_Next_Virtual_Screen @@ -1646,7 +1647,9 @@ #define IBUS_KEY_ocaron #define IBUS_KEY_obarred #define IBUS_KEY_SCHWA +#define IBUS_KEY_EZH #define IBUS_KEY_schwa +#define IBUS_KEY_ezh #define IBUS_KEY_Lbelowdot #define IBUS_KEY_lbelowdot #define IBUS_KEY_Abelowdot @@ -2146,7 +2149,7 @@ because they are self-explaining.

-see_also: IBusKeymap, IBusHotkeyProfile +see_also: IBusKeymap, IBusHotkeyProfile

@@ -4224,6 +4227,14 @@
+

IBUS_KEY_dead_greek

+
#define IBUS_KEY_dead_greek 0xfe8c
+
+

+

+
+
+

IBUS_KEY_First_Virtual_Screen

#define IBUS_KEY_First_Virtual_Screen 0xfed0
@@ -14992,11 +15003,27 @@
+

IBUS_KEY_EZH

+
#define IBUS_KEY_EZH 0x10001b7
+
+

+

+
+
+

IBUS_KEY_schwa

#define IBUS_KEY_schwa 0x1000259

+
+
+
+

IBUS_KEY_ezh

+
#define IBUS_KEY_ezh 0x1000292
+
+

+

diff -Nru ibus-1.5.4/docs/reference/ibus/html/ibus-ibuserror.html ibus-1.5.5/docs/reference/ibus/html/ibus-ibuserror.html --- ibus-1.5.4/docs/reference/ibus/html/ibus-ibuserror.html 2013-09-20 12:21:55.000000000 +0900 +++ ibus-1.5.5/docs/reference/ibus/html/ibus-ibuserror.html 2014-01-14 13:03:37.000000000 +0900 @@ -31,10 +31,14 @@

ibuserror

-

ibuserror

+

ibuserror — Error functions and definition.
+
+

Stability Level

+Stable, unless otherwise indicated +

Synopsis

#define             IBUS_ERROR
@@ -44,6 +48,7 @@
 

 
Description

 

+This file defines some error functions and definition.
 

 

 

diff -Nru ibus-1.5.4/docs/reference/ibus/html/ibus-ibustypes.html ibus-1.5.5/docs/reference/ibus/html/ibus-ibustypes.html
--- ibus-1.5.4/docs/reference/ibus/html/ibus-ibustypes.html	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/ibus-ibustypes.html	2014-01-14 13:03:37.000000000 +0900
@@ -75,7 +75,8 @@
 

 
Description

 

-This section consists generic types for IBus, including shift/control key modifiers,
+This section consists generic types for IBus, including shift/control key
+modifiers,
 and a rectangle structure.
 

 

diff -Nru ibus-1.5.4/docs/reference/ibus/html/ibus-ibusversion.html ibus-1.5.5/docs/reference/ibus/html/ibus-ibusversion.html
--- ibus-1.5.4/docs/reference/ibus/html/ibus-ibusversion.html	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/ibus-ibusversion.html	2014-01-14 13:03:37.000000000 +0900
@@ -77,7 +77,7 @@
 

 

 
IBUS_MICRO_VERSION

-
#define IBUS_MICRO_VERSION				(4)
+
#define IBUS_MICRO_VERSION				(5)
 

 

 IBus micro version.
diff -Nru ibus-1.5.4/docs/reference/ibus/html/ibus.devhelp2 ibus-1.5.5/docs/reference/ibus/html/ibus.devhelp2
--- ibus-1.5.4/docs/reference/ibus/html/ibus.devhelp2	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/ibus.devhelp2	2014-01-14 13:03:37.000000000 +0900
@@ -309,6 +309,7 @@
     
     
     
+    
     
     
     
@@ -2618,6 +2619,7 @@
     
     
     
+    
     
     
     
@@ -3964,7 +3966,9 @@
     
     
     
+    
     
+    
     
     
     
diff -Nru ibus-1.5.4/docs/reference/ibus/html/index.html ibus-1.5.5/docs/reference/ibus/html/index.html
--- ibus-1.5.4/docs/reference/ibus/html/index.html	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/index.html	2014-01-14 13:03:37.000000000 +0900
@@ -15,7 +15,7 @@
 

 

 

-      Intelligent Input Bus (IBus) 1.5.4 reference manual.
+      Intelligent Input Bus (IBus) 1.5.5 reference manual.
       The latest version of this documentation can be found on-line at
       http://code.google.com/p/ibus.
     

@@ -129,7 +129,7 @@
 ibusdebug — Debug message output.
 
 

-ibuserror
+ibuserror — Error functions and definition.
 

 

 IBusObject — Base object of IBus.
diff -Nru ibus-1.5.4/docs/reference/ibus/html/index.sgml ibus-1.5.5/docs/reference/ibus/html/index.sgml
--- ibus-1.5.4/docs/reference/ibus/html/index.sgml	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/html/index.sgml	2014-01-14 13:03:37.000000000 +0900
@@ -88,7 +88,6 @@
 
 
 
-
 
 
 
@@ -218,7 +217,6 @@
 
 
 
-
 
 
 
@@ -364,6 +362,7 @@
 
 
 
+
 
 
 
@@ -2709,6 +2708,7 @@
 
 
 
+
 
 
 
@@ -4055,7 +4055,9 @@
 
 
 
+
 
+
 
 
 
@@ -4786,6 +4788,7 @@
 
 
 
+
 
 
 
@@ -4931,8 +4934,8 @@
 
 
 
-
+
 
-
 
-
+
+
diff -Nru ibus-1.5.4/docs/reference/ibus/ibus-docs.sgml ibus-1.5.5/docs/reference/ibus/ibus-docs.sgml
--- ibus-1.5.4/docs/reference/ibus/ibus-docs.sgml	2013-09-20 12:18:04.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/ibus-docs.sgml	2014-01-14 13:00:41.000000000 +0900
@@ -5,7 +5,7 @@
   
     IBus Reference Manual
     
-      Intelligent Input Bus (IBus) 1.5.4 reference manual.
+      Intelligent Input Bus (IBus) 1.5.5 reference manual.
       The latest version of this documentation can be found on-line at
       http://code.google.com/p/ibus.
     
diff -Nru ibus-1.5.4/docs/reference/ibus/tmpl/ibuscomposetable.sgml ibus-1.5.5/docs/reference/ibus/tmpl/ibuscomposetable.sgml
--- ibus-1.5.4/docs/reference/ibus/tmpl/ibuscomposetable.sgml	1970-01-01 09:00:00.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/tmpl/ibuscomposetable.sgml	2014-01-14 13:03:37.000000000 +0900
@@ -0,0 +1,41 @@
+
+ibuscomposetable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@data: 
+@max_seq_len: 
+@n_seqs: 
+
+
+
+
+
+
+@locale: 
+@table: 
+
diff -Nru ibus-1.5.4/docs/reference/ibus/tmpl/ibusenginesimple.sgml ibus-1.5.5/docs/reference/ibus/tmpl/ibusenginesimple.sgml
--- ibus-1.5.4/docs/reference/ibus/tmpl/ibusenginesimple.sgml	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/tmpl/ibusenginesimple.sgml	2014-01-14 13:03:37.000000000 +0900
@@ -52,3 +52,13 @@
 @n_seqs: 
 
 
+
+
+
+
+
+@simple: 
+@locale: 
+@Returns: 
+
+
diff -Nru ibus-1.5.4/docs/reference/ibus/tmpl/ibuskeysyms.sgml ibus-1.5.5/docs/reference/ibus/tmpl/ibuskeysyms.sgml
--- ibus-1.5.4/docs/reference/ibus/tmpl/ibuskeysyms.sgml	2013-09-20 12:21:55.000000000 +0900
+++ ibus-1.5.5/docs/reference/ibus/tmpl/ibuskeysyms.sgml	2014-01-14 13:03:37.000000000 +0900
@@ -1835,6 +1835,13 @@
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -11257,10 +11264,24 @@
 
 
 
+
+
+
+
+
+
+
 
 
 
 
+
+
+
+
+
+
+
 
 
 
diff -Nru ibus-1.5.4/engine/Makefile.am ibus-1.5.5/engine/Makefile.am
--- ibus-1.5.4/engine/Makefile.am	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/engine/Makefile.am	2014-01-14 12:59:14.000000000 +0900
@@ -2,8 +2,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2010, Google Inc. All rights reserved.
-# Copyright (c) 2007-2010 Peng Huang 
+# Copyright (c) 2010-2013, Google Inc. All rights reserved.
+# Copyright (c) 2007-2013 Peng Huang 
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -72,6 +72,30 @@
 	$(libibus) \
 	$(NULL)
 
+if ENABLE_GTK3
+noinst_PROGRAMS = test-compose
+endif
+
+test_compose_DEPENDENCIES = \
+        $(libibus) \
+        $(NULL)
+test_compose_SOURCES = \
+        test-compose.vala \
+        $(NULL)
+test_compose_CFLAGS = \
+        $(AM_CFLAGS) \
+        @GTK3_CFLAGS@ \
+        $(NULL)
+test_compose_LDADD = \
+        $(AM_LDADD) \
+        @GTK3_LIBS@ \
+        $(NULL)
+test_compose_VALAFLAGS = \
+        $(AM_VALAFLAGS) \
+        --pkg=gtk+-3.0 \
+        --pkg=ibus-private \
+        $(NULL)
+
 component_DATA = \
 	simple.xml \
 	$(NULL)
diff -Nru ibus-1.5.4/engine/Makefile.in ibus-1.5.5/engine/Makefile.in
--- ibus-1.5.4/engine/Makefile.in	2013-09-20 12:17:26.000000000 +0900
+++ ibus-1.5.5/engine/Makefile.in	2014-01-14 13:00:23.000000000 +0900
@@ -18,8 +18,8 @@
 #
 # ibus - The Input Bus
 #
-# Copyright (c) 2010, Google Inc. All rights reserved.
-# Copyright (c) 2007-2010 Peng Huang 
+# Copyright (c) 2010-2013, Google Inc. All rights reserved.
+# Copyright (c) 2007-2013 Peng Huang 
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -102,9 +102,12 @@
 build_triplet = @build@
 host_triplet = @host@
 libexec_PROGRAMS = ibus-engine-simple$(EXEEXT)
+@ENABLE_GTK3_TRUE@noinst_PROGRAMS = test-compose$(EXEEXT)
 subdir = engine
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am main.c \
-	$(top_srcdir)/depcomp $(srcdir)/ibus_engine_simple_vala.stamp
+	test-compose.c $(top_srcdir)/depcomp \
+	$(srcdir)/ibus_engine_simple_vala.stamp \
+	$(srcdir)/test_compose_vala.stamp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gconf-2.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
@@ -120,7 +123,7 @@
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(componentdir)"
-PROGRAMS = $(libexec_PROGRAMS)
+PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 am_ibus_engine_simple_OBJECTS = ibus_engine_simple-main.$(OBJEXT)
 ibus_engine_simple_OBJECTS = $(am_ibus_engine_simple_OBJECTS)
 am__DEPENDENCIES_1 = $(libibus)
@@ -132,6 +135,11 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(ibus_engine_simple_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
+am_test_compose_OBJECTS = test_compose-test-compose.$(OBJEXT)
+test_compose_OBJECTS = $(am_test_compose_OBJECTS)
+test_compose_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_compose_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -174,8 +182,8 @@
 am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@)
 am__v_VALAC_0 = @echo "  VALAC   " $@;
 am__v_VALAC_1 = 
-SOURCES = $(ibus_engine_simple_SOURCES)
-DIST_SOURCES = $(ibus_engine_simple_SOURCES)
+SOURCES = $(ibus_engine_simple_SOURCES) $(test_compose_SOURCES)
+DIST_SOURCES = $(ibus_engine_simple_SOURCES) $(test_compose_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -523,6 +531,30 @@
 	$(libibus) \
 	$(NULL)
 
+test_compose_DEPENDENCIES = \
+        $(libibus) \
+        $(NULL)
+
+test_compose_SOURCES = \
+        test-compose.vala \
+        $(NULL)
+
+test_compose_CFLAGS = \
+        $(AM_CFLAGS) \
+        @GTK3_CFLAGS@ \
+        $(NULL)
+
+test_compose_LDADD = \
+        $(AM_LDADD) \
+        @GTK3_LIBS@ \
+        $(NULL)
+
+test_compose_VALAFLAGS = \
+        $(AM_VALAFLAGS) \
+        --pkg=gtk+-3.0 \
+        --pkg=ibus-private \
+        $(NULL)
+
 component_DATA = \
 	simple.xml \
 	$(NULL)
@@ -620,10 +652,23 @@
 	echo " rm -f" $$list; \
 	rm -f $$list
 
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
 ibus-engine-simple$(EXEEXT): $(ibus_engine_simple_OBJECTS) $(ibus_engine_simple_DEPENDENCIES) $(EXTRA_ibus_engine_simple_DEPENDENCIES) 
 	@rm -f ibus-engine-simple$(EXEEXT)
 	$(AM_V_CCLD)$(ibus_engine_simple_LINK) $(ibus_engine_simple_OBJECTS) $(ibus_engine_simple_LDADD) $(LIBS)
 
+test-compose$(EXEEXT): $(test_compose_OBJECTS) $(test_compose_DEPENDENCIES) $(EXTRA_test_compose_DEPENDENCIES) 
+	@rm -f test-compose$(EXEEXT)
+	$(AM_V_CCLD)$(test_compose_LINK) $(test_compose_OBJECTS) $(test_compose_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -631,6 +676,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ibus_engine_simple-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_compose-test-compose.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -666,6 +712,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main.c' object='ibus_engine_simple-main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ibus_engine_simple_CFLAGS) $(CFLAGS) -c -o ibus_engine_simple-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+
+test_compose-test-compose.o: test-compose.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_compose_CFLAGS) $(CFLAGS) -MT test_compose-test-compose.o -MD -MP -MF $(DEPDIR)/test_compose-test-compose.Tpo -c -o test_compose-test-compose.o `test -f 'test-compose.c' || echo '$(srcdir)/'`test-compose.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_compose-test-compose.Tpo $(DEPDIR)/test_compose-test-compose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-compose.c' object='test_compose-test-compose.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_compose_CFLAGS) $(CFLAGS) -c -o test_compose-test-compose.o `test -f 'test-compose.c' || echo '$(srcdir)/'`test-compose.c
+
+test_compose-test-compose.obj: test-compose.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_compose_CFLAGS) $(CFLAGS) -MT test_compose-test-compose.obj -MD -MP -MF $(DEPDIR)/test_compose-test-compose.Tpo -c -o test_compose-test-compose.obj `if test -f 'test-compose.c'; then $(CYGPATH_W) 'test-compose.c'; else $(CYGPATH_W) '$(srcdir)/test-compose.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_compose-test-compose.Tpo $(DEPDIR)/test_compose-test-compose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-compose.c' object='test_compose-test-compose.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_compose_CFLAGS) $(CFLAGS) -c -o test_compose-test-compose.obj `if test -f 'test-compose.c'; then $(CYGPATH_W) 'test-compose.c'; else $(CYGPATH_W) '$(srcdir)/test-compose.c'; fi`
 $(srcdir)/main.c: $(srcdir)/ibus_engine_simple_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/ibus_engine_simple_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -675,6 +735,15 @@
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C main.vala
 	$(AM_V_at)mv -f $@-t $@
+$(srcdir)/test-compose.c: $(srcdir)/test_compose_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/test_compose_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/test_compose_vala.stamp; \
+	fi
+$(srcdir)/test_compose_vala.stamp: test-compose.vala
+	$(AM_V_at)rm -f $@ && echo stamp > $@-t
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(test_compose_VALAFLAGS) $(VALAFLAGS) -C test-compose.vala
+	$(AM_V_at)mv -f $@-t $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -825,11 +894,14 @@
 	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f $(srcdir)/ibus_engine_simple_vala.stamp
 	-rm -f $(srcdir)/main.c
+	-rm -f $(srcdir)/test-compose.c
+	-rm -f $(srcdir)/test_compose_vala.stamp
 	-rm -f main.c
+	-rm -f test-compose.c
 clean: clean-am
 
 clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
-	mostlyclean-am
+	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -900,19 +972,20 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-componentDATA \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libexecPROGRAMS \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-componentDATA uninstall-libexecPROGRAMS
+	clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-componentDATA install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libexecPROGRAMS install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-componentDATA \
+	uninstall-libexecPROGRAMS
 
 
 simple.xml: simple.xml.in
diff -Nru ibus-1.5.4/engine/main.c ibus-1.5.5/engine/main.c
--- ibus-1.5.4/engine/main.c	2013-09-20 12:21:56.000000000 +0900
+++ ibus-1.5.5/engine/main.c	2014-01-14 13:03:38.000000000 +0900
@@ -1,11 +1,11 @@
-/* main.c generated by valac 0.20.1, the Vala compiler
+/* main.c generated by valac 0.22.0, the Vala compiler
  * generated from main.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang 
+ * Copyright(c) 2011-2013 Peng Huang 
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -77,7 +77,6 @@
 static IBusEngine* __lambda3_ (Block1Data* _data1_, IBusFactory* factory, const gchar* name);
 static IBusEngine* ___lambda3__ibus_factory_create_engine (IBusFactory* _sender, const gchar* engine_name, gpointer self);
 
-const guint16 cedilla_compose_seqs[36] = {(guint16) IBUS_KEY_dead_acute, (guint16) IBUS_KEY_C, (guint16) 0, (guint16) 0, (guint16) 0, (guint16) 0x00C7, (guint16) IBUS_KEY_dead_acute, (guint16) IBUS_KEY_c, (guint16) 0, (guint16) 0, (guint16) 0, (guint16) 0x00E7, (guint16) IBUS_KEY_Multi_key, (guint16) IBUS_KEY_apostrophe, (guint16) IBUS_KEY_C, (guint16) 0, (guint16) 0, (guint16) 0x00C7, (guint16) IBUS_KEY_Multi_key, (guint16) IBUS_KEY_apostrophe, (guint16) IBUS_KEY_c, (guint16) 0, (guint16) 0, (guint16) 0x00E7, (guint16) IBUS_KEY_Multi_key, (guint16) IBUS_KEY_C, (guint16) IBUS_KEY_apostrophe, (guint16) 0, (guint16) 0, (guint16) 0x00C7, (guint16) IBUS_KEY_Multi_key, (guint16) IBUS_KEY_c, (guint16) IBUS_KEY_apostrophe, (guint16) 0, (guint16) 0, (guint16) 0x00E7};
 
 DummyEngine* dummy_engine_construct (GType object_type) {
 	DummyEngine * self = NULL;
@@ -130,7 +129,7 @@
 
 static void __lambda2_ (IBusBus* bus) {
 	g_return_if_fail (bus != NULL);
-	g_debug ("main.vala:54: bus disconnected");
+	g_debug ("main.vala:39: bus disconnected");
 	ibus_quit ();
 }
 
@@ -148,79 +147,38 @@
 static IBusEngine* __lambda3_ (Block1Data* _data1_, IBusFactory* factory, const gchar* name) {
 	IBusEngine* result = NULL;
 	static const char path[] = "/org/freedesktop/IBus/engine/simple/%d";
+	IBusEngine* engine = NULL;
 	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_;
-	gchar* lang;
-	const gchar* _tmp2_;
-	const gchar* _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_;
-	IBusBus* _tmp10_;
-	GDBusConnection* _tmp11_ = NULL;
-	IBusEngine* _tmp12_;
-	IBusEngine* _tmp13_;
-	IBusEngine* engine;
-	gboolean _tmp14_ = FALSE;
-	const gchar* _tmp15_;
-	gboolean _tmp20_;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	IBusBus* _tmp5_ = NULL;
+	GDBusConnection* _tmp6_ = NULL;
+	IBusEngine* _tmp7_ = NULL;
+	IBusEngine* _tmp8_ = NULL;
+	IBusEngineSimple* simple = NULL;
+	IBusEngineSimple* _tmp9_ = NULL;
 	g_return_val_if_fail (factory != NULL, NULL);
 	g_return_val_if_fail (name != NULL, NULL);
-	_tmp0_ = setlocale (LC_CTYPE, NULL);
-	_tmp1_ = g_strdup (_tmp0_);
-	lang = _tmp1_;
-	_tmp2_ = lang;
-	if (_tmp2_ == NULL) {
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_;
-		_tmp3_ = g_getenv ("LANG");
-		_tmp4_ = g_strdup (_tmp3_);
-		_g_free0 (lang);
-		lang = _tmp4_;
-	}
-	_tmp5_ = name;
-	_tmp6_ = _data1_->id;
-	_data1_->id = _tmp6_ + 1;
-	_tmp7_ = _data1_->id;
-	_tmp8_ = g_strdup_printf (path, _tmp7_);
-	_tmp9_ = _tmp8_;
-	_tmp10_ = _data1_->bus;
-	_tmp11_ = ibus_bus_get_connection (_tmp10_);
-	_tmp12_ = ibus_engine_new_with_type (ibus_engine_simple_get_type (), _tmp5_, _tmp9_, _tmp11_);
-	g_object_ref_sink (_tmp12_);
-	_tmp13_ = _tmp12_;
-	_g_free0 (_tmp9_);
-	engine = _tmp13_;
-	_tmp15_ = lang;
-	if (_tmp15_ != NULL) {
-		const gchar* _tmp16_;
-		gint _tmp17_;
-		gint _tmp18_;
-		gint _tmp19_ = 0;
-		_tmp16_ = lang;
-		_tmp17_ = strlen ("pt_br");
-		_tmp18_ = _tmp17_;
-		_tmp19_ = g_ascii_strncasecmp (_tmp16_, "pt_br", (gsize) _tmp18_);
-		_tmp14_ = _tmp19_ == 0;
-	} else {
-		_tmp14_ = FALSE;
-	}
-	_tmp20_ = _tmp14_;
-	if (_tmp20_) {
-		IBusEngine* _tmp21_;
-		IBusEngineSimple* _tmp22_;
-		IBusEngineSimple* simple;
-		IBusEngineSimple* _tmp23_;
-		_tmp21_ = engine;
-		_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, ibus_engine_simple_get_type (), IBusEngineSimple));
-		simple = _tmp22_;
-		_tmp23_ = simple;
-		ibus_engine_simple_add_table (_tmp23_, cedilla_compose_seqs, 4, G_N_ELEMENTS (cedilla_compose_seqs) / (4 + 2));
-		_g_object_unref0 (simple);
-	}
+	_tmp0_ = name;
+	_tmp1_ = _data1_->id;
+	_data1_->id = _tmp1_ + 1;
+	_tmp2_ = _data1_->id;
+	_tmp3_ = g_strdup_printf (path, _tmp2_);
+	_tmp4_ = _tmp3_;
+	_tmp5_ = _data1_->bus;
+	_tmp6_ = ibus_bus_get_connection (_tmp5_);
+	_tmp7_ = ibus_engine_new_with_type (ibus_engine_simple_get_type (), _tmp0_, _tmp4_, _tmp6_);
+	g_object_ref_sink (_tmp7_);
+	_tmp8_ = _tmp7_;
+	_g_free0 (_tmp4_);
+	engine = _tmp8_;
+	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (engine, ibus_engine_simple_get_type (), IBusEngineSimple));
+	simple = _tmp9_;
+	ibus_engine_simple_add_table_by_locale (simple, NULL);
 	result = engine;
-	_g_free0 (lang);
+	_g_object_unref0 (simple);
 	return result;
 }
 
@@ -235,21 +193,21 @@
 gint _vala_main (gchar** args, int args_length1) {
 	gint result = 0;
 	Block1Data* _data1_;
-	IBusBus* _tmp0_;
-	IBusBus* _tmp1_;
+	IBusBus* _tmp0_ = NULL;
+	IBusBus* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	IBusBus* _tmp3_;
-	IBusBus* _tmp4_;
+	IBusBus* _tmp3_ = NULL;
+	IBusFactory* factory = NULL;
+	IBusBus* _tmp4_ = NULL;
 	GDBusConnection* _tmp5_ = NULL;
-	IBusFactory* _tmp6_;
-	IBusFactory* factory;
-	IBusFactory* _tmp7_;
-	guint flags;
-	IBusBus* _tmp8_;
-	guint _tmp9_;
+	IBusFactory* _tmp6_ = NULL;
+	IBusFactory* _tmp7_ = NULL;
+	guint flags = 0U;
+	guint retval = 0U;
+	IBusBus* _tmp8_ = NULL;
+	guint _tmp9_ = 0U;
 	guint32 _tmp10_ = 0U;
-	guint retval;
-	guint _tmp11_;
+	guint _tmp11_ = 0U;
 	_data1_ = g_slice_new0 (Block1Data);
 	_data1_->_ref_count_ = 1;
 	setlocale (LC_ALL, "");
@@ -260,7 +218,7 @@
 	_tmp1_ = _data1_->bus;
 	_tmp2_ = ibus_bus_is_connected (_tmp1_);
 	if (!_tmp2_) {
-		g_warning ("main.vala:49: ibus-daemon does not exist.");
+		g_warning ("main.vala:34: ibus-daemon does not exist.");
 		result = 1;
 		block1_data_unref (_data1_);
 		_data1_ = NULL;
@@ -283,7 +241,7 @@
 	retval = (guint) _tmp10_;
 	_tmp11_ = retval;
 	if (_tmp11_ == ((guint) 0)) {
-		g_warning ("main.vala:104: Registry bus name org.freedesktop.IBus.Simple failed!");
+		g_warning ("main.vala:79: Registry bus name org.freedesktop.IBus.Simple failed!");
 		result = 1;
 		_g_object_unref0 (factory);
 		block1_data_unref (_data1_);
diff -Nru ibus-1.5.4/engine/main.vala ibus-1.5.5/engine/main.vala
--- ibus-1.5.4/engine/main.vala	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/engine/main.vala	2014-01-14 12:59:14.000000000 +0900
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang 
+ * Copyright(c) 2011-2013 Peng Huang 
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,26 +22,11 @@
 
 using IBus;
 
-const uint16 cedilla_compose_seqs[] = {
-  (uint16) IBus.KEY_dead_acute,   (uint16) IBus.KEY_C,      0,      0,      0,
-    0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
-  (uint16) IBus.KEY_dead_acute,   (uint16) IBus.KEY_c,      0,      0,      0,
-    0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
-  (uint16) IBus.KEY_Multi_key,    (uint16) IBus.KEY_apostrophe,     (uint16) IBus.KEY_C,  0,      0,
-    0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
-  (uint16) IBus.KEY_Multi_key,    (uint16) IBus.KEY_apostrophe,     (uint16) IBus.KEY_c,  0,      0,
-    0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
-  (uint16) IBus.KEY_Multi_key,    (uint16) IBus.KEY_C,  (uint16) IBus.KEY_apostrophe, 0,      0,
-    0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
-  (uint16) IBus.KEY_Multi_key,    (uint16) IBus.KEY_c,  (uint16) IBus.KEY_apostrophe, 0,      0,
-    0x00E7 /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */
-};
-
 class DummyEngine : IBus.EngineSimple {
 }
 
 public int main(string[] args) {
-    Intl.setlocale (LocaleCategory.ALL, "");
+    Intl.setlocale(LocaleCategory.ALL, "");
     IBus.init();
 
     IBus.Bus bus = new IBus.Bus();
@@ -61,11 +46,6 @@
 
     factory.create_engine.connect((factory, name) => {
         const string path = "/org/freedesktop/IBus/engine/simple/%d";
-        string lang = Intl.setlocale (LocaleCategory.CTYPE, null);
-
-        if (lang == null) {
-            lang = Environment.get_variable("LANG");
-        }
 
         IBus.Engine engine = new IBus.Engine.with_type(
             typeof(IBus.EngineSimple), name,
@@ -84,13 +64,8 @@
          * I am not sure if cedilla_compose_seqs is needed for us layout.
          * FIXME: Need to provide the customization.
          */
-        if (lang != null && 
-            lang.ascii_ncasecmp("pt_br", "pt_br".length) == 0) {
-            IBus.EngineSimple? simple = (IBus.EngineSimple ?) engine; 
-            simple.add_table(cedilla_compose_seqs,
-                             4,
-                             cedilla_compose_seqs.length / (4 + 2));
-        }
+        IBus.EngineSimple? simple = (IBus.EngineSimple ?) engine; 
+        simple.add_table_by_locale(null);
 
         return engine;
     });
diff -Nru ibus-1.5.4/engine/simple.xml.in ibus-1.5.5/engine/simple.xml.in
--- ibus-1.5.4/engine/simple.xml.in	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/engine/simple.xml.in	2014-01-14 12:59:14.000000000 +0900
@@ -236,41 +236,53 @@
                         ibus-keyboard
 			99
 		
-		
-			xkb:fr::fra
-			fra
-			GPL
-			Peng Huang <shawn.p.huang@gmail.com>
-			fr
-			French
-			French
-                        ibus-keyboard
-			99
-		
-		
-			xkb:fr:bepo:fra
-			fra
-			GPL
-			Peng Huang <shawn.p.huang@gmail.com>
-			fr
-			bepo
-			French (Bepo, ergonomic, Dvorak way)
-			French (Bepo, ergonomic, Dvorak way)
+                
+                        xkb:fr::fra
+                        fra
+                        GPL
+                        Peng Huang <shawn.p.huang@gmail.com>
+                        fr
+                        French
+                        French
+                        ibus-keyboard
+                        99
+                
+                
+                        xkb:fr:oss:fra
+                        fra
+                        GPL
+                        Peng Huang <shawn.p.huang@gmail.com>
+                        fr
+                        oss
+                        French (alternative)
+                        French (alternative)
+                        ibus-keyboard
+                        99
+                
+                
+                        xkb:fr:bepo:fra
+                        fra
+                        GPL
+                        Peng Huang <shawn.p.huang@gmail.com>
+                        fr
+                        bepo
+                        French (Bepo, ergonomic, Dvorak way)
+                        French (Bepo, ergonomic, Dvorak way)
+                        ibus-keyboard
+                        99
+                
+                
+                        xkb:fr:dvorak:fra
+                        fra
+                        GPL
+                        Peng Huang <shawn.p.huang@gmail.com>
+                        fr
+                        dvorak
+                        French (Dvorak)
+                        French (Dvorak)
                         ibus-keyboard
-			1
-		
-		
-			xkb:fr:dvorak:fra
-			fra
-			GPL
-			Peng Huang <shawn.p.huang@gmail.com>
-			fr
-			dvorak
-			French (Dvorak)
-			French (Dvorak)
-                        ibus-keyboard
-			99
-		
+                        1
+                
 		
 			xkb:de::ger
 			ger
@@ -519,6 +531,18 @@
                         ibus-keyboard
 			99
 		
+                
+                        xkb:sk:qwerty:slo
+                        slo
+                        GPL
+                        Peng Huang <shawn.p.huang@gmail.com>
+                        sk
+                        qwerty
+                        Slovak (qwerty)
+                        Slovak (qwerty)
+                        ibus-keyboard
+                        99
+                
 		
 			xkb:es::spa
 			spa
diff -Nru ibus-1.5.4/engine/test-compose.c ibus-1.5.5/engine/test-compose.c
--- ibus-1.5.4/engine/test-compose.c	1970-01-01 09:00:00.000000000 +0900
+++ ibus-1.5.5/engine/test-compose.c	2014-01-14 13:03:39.000000000 +0900
@@ -0,0 +1,698 @@
+/* test-compose.c generated by valac 0.22.0, the Vala compiler
+ * generated from test-compose.vala, do not modify */
+
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2013 Peng Huang 
+ * Copyright(c) 2013 Takao Fujiwara 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+
+#define TYPE_SEND_KEY_EVENTS_WINDOW (send_key_events_window_get_type ())
+#define SEND_KEY_EVENTS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEND_KEY_EVENTS_WINDOW, SendKeyEventsWindow))
+#define SEND_KEY_EVENTS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SEND_KEY_EVENTS_WINDOW, SendKeyEventsWindowClass))
+#define IS_SEND_KEY_EVENTS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SEND_KEY_EVENTS_WINDOW))
+#define IS_SEND_KEY_EVENTS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SEND_KEY_EVENTS_WINDOW))
+#define SEND_KEY_EVENTS_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SEND_KEY_EVENTS_WINDOW, SendKeyEventsWindowClass))
+
+typedef struct _SendKeyEventsWindow SendKeyEventsWindow;
+typedef struct _SendKeyEventsWindowClass SendKeyEventsWindowClass;
+typedef struct _SendKeyEventsWindowPrivate SendKeyEventsWindowPrivate;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+typedef struct _Block1Data Block1Data;
+typedef struct _Block2Data Block2Data;
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+
+struct _SendKeyEventsWindow {
+	GtkWindow parent_instance;
+	SendKeyEventsWindowPrivate * priv;
+	gint m_index_stride;
+};
+
+struct _SendKeyEventsWindowClass {
+	GtkWindowClass parent_class;
+};
+
+struct _SendKeyEventsWindowPrivate {
+	IBusBus* m_bus;
+	IBusEngine* m_engine;
+	guint16* m_test_compose_table;
+	gint m_test_compose_table_length;
+};
+
+struct _Block1Data {
+	int _ref_count_;
+	SendKeyEventsWindow * self;
+	GtkEntry* entry;
+	gint stride;
+	gint n_loop;
+};
+
+struct _Block2Data {
+	int _ref_count_;
+	SendKeyEventsWindow * self;
+	gint id;
+};
+
+
+static gpointer send_key_events_window_parent_class = NULL;
+
+GType send_key_events_window_get_type (void) G_GNUC_CONST;
+#define SEND_KEY_EVENTS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEND_KEY_EVENTS_WINDOW, SendKeyEventsWindowPrivate))
+enum  {
+	SEND_KEY_EVENTS_WINDOW_DUMMY_PROPERTY
+};
+SendKeyEventsWindow* send_key_events_window_new (void);
+SendKeyEventsWindow* send_key_events_window_construct (GType object_type);
+static Block1Data* block1_data_ref (Block1Data* _data1_);
+static void block1_data_unref (void * _userdata_);
+static void send_key_events_window_ibus_init (SendKeyEventsWindow* self);
+static gboolean __lambda2_ (SendKeyEventsWindow* self, GtkWidget* w, GdkEventFocus* e);
+static void send_key_events_window_set_engine_cb (SendKeyEventsWindow* self, GObject* object, GAsyncResult* res);
+static void _send_key_events_window_set_engine_cb_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self);
+static gboolean ___lambda2__gtk_widget_focus_in_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self);
+static void __lambda3_ (Block1Data* _data1_, GtkEntryBuffer* w, guint p, const gchar* s, guint l);
+static void ___lambda3__gtk_entry_buffer_inserted_text (GtkEntryBuffer* _sender, guint position, const gchar* chars, guint n_chars, gpointer self);
+void send_key_events_window_run_ibus_engine (SendKeyEventsWindow* self);
+static Block2Data* block2_data_ref (Block2Data* _data2_);
+static void block2_data_unref (void * _userdata_);
+static void __lambda4_ (SendKeyEventsWindow* self, IBusBus* bus);
+static void ___lambda4__ibus_bus_disconnected (IBusBus* _sender, gpointer self);
+static IBusEngine* __lambda5_ (Block2Data* _data2_, IBusFactory* factory, const gchar* name);
+static IBusEngine* ___lambda5__ibus_factory_create_engine (IBusFactory* _sender, const gchar* engine_name, gpointer self);
+gint send_key_events_window_main (gchar** args, int args_length1);
+static void _gtk_main_quit_gtk_widget_destroy (GtkWidget* _sender, gpointer self);
+static void send_key_events_window_finalize (GObject* obj);
+
+
+static Block1Data* block1_data_ref (Block1Data* _data1_) {
+	g_atomic_int_inc (&_data1_->_ref_count_);
+	return _data1_;
+}
+
+
+static void block1_data_unref (void * _userdata_) {
+	Block1Data* _data1_;
+	_data1_ = (Block1Data*) _userdata_;
+	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
+		SendKeyEventsWindow * self;
+		self = _data1_->self;
+		_g_object_unref0 (_data1_->entry);
+		_g_object_unref0 (self);
+		g_slice_free (Block1Data, _data1_);
+	}
+}
+
+
+static void _send_key_events_window_set_engine_cb_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
+	send_key_events_window_set_engine_cb (self, source_object, res);
+	g_object_unref (self);
+}
+
+
+static gboolean __lambda2_ (SendKeyEventsWindow* self, GtkWidget* w, GdkEventFocus* e) {
+	gboolean result = FALSE;
+	IBusBus* _tmp0_ = NULL;
+	g_return_val_if_fail (w != NULL, FALSE);
+	g_return_val_if_fail (e != NULL, FALSE);
+	_tmp0_ = self->priv->m_bus;
+	ibus_bus_set_global_engine_async (_tmp0_, "xkbtest:us::eng", -1, NULL, _send_key_events_window_set_engine_cb_gasync_ready_callback, g_object_ref (self));
+	result = FALSE;
+	return result;
+}
+
+
+static gboolean ___lambda2__gtk_widget_focus_in_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
+	gboolean result;
+	result = __lambda2_ (self, _sender, event);
+	return result;
+}
+
+
+static gunichar string_get_char (const gchar* self, glong index) {
+	gunichar result = 0U;
+	glong _tmp0_ = 0L;
+	gunichar _tmp1_ = 0U;
+	g_return_val_if_fail (self != NULL, 0U);
+	_tmp0_ = index;
+	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
+	result = _tmp1_;
+	return result;
+}
+
+
+static void __lambda3_ (Block1Data* _data1_, GtkEntryBuffer* w, guint p, const gchar* s, guint l) {
+	SendKeyEventsWindow * self;
+	guint16* _tmp0_ = NULL;
+	gunichar code = 0U;
+	const gchar* _tmp1_ = NULL;
+	gunichar _tmp2_ = 0U;
+	gint i = 0;
+	gint _tmp3_ = 0;
+	const gchar* _tmp4_ = NULL;
+	guint16* _tmp5_ = NULL;
+	gint _tmp6_ = 0;
+	guint16 _tmp7_ = 0U;
+	gunichar _tmp8_ = 0U;
+	gint _tmp9_ = 0;
+	const gchar* _tmp10_ = NULL;
+	guint16* _tmp11_ = NULL;
+	gint _tmp12_ = 0;
+	guint16 _tmp13_ = 0U;
+	gunichar _tmp14_ = 0U;
+	gint _tmp15_ = 0;
+	gint _tmp16_ = 0;
+	self = _data1_->self;
+	g_return_if_fail (w != NULL);
+	g_return_if_fail (s != NULL);
+	_tmp0_ = self->priv->m_test_compose_table;
+	if (_tmp0_ == NULL) {
+		return;
+	}
+	if ((_data1_->n_loop % 2) == 1) {
+		_data1_->n_loop = 0;
+		return;
+	}
+	_tmp1_ = s;
+	_tmp2_ = string_get_char (_tmp1_, (glong) 0);
+	code = _tmp2_;
+	_tmp3_ = self->m_index_stride;
+	i = _data1_->stride + (_tmp3_ - 1);
+	_tmp5_ = self->priv->m_test_compose_table;
+	_tmp6_ = i;
+	_tmp7_ = _tmp5_[_tmp6_];
+	_tmp8_ = code;
+	if (((gunichar) _tmp7_) == _tmp8_) {
+		_tmp4_ = "OK";
+	} else {
+		_tmp4_ = "NG";
+	}
+	_tmp9_ = i;
+	_tmp10_ = _tmp4_;
+	_tmp11_ = self->priv->m_test_compose_table;
+	_tmp12_ = i;
+	_tmp13_ = _tmp11_[_tmp12_];
+	_tmp14_ = code;
+	g_print ("%05d %s expected: %04X typed: %04X\n", _tmp9_, _tmp10_, (guint) _tmp13_, (guint) _tmp14_);
+	_tmp15_ = self->m_index_stride;
+	_data1_->stride = _data1_->stride + _tmp15_;
+	_tmp16_ = _data1_->n_loop;
+	_data1_->n_loop = _tmp16_ + 1;
+	gtk_entry_set_text (_data1_->entry, "");
+}
+
+
+static void ___lambda3__gtk_entry_buffer_inserted_text (GtkEntryBuffer* _sender, guint position, const gchar* chars, guint n_chars, gpointer self) {
+	__lambda3_ (self, _sender, position, chars, n_chars);
+}
+
+
+SendKeyEventsWindow* send_key_events_window_construct (GType object_type) {
+	SendKeyEventsWindow * self = NULL;
+	Block1Data* _data1_;
+	GtkEntry* _tmp0_ = NULL;
+	GtkEntryBuffer* _tmp1_ = NULL;
+	_data1_ = g_slice_new0 (Block1Data);
+	_data1_->_ref_count_ = 1;
+	self = (SendKeyEventsWindow*) g_object_new (object_type, NULL);
+	_data1_->self = g_object_ref (self);
+	send_key_events_window_ibus_init (self);
+	_tmp0_ = (GtkEntry*) gtk_entry_new ();
+	g_object_ref_sink (_tmp0_);
+	_data1_->entry = _tmp0_;
+	g_signal_connect_object ((GtkWidget*) _data1_->entry, "focus-in-event", (GCallback) ___lambda2__gtk_widget_focus_in_event, self, 0);
+	_data1_->stride = 0;
+	_data1_->n_loop = 0;
+	_tmp1_ = gtk_entry_get_buffer (_data1_->entry);
+	g_signal_connect_data (_tmp1_, "inserted-text", (GCallback) ___lambda3__gtk_entry_buffer_inserted_text, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+	gtk_container_add ((GtkContainer*) self, (GtkWidget*) _data1_->entry);
+	block1_data_unref (_data1_);
+	_data1_ = NULL;
+	return self;
+}
+
+
+SendKeyEventsWindow* send_key_events_window_new (void) {
+	return send_key_events_window_construct (TYPE_SEND_KEY_EVENTS_WINDOW);
+}
+
+
+static Block2Data* block2_data_ref (Block2Data* _data2_) {
+	g_atomic_int_inc (&_data2_->_ref_count_);
+	return _data2_;
+}
+
+
+static void block2_data_unref (void * _userdata_) {
+	Block2Data* _data2_;
+	_data2_ = (Block2Data*) _userdata_;
+	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
+		SendKeyEventsWindow * self;
+		self = _data2_->self;
+		_g_object_unref0 (self);
+		g_slice_free (Block2Data, _data2_);
+	}
+}
+
+
+static void __lambda4_ (SendKeyEventsWindow* self, IBusBus* bus) {
+	g_return_if_fail (bus != NULL);
+	g_debug ("test-compose.vala:83: bus disconnected");
+	ibus_quit ();
+}
+
+
+static void ___lambda4__ibus_bus_disconnected (IBusBus* _sender, gpointer self) {
+	__lambda4_ (self, _sender);
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+	return self ? g_object_ref (self) : NULL;
+}
+
+
+static IBusEngine* __lambda5_ (Block2Data* _data2_, IBusFactory* factory, const gchar* name) {
+	SendKeyEventsWindow * self;
+	IBusEngine* result = NULL;
+	static const char path[] = "/org/freedesktop/IBus/engine/simpletest/%d";
+	const gchar* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	IBusBus* _tmp4_ = NULL;
+	GDBusConnection* _tmp5_ = NULL;
+	IBusEngine* _tmp6_ = NULL;
+	gchar* lang = NULL;
+	const gchar* _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	IBusEngineSimple* simple = NULL;
+	IBusEngine* _tmp11_ = NULL;
+	IBusEngineSimple* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	gint _tmp14_ = 0;
+	gint _tmp15_ = 0;
+	gint _tmp16_ = 0;
+	IBusEngine* _tmp34_ = NULL;
+	IBusEngine* _tmp35_ = NULL;
+	self = _data2_->self;
+	g_return_val_if_fail (factory != NULL, NULL);
+	g_return_val_if_fail (name != NULL, NULL);
+	_tmp0_ = name;
+	_tmp1_ = _data2_->id;
+	_data2_->id = _tmp1_ + 1;
+	_tmp2_ = g_strdup_printf (path, _tmp1_);
+	_tmp3_ = _tmp2_;
+	_tmp4_ = self->priv->m_bus;
+	_tmp5_ = ibus_bus_get_connection (_tmp4_);
+	_tmp6_ = ibus_engine_new_with_type (ibus_engine_simple_get_type (), _tmp0_, _tmp3_, _tmp5_);
+	g_object_ref_sink (_tmp6_);
+	_g_object_unref0 (self->priv->m_engine);
+	self->priv->m_engine = _tmp6_;
+	_g_free0 (_tmp3_);
+	_tmp7_ = setlocale (LC_CTYPE, NULL);
+	_tmp8_ = g_strdup (_tmp7_);
+	lang = _tmp8_;
+	_tmp9_ = lang;
+	if (_tmp9_ == NULL) {
+		gchar* _tmp10_ = NULL;
+		_tmp10_ = g_strdup ("C");
+		_g_free0 (lang);
+		lang = _tmp10_;
+	}
+	_tmp11_ = self->priv->m_engine;
+	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, ibus_engine_simple_get_type (), IBusEngineSimple));
+	simple = _tmp12_;
+	_tmp13_ = lang;
+	_tmp14_ = strlen ("el_gr");
+	_tmp15_ = _tmp14_;
+	_tmp16_ = g_ascii_strncasecmp (_tmp13_, "el_gr", (gsize) _tmp15_);
+	if (_tmp16_ == 0) {
+		IBusEngineSimple* _tmp17_ = NULL;
+		const gchar* _tmp18_ = NULL;
+		gint _tmp19_ = 0;
+		_tmp17_ = simple;
+		_tmp18_ = lang;
+		ibus_engine_simple_add_table_by_locale (_tmp17_, _tmp18_);
+		self->priv->m_test_compose_table = (guint16*) ibus_compose_seqs_el_gr;
+		self->priv->m_test_compose_table_length = G_N_ELEMENTS (ibus_compose_seqs_el_gr);
+		_tmp19_ = ibus_compose_table_el_gr.max_seq_len;
+		self->m_index_stride = _tmp19_ + 2;
+	} else {
+		const gchar* _tmp20_ = NULL;
+		gint _tmp21_ = 0;
+		gint _tmp22_ = 0;
+		gint _tmp23_ = 0;
+		_tmp20_ = lang;
+		_tmp21_ = strlen ("fi_fi");
+		_tmp22_ = _tmp21_;
+		_tmp23_ = g_ascii_strncasecmp (_tmp20_, "fi_fi", (gsize) _tmp22_);
+		if (_tmp23_ == 0) {
+			IBusEngineSimple* _tmp24_ = NULL;
+			const gchar* _tmp25_ = NULL;
+			gint _tmp26_ = 0;
+			_tmp24_ = simple;
+			_tmp25_ = lang;
+			ibus_engine_simple_add_table_by_locale (_tmp24_, _tmp25_);
+			self->priv->m_test_compose_table = (guint16*) ibus_compose_seqs_fi_fi;
+			self->priv->m_test_compose_table_length = G_N_ELEMENTS (ibus_compose_seqs_fi_fi);
+			_tmp26_ = ibus_compose_table_fi_fi.max_seq_len;
+			self->m_index_stride = _tmp26_ + 2;
+		} else {
+			const gchar* _tmp27_ = NULL;
+			gint _tmp28_ = 0;
+			gint _tmp29_ = 0;
+			gint _tmp30_ = 0;
+			_tmp27_ = lang;
+			_tmp28_ = strlen ("pt_br");
+			_tmp29_ = _tmp28_;
+			_tmp30_ = g_ascii_strncasecmp (_tmp27_, "pt_br", (gsize) _tmp29_);
+			if (_tmp30_ == 0) {
+				IBusEngineSimple* _tmp31_ = NULL;
+				const gchar* _tmp32_ = NULL;
+				gint _tmp33_ = 0;
+				_tmp31_ = simple;
+				_tmp32_ = lang;
+				ibus_engine_simple_add_table_by_locale (_tmp31_, _tmp32_);
+				self->priv->m_test_compose_table = (guint16*) ibus_compose_seqs_pt_br;
+				self->priv->m_test_compose_table_length = G_N_ELEMENTS (ibus_compose_seqs_pt_br);
+				_tmp33_ = ibus_compose_table_pt_br.max_seq_len;
+				self->m_index_stride = _tmp33_ + 2;
+			} else {
+				g_warning ("test-compose.vala:123: Run no test. Need another $LANG.");
+			}
+		}
+	}
+	_tmp34_ = self->priv->m_engine;
+	_tmp35_ = _g_object_ref0 (_tmp34_);
+	result = _tmp35_;
+	_g_object_unref0 (simple);
+	_g_free0 (lang);
+	return result;
+}
+
+
+static IBusEngine* ___lambda5__ibus_factory_create_engine (IBusFactory* _sender, const gchar* engine_name, gpointer self) {
+	IBusEngine* result;
+	result = __lambda5_ (self, _sender, engine_name);
+	return result;
+}
+
+
+void send_key_events_window_run_ibus_engine (SendKeyEventsWindow* self) {
+	Block2Data* _data2_;
+	IBusBus* _tmp0_ = NULL;
+	gboolean _tmp1_ = FALSE;
+	IBusBus* _tmp2_ = NULL;
+	IBusFactory* factory = NULL;
+	IBusBus* _tmp3_ = NULL;
+	GDBusConnection* _tmp4_ = NULL;
+	IBusFactory* _tmp5_ = NULL;
+	IBusFactory* _tmp6_ = NULL;
+	IBusComponent* component = NULL;
+	IBusComponent* _tmp7_ = NULL;
+	IBusComponent* _tmp8_ = NULL;
+	IBusEngineDesc* _tmp9_ = NULL;
+	IBusEngineDesc* _tmp10_ = NULL;
+	IBusBus* _tmp11_ = NULL;
+	IBusComponent* _tmp12_ = NULL;
+	g_return_if_fail (self != NULL);
+	_data2_ = g_slice_new0 (Block2Data);
+	_data2_->_ref_count_ = 1;
+	_data2_->self = g_object_ref (self);
+	_tmp0_ = self->priv->m_bus;
+	_tmp1_ = ibus_bus_is_connected (_tmp0_);
+	if (!_tmp1_) {
+		g_warning ("test-compose.vala:78: ibus-daemon does not exist.");
+		block2_data_unref (_data2_);
+		_data2_ = NULL;
+		return;
+	}
+	_tmp2_ = self->priv->m_bus;
+	g_signal_connect_object (_tmp2_, "disconnected", (GCallback) ___lambda4__ibus_bus_disconnected, self, 0);
+	_tmp3_ = self->priv->m_bus;
+	_tmp4_ = ibus_bus_get_connection (_tmp3_);
+	_tmp5_ = ibus_factory_new (_tmp4_);
+	g_object_ref_sink (_tmp5_);
+	factory = _tmp5_;
+	_data2_->id = 0;
+	_tmp6_ = factory;
+	g_signal_connect_data (_tmp6_, "create-engine", (GCallback) ___lambda5__ibus_factory_create_engine, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
+	_tmp7_ = ibus_component_new ("org.freedesktop.IBus.SimpleTest", "Simple Engine Test", "0.0.1", "GPL", "Takao Fujiwara ", "http://code.google.com/p/ibus/", "", "ibus");
+	g_object_ref_sink (_tmp7_);
+	component = _tmp7_;
+	_tmp8_ = component;
+	_tmp9_ = ibus_engine_desc_new ("xkbtest:us::eng", "XKB Test", "XKB Test", "en", "GPL", "Takao Fujiwara ", "ibus-engine", "us");
+	g_object_ref_sink (_tmp9_);
+	_tmp10_ = _tmp9_;
+	ibus_component_add_engine (_tmp8_, _tmp10_);
+	_g_object_unref0 (_tmp10_);
+	_tmp11_ = self->priv->m_bus;
+	_tmp12_ = component;
+	ibus_bus_register_component (_tmp11_, _tmp12_);
+	_g_object_unref0 (component);
+	_g_object_unref0 (factory);
+	block2_data_unref (_data2_);
+	_data2_ = NULL;
+}
+
+
+static void send_key_events_window_ibus_init (SendKeyEventsWindow* self) {
+	IBusBus* _tmp0_ = NULL;
+	g_return_if_fail (self != NULL);
+	ibus_init ();
+	_tmp0_ = ibus_bus_new ();
+	g_object_ref_sink (_tmp0_);
+	_g_object_unref0 (self->priv->m_bus);
+	self->priv->m_bus = _tmp0_;
+}
+
+
+static void send_key_events_window_set_engine_cb (SendKeyEventsWindow* self, GObject* object, GAsyncResult* res) {
+	GError * _inner_error_ = NULL;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (res != NULL);
+	{
+		IBusBus* _tmp0_ = NULL;
+		GAsyncResult* _tmp1_ = NULL;
+		_tmp0_ = self->priv->m_bus;
+		_tmp1_ = res;
+		ibus_bus_set_global_engine_async_finish (_tmp0_, _tmp1_, &_inner_error_);
+		if (_inner_error_ != NULL) {
+			goto __catch0_g_error;
+		}
+	}
+	goto __finally0;
+	__catch0_g_error:
+	{
+		GError* _error_ = NULL;
+		GError* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		_error_ = _inner_error_;
+		_inner_error_ = NULL;
+		_tmp2_ = _error_;
+		_tmp3_ = _tmp2_->message;
+		g_warning ("test-compose.vala:161: %s", _tmp3_);
+		_g_error_free0 (_error_);
+		return;
+	}
+	__finally0:
+	if (_inner_error_ != NULL) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+		g_clear_error (&_inner_error_);
+		return;
+	}
+	{
+		gint i = 0;
+		i = 0;
+		{
+			gboolean _tmp4_ = FALSE;
+			_tmp4_ = TRUE;
+			while (TRUE) {
+				gboolean _tmp5_ = FALSE;
+				gint _tmp8_ = 0;
+				gint _tmp9_ = 0;
+				_tmp5_ = _tmp4_;
+				if (!_tmp5_) {
+					gint _tmp6_ = 0;
+					gint _tmp7_ = 0;
+					_tmp6_ = i;
+					_tmp7_ = self->m_index_stride;
+					i = _tmp6_ + _tmp7_;
+				}
+				_tmp4_ = FALSE;
+				_tmp8_ = i;
+				_tmp9_ = self->priv->m_test_compose_table_length;
+				if (!(_tmp8_ < _tmp9_)) {
+					break;
+				}
+				{
+					gint j = 0;
+					gint _tmp10_ = 0;
+					_tmp10_ = i;
+					j = _tmp10_;
+					{
+						gboolean _tmp11_ = FALSE;
+						_tmp11_ = TRUE;
+						while (TRUE) {
+							gboolean _tmp12_ = FALSE;
+							gint _tmp14_ = 0;
+							gint _tmp15_ = 0;
+							gint _tmp16_ = 0;
+							guint keyval = 0U;
+							guint16* _tmp17_ = NULL;
+							gint _tmp18_ = 0;
+							guint16 _tmp19_ = 0U;
+							guint keycode = 0U;
+							guint modifiers = 0U;
+							guint _tmp20_ = 0U;
+							IBusEngine* _tmp21_ = NULL;
+							guint _tmp22_ = 0U;
+							guint _tmp23_ = 0U;
+							guint _tmp24_ = 0U;
+							gboolean _tmp25_ = FALSE;
+							guint _tmp26_ = 0U;
+							IBusEngine* _tmp27_ = NULL;
+							guint _tmp28_ = 0U;
+							guint _tmp29_ = 0U;
+							guint _tmp30_ = 0U;
+							gboolean _tmp31_ = FALSE;
+							_tmp12_ = _tmp11_;
+							if (!_tmp12_) {
+								gint _tmp13_ = 0;
+								_tmp13_ = j;
+								j = _tmp13_ + 1;
+							}
+							_tmp11_ = FALSE;
+							_tmp14_ = j;
+							_tmp15_ = i;
+							_tmp16_ = self->m_index_stride;
+							if (!(_tmp14_ < (_tmp15_ + (_tmp16_ - 1)))) {
+								break;
+							}
+							_tmp17_ = self->priv->m_test_compose_table;
+							_tmp18_ = j;
+							_tmp19_ = _tmp17_[_tmp18_];
+							keyval = (guint) _tmp19_;
+							keycode = (guint) 0;
+							modifiers = (guint) 0;
+							_tmp20_ = keyval;
+							if (_tmp20_ == ((guint) 0)) {
+								break;
+							}
+							_tmp21_ = self->priv->m_engine;
+							_tmp22_ = keyval;
+							_tmp23_ = keycode;
+							_tmp24_ = modifiers;
+							g_signal_emit_by_name (_tmp21_, "process-key-event", _tmp22_, _tmp23_, _tmp24_, &_tmp25_);
+							_tmp26_ = modifiers;
+							modifiers = _tmp26_ | IBUS_RELEASE_MASK;
+							_tmp27_ = self->priv->m_engine;
+							_tmp28_ = keyval;
+							_tmp29_ = keycode;
+							_tmp30_ = modifiers;
+							g_signal_emit_by_name (_tmp27_, "process-key-event", _tmp28_, _tmp29_, _tmp30_, &_tmp31_);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+
+static void _gtk_main_quit_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
+	gtk_main_quit ();
+}
+
+
+gint send_key_events_window_main (gchar** args, int args_length1) {
+	gint result = 0;
+	SendKeyEventsWindow* window = NULL;
+	SendKeyEventsWindow* _tmp0_ = NULL;
+	setlocale (LC_ALL, "");
+	gtk_init (&args_length1, &args);
+	_tmp0_ = send_key_events_window_new ();
+	g_object_ref_sink (_tmp0_);
+	window = _tmp0_;
+	g_signal_connect ((GtkWidget*) window, "destroy", (GCallback) _gtk_main_quit_gtk_widget_destroy, NULL);
+	gtk_widget_show_all ((GtkWidget*) window);
+	send_key_events_window_run_ibus_engine (window);
+	gtk_main ();
+	result = 0;
+	_g_object_unref0 (window);
+	return result;
+}
+
+
+int main (int argc, char ** argv) {
+	g_type_init ();
+	return send_key_events_window_main (argv, argc);
+}
+
+
+static void send_key_events_window_class_init (SendKeyEventsWindowClass * klass) {
+	send_key_events_window_parent_class = g_type_class_peek_parent (klass);
+	g_type_class_add_private (klass, sizeof (SendKeyEventsWindowPrivate));
+	G_OBJECT_CLASS (klass)->finalize = send_key_events_window_finalize;
+}
+
+
+static void send_key_events_window_instance_init (SendKeyEventsWindow * self) {
+	self->priv = SEND_KEY_EVENTS_WINDOW_GET_PRIVATE (self);
+	self->m_index_stride = 0;
+}
+
+
+static void send_key_events_window_finalize (GObject* obj) {
+	SendKeyEventsWindow * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEND_KEY_EVENTS_WINDOW, SendKeyEventsWindow);
+	_g_object_unref0 (self->priv->m_bus);
+	_g_object_unref0 (self->priv->m_engine);
+	G_OBJECT_CLASS (send_key_events_window_parent_class)->finalize (obj);
+}
+
+
+GType send_key_events_window_get_type (void) {
+	static volatile gsize send_key_events_window_type_id__volatile = 0;
+	if (g_once_init_enter (&send_key_events_window_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (SendKeyEventsWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) send_key_events_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SendKeyEventsWindow), 0, (GInstanceInitFunc) send_key_events_window_instance_init, NULL };
+		GType send_key_events_window_type_id;
+		send_key_events_window_type_id = g_type_register_static (GTK_TYPE_WINDOW, "SendKeyEventsWindow", &g_define_type_info, 0);
+		g_once_init_leave (&send_key_events_window_type_id__volatile, send_key_events_window_type_id);
+	}
+	return send_key_events_window_type_id__volatile;
+}
+
+
+
diff -Nru ibus-1.5.4/engine/test-compose.vala ibus-1.5.5/engine/test-compose.vala
--- ibus-1.5.4/engine/test-compose.vala	1970-01-01 09:00:00.000000000 +0900
+++ ibus-1.5.5/engine/test-compose.vala	2014-01-14 12:59:14.000000000 +0900
@@ -0,0 +1,193 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2013 Peng Huang 
+ * Copyright(c) 2013 Takao Fujiwara 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+using IBus;
+using IBusCompose;
+using Gtk;
+
+class SendKeyEventsWindow : Gtk.Window {
+    private IBus.Bus m_bus;
+    private IBus.Engine m_engine;
+    private uint16* m_test_compose_table;
+    private int m_test_compose_table_length;
+    public int m_index_stride = 0;
+
+    public SendKeyEventsWindow() {
+        /* Call ibus_bus_new() before gtk_widget_show_all() so that
+         * ibus_bus_new_async() is not called in GTK+ IM modules. */
+        ibus_init();
+
+        Gtk.Entry entry = new Gtk.Entry();
+        entry.focus_in_event.connect((w, e) => {
+                m_bus.set_global_engine_async.begin("xkbtest:us::eng",
+                                                    -1, null, set_engine_cb);
+                return false;
+        });
+
+        int stride = 0;
+        int n_loop = 0;
+
+        entry.get_buffer().inserted_text.connect((w, p, s, l) => {
+                if (m_test_compose_table == null)
+                    return;
+
+                /* entry.set_text("") calls this callback. */
+                if (n_loop % 2 == 1) {
+                    n_loop = 0;
+                    return;
+                }
+
+                unichar code = s.get_char(0);
+                int i = stride + (m_index_stride - 1);
+
+                print("%05d %s expected: %04X typed: %04X\n",
+                      i,
+                      m_test_compose_table[i] == code ? "OK" : "NG",
+                      m_test_compose_table[i],
+                      code);
+
+                stride += m_index_stride;
+                n_loop++;
+                entry.set_text("");
+        });
+        add(entry);
+    }
+
+    public void run_ibus_engine() {
+        if (!m_bus.is_connected()) {
+            warning("ibus-daemon does not exist.");
+            return;
+        }
+
+        m_bus.disconnected.connect((bus) => {
+            debug("bus disconnected");
+            IBus.quit();
+        });
+
+        IBus.Factory factory = new IBus.Factory(m_bus.get_connection());
+   
+        int id = 0;
+
+        factory.create_engine.connect((factory, name) => {
+            const string path = "/org/freedesktop/IBus/engine/simpletest/%d";
+            m_engine = new IBus.Engine.with_type(
+                    typeof(IBus.EngineSimple), name,
+                    path.printf(id++), m_bus.get_connection());
+
+            string lang = Intl.setlocale(LocaleCategory.CTYPE, null);
+
+            if (lang == null)
+                lang = "C";
+
+            IBus.EngineSimple simple = (IBus.EngineSimple) m_engine;
+
+            if (lang.ascii_ncasecmp("el_gr", "el_gr".length) == 0) {
+                simple.add_table_by_locale(lang);
+                m_test_compose_table = (uint16 *) IBusCompose.seqs_el_gr;
+                m_test_compose_table_length = IBusCompose.seqs_el_gr.length;
+                m_index_stride = IBusCompose.table_el_gr.max_seq_len + 2;
+            }
+            else if (lang.ascii_ncasecmp("fi_fi", "fi_fi".length) == 0) {
+                simple.add_table_by_locale(lang);
+                m_test_compose_table = (uint16 *) IBusCompose.seqs_fi_fi;
+                m_test_compose_table_length = IBusCompose.seqs_fi_fi.length;
+                m_index_stride = IBusCompose.table_fi_fi.max_seq_len + 2;
+            }
+            else if (lang.ascii_ncasecmp("pt_br", "pt_br".length) == 0) {
+                simple.add_table_by_locale(lang);
+                m_test_compose_table = (uint16 *) IBusCompose.seqs_pt_br;
+                m_test_compose_table_length = IBusCompose.seqs_pt_br.length;
+                m_index_stride = IBusCompose.table_pt_br.max_seq_len + 2;
+            }
+            else {
+                warning("Run no test. Need another $LANG.");
+            }
+            return m_engine;
+        });
+
+        var component = new IBus.Component(
+                "org.freedesktop.IBus.SimpleTest",
+                "Simple Engine Test",
+                "0.0.1",
+                "GPL",
+                "Takao Fujiwara ",
+                "http://code.google.com/p/ibus/",
+                "",
+                "ibus");
+
+        component.add_engine (new IBus.EngineDesc(
+                "xkbtest:us::eng",
+                "XKB Test",
+                "XKB Test",
+                "en",
+                "GPL",
+                "Takao Fujiwara ",
+                "ibus-engine",
+                "us"));
+
+        m_bus.register_component(component);
+    }
+
+    private void ibus_init() {
+        IBus.init();
+
+        m_bus = new IBus.Bus();
+    }
+
+    private void set_engine_cb(GLib.Object? object, GLib.AsyncResult res) {
+        try {
+            m_bus.set_global_engine_async_finish(res);
+        } catch(GLib.Error error) {
+            warning("%s", error.message);
+            return;
+        }
+
+        for (int i = 0; i < m_test_compose_table_length; i += m_index_stride) {
+            for (int j = i; j < i + (m_index_stride - 1); j++) {
+                uint keyval = m_test_compose_table[j];
+                uint keycode = 0;
+                uint modifiers = 0;
+
+                if (keyval == 0)
+                    break;
+
+                m_engine.process_key_event (keyval, keycode, modifiers);
+                modifiers |= IBus.ModifierType.RELEASE_MASK;
+                m_engine.process_key_event (keyval, keycode, modifiers);
+            }
+        }
+    }
+
+    public static int main(string[] args) {
+        Intl.setlocale(LocaleCategory.ALL, "");
+
+        Gtk.init(ref args);
+
+        var window = new SendKeyEventsWindow();
+        window.destroy.connect (Gtk.main_quit);
+        window.show_all();
+        window.run_ibus_engine();
+        Gtk.main();
+        return 0;
+    }
+}
diff -Nru ibus-1.5.4/engine/test_compose_vala.stamp ibus-1.5.5/engine/test_compose_vala.stamp
--- ibus-1.5.4/engine/test_compose_vala.stamp	1970-01-01 09:00:00.000000000 +0900
+++ ibus-1.5.5/engine/test_compose_vala.stamp	2014-01-14 13:03:38.000000000 +0900
@@ -0,0 +1 @@
+stamp
diff -Nru ibus-1.5.4/m4/libtool.m4 ibus-1.5.5/m4/libtool.m4
--- ibus-1.5.4/m4/libtool.m4	2013-09-20 12:17:03.000000000 +0900
+++ ibus-1.5.5/m4/libtool.m4	2014-01-14 13:00:11.000000000 +0900
@@ -1312,7 +1312,7 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -1326,7 +1326,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1345,7 +1348,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
diff -Nru ibus-1.5.4/po/LINGUAS ibus-1.5.5/po/LINGUAS
--- ibus-1.5.4/po/LINGUAS	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/LINGUAS	2014-01-14 12:59:14.000000000 +0900
@@ -1,6 +1,7 @@
 ar
 as
 bg
+bn
 bn_IN
 ca
 da
diff -Nru ibus-1.5.4/po/bn.po ibus-1.5.5/po/bn.po
--- ibus-1.5.4/po/bn.po	1970-01-01 09:00:00.000000000 +0900
+++ ibus-1.5.5/po/bn.po	2014-01-14 12:59:14.000000000 +0900
@@ -0,0 +1,620 @@
+# translation of ibus.pot to Bengali
+# Bengali translation of ibus.
+# Copyright (C) 2008-2013 Peng Huang 
+# This file is distributed under the same license as the ibus package.
+#
+# Translators:
+# Ayesha Akhtar , 2012
+# Mahay Alam Khan , 2012
+# Newton Baidya , 2012
+# Robin Mehdee , 2012
+# Runa Bhattacharjee , 2009
+# runab , 2009, 2010
+msgid ""
+msgstr ""
+"Project-Id-Version: IBus\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
+"Last-Translator: Ayesha Akhtar \n"
+"Language-Team: Bengali \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../setup/setup.ui.h:1
+msgid "Horizontal"
+msgstr "অনুভূমিক"
+
+#: ../setup/setup.ui.h:2
+msgid "Vertical"
+msgstr "উল্লম্ব"
+
+#: ../setup/setup.ui.h:3
+msgid "Top left corner"
+msgstr "উপরে বাঁদিকের কোণায়"
+
+#: ../setup/setup.ui.h:4
+msgid "Top right corner"
+msgstr "উপরে ডানদিকের কোণায়"
+
+#: ../setup/setup.ui.h:5
+msgid "Bottom left corner"
+msgstr "নীচে বাঁদিকের কোণায়"
+
+#: ../setup/setup.ui.h:6
+msgid "Bottom right corner"
+msgstr "নীচে ডানদিকের কোণায়"
+
+#: ../setup/setup.ui.h:7
+msgid "Custom"
+msgstr "স্বনির্ধারিত"
+
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "মেনুর মধ্যে সন্নিবিষ্ট"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "সক্রিয় অবস্থায়"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "সর্বদা"
+
+#: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
+msgid "IBus Preferences"
+msgstr "IBus সংক্রান্ত পছন্দ"
+
+#: ../setup/setup.ui.h:12
+msgid "The shortcut keys for switching to next input method in the list"
+msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+
+#: ../setup/setup.ui.h:13
+msgid "Next input method:"
+msgstr "পরবর্তী ইনপুট পদ্ধতি:"
+
+#: ../setup/setup.ui.h:14
+msgid "The shortcut keys for switching to previous input method in the list"
+msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+
+#: ../setup/setup.ui.h:15
+msgid "Previous input method:"
+msgstr "পূর্ববর্তী ইনপুট পদ্ধতি:"
+
+#: ../setup/setup.ui.h:16
+msgid "..."
+msgstr "..."
+
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
+msgid "The shortcut keys for turning input method on or off"
+msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
+
+#: ../setup/setup.ui.h:18
+msgid "Enable or disable:"
+msgstr "সক্রিয় অথা নিষ্ক্রিয় করুন:"
+
+#: ../setup/setup.ui.h:19
+msgid "Enable:"
+msgstr "সক্রিয়:"
+
+#: ../setup/setup.ui.h:20
+msgid "Disable:"
+msgstr "নিষ্ক্রিয়:"
+
+#: ../setup/setup.ui.h:21
+msgid "Keyboard Shortcuts"
+msgstr "কি-বোর্ড শর্ট-কাট"
+
+#: ../setup/setup.ui.h:22
+msgid "Set the orientation of candidates in lookup table"
+msgstr "লুক-আপ টেবিলের মধ্যে প্রযোজ্য বিকল্পগুলির দিশা নির্ধারণ করুন"
+
+#: ../setup/setup.ui.h:23
+msgid "Candidates orientation:"
+msgstr "নির্বাচিত বস্তুর দিশা:"
+
+#: ../setup/setup.ui.h:24
+msgid "Set the behavior of ibus how to show or hide language bar"
+msgstr "ভাষার বার প্রদর্শন ও আড়াল করার উদ্দেশ্যে ibus-র আচরণ নির্ধারণ করুন"
+
+#: ../setup/setup.ui.h:25
+msgid "Show language panel:"
+msgstr "ভাষার প্যানেল প্রদর্শন করা হবে:"
+
+#: ../setup/setup.ui.h:26
+msgid "Language panel position:"
+msgstr "ভাষার প্যানেলের অবস্থান:"
+
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
+msgid "Show icon on system tray"
+msgstr "সিস্টেম ট্রের মধ্যে আইকন প্রদর্শন করা হবে"
+
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
+msgid "Show input method name on language bar"
+msgstr "ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
+
+#: ../setup/setup.ui.h:29
+msgid "Show input method's name on language bar when check the checkbox"
+msgstr "চেকবক্স নির্বাচিত হলে, ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
+
+#: ../setup/setup.ui.h:30
+msgid "Embed preedit text in application window"
+msgstr "অ্যাপ্লিকেশনের উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
+
+#: ../setup/setup.ui.h:31
+msgid "Embed the preedit text of input method in the application window"
+msgstr "অ্যাপ্লিকেশনের উইন্ডোর মধ্যে ইনপুট পদ্ধতির প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
+
+#: ../setup/setup.ui.h:32
+msgid "Use custom font:"
+msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন:"
+
+#: ../setup/setup.ui.h:33
+msgid "Font and Style"
+msgstr "ফন্ট ও বিন্যাস"
+
+#: ../setup/setup.ui.h:34
+msgid "General"
+msgstr "সাধারণ"
+
+#: ../setup/setup.ui.h:35
+msgid "Add the selected input method into the enabled input methods"
+msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকা যোগ করা হবে"
+
+#: ../setup/setup.ui.h:36
+msgid "Remove the selected input method from the enabled input methods"
+msgstr "সক্রিয় ইনপুট পদ্ধতির তালিকা থেকে নির্বাচিত ইনপুট পদ্ধতিটি মুছে ফেলা হবে"
+
+#: ../setup/setup.ui.h:37
+msgid "Move up the selected input method in the enabled input methods list"
+msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় উপরে স্থানান্তর করা হবে"
+
+#: ../setup/setup.ui.h:38
+msgid "Move down the selected input method in the enabled input methods"
+msgstr "নির্বাচিত ইনপুট পদ্ধতিটি, সক্রিয় ইনপুট পদ্ধতির তালিকায় নীচে স্থানান্তর করা হবে"
+
+#: ../setup/setup.ui.h:39
+msgid "Show information of the selected input method"
+msgstr "নির্বাচিত ইনপুট পদ্ধতি সংক্রান্ত তথ্য প্রদর্শন করা হবে"
+
+#: ../setup/setup.ui.h:40
+msgid "Show setup of the selected input method"
+msgstr "নির্বাচিত ইনপুট মেথডের সেটআপ প্রদর্শন করা হবে"
+
+#: ../setup/setup.ui.h:41
+msgid ""
+"The default input method is the top one in the list.\n"
+"You may use up/down buttons to change it."
+msgstr "তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\nডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।"
+
+#. create im name & icon column
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+msgid "Input Method"
+msgstr "ইনপুট পদ্ধতি"
+
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+msgid "Use system keyboard layout"
+msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে"
+
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+msgid "Use system keyboard (XKB) layout"
+msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস প্রয়োগ করা হবে"
+
+#: ../setup/setup.ui.h:46
+msgid "Keyboard Layout"
+msgstr "কি-বোর্ডের বিন্যাস"
+
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+msgid "Share the same input method among all applications"
+msgstr "সকল অ্যাপ্লিকেশনের মধ্যে একই ইনপুট পদ্ধতি ব্যবহার করা হবে"
+
+#: ../setup/setup.ui.h:48
+msgid "Global input method settings"
+msgstr "ইনপুট পদ্ধতির সার্বজনীন বৈশিষ্ট্য"
+
+#: ../setup/setup.ui.h:49
+msgid "Advanced"
+msgstr "উন্নত"
+
+#: ../setup/setup.ui.h:50
+msgid ""
+"IBus\n"
+"The intelligent input bus\n"
+"Homepage: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
+msgstr "IBus\nবুদ্ধিবিশিষ্ট ইনপুট বাস\nহোম-পেজ: http://code.google.com/p/ibus\n\n\n\n"
+
+#: ../setup/setup.ui.h:57
+msgid "Start ibus on login"
+msgstr "লগ-ইন করার সময় ibus আরম্ভ করা হবে"
+
+#: ../setup/setup.ui.h:58
+msgid "Startup"
+msgstr "প্রারম্ভ"
+
+#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+msgid "About"
+msgstr "পরিচিতি"
+
+#: ../data/ibus.schemas.in.h:1
+msgid "Preload engines"
+msgstr "ইঞ্জিন পূর্বে লোড করা হবে"
+
+#: ../data/ibus.schemas.in.h:2
+msgid "Preload engines during ibus starts up"
+msgstr "ibus আরম্ভের সময় ইঞ্জিনগুলি পূর্বে লোড করা হবে"
+
+#: ../data/ibus.schemas.in.h:3
+msgid "Engines order"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:4
+msgid "Saved engines order in input method list"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:6
+msgid ""
+"Set popup delay milliseconds to show IME switcher window. The default is "
+"400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do "
+"not show the window and switch prev/next engines."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys"
+msgstr "ট্রিগারের শর্টকাট-কি"
+
+#: ../data/ibus.schemas.in.h:11
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
+msgid "Enable shortcut keys"
+msgstr "শর্টকাট কী সক্রিয় করুন"
+
+#: ../data/ibus.schemas.in.h:13
+msgid "The shortcut keys for turning input method on"
+msgstr "ইনপুট পদ্ধতি চালু করার জন্য শর্টকাট কী"
+
+#: ../data/ibus.schemas.in.h:14
+msgid "Disable shortcut keys"
+msgstr "শর্টকাট কী নিষ্ক্রিয় করুন"
+
+#: ../data/ibus.schemas.in.h:15
+msgid "The shortcut keys for turning input method off"
+msgstr "ইনপুট পদ্ধতি বন্ধ করার জন্য শর্টকাট কী"
+
+#: ../data/ibus.schemas.in.h:16
+msgid "Next engine shortcut keys"
+msgstr "পরবর্তী ইঞ্জিনের জন্য শর্টকাট-কি"
+
+#: ../data/ibus.schemas.in.h:17
+msgid "The shortcut keys for switching to the next input method in the list"
+msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+
+#: ../data/ibus.schemas.in.h:18
+msgid "Prev engine shortcut keys"
+msgstr "পূর্ববর্তী ইঞ্জিনের শর্টকাট-কি"
+
+#: ../data/ibus.schemas.in.h:19
+msgid "The shortcut keys for switching to the previous input method"
+msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
+
+#: ../data/ibus.schemas.in.h:20
+msgid "Auto hide"
+msgstr "স্বয়ংক্রিয়ভাবে আড়াল করা হবে"
+
+#: ../data/ibus.schemas.in.h:21
+msgid ""
+"The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
+"Always show"
+msgstr "ভাষা প্রদর্শনের প্যানেলের আচরণ। 0 (০) = মেনুর মধ্যে সন্নিবেশ করা হবে, 1 (১) = স্বয়ংক্রিয়ভাবে আড়াল করা হবে, 2 (২) = সর্বদা প্রদর্শন করা হবে"
+
+#: ../data/ibus.schemas.in.h:22
+msgid "Language panel position"
+msgstr "ভাষার প্যানেলের অবস্থান"
+
+#: ../data/ibus.schemas.in.h:23
+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 = নীচে বাঁদিকের কোণায়, 3 = নীচে ডানদিকের কোণায়, 4 = স্বনির্ধারিত"
+
+#: ../data/ibus.schemas.in.h:24
+msgid "Orientation of lookup table"
+msgstr "লুক-আপ টেবিলের দিশা"
+
+#: ../data/ibus.schemas.in.h:25
+msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
+msgstr "লুক-আপ টেবিলের দিশা। 0 (০) = অনুভুমিক, 1 (১) = উল্লম্ব"
+
+#: ../data/ibus.schemas.in.h:27
+msgid "Show input method name"
+msgstr "ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
+
+#: ../data/ibus.schemas.in.h:31
+msgid "Use custom font"
+msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন"
+
+#: ../data/ibus.schemas.in.h:32
+msgid "Use custom font name for language panel"
+msgstr "ভাষার প্যানেলের জন্য স্বনির্ধারিত ফন্টের নাম ব্যবহার করা হবে"
+
+#: ../data/ibus.schemas.in.h:33
+msgid "Custom font"
+msgstr "স্বনির্ধারিত ফন্ট"
+
+#: ../data/ibus.schemas.in.h:34
+msgid "Custom font name for language panel"
+msgstr "ভাষার প্যানেলের জন্য ব্যবহারযোগ্য স্বনির্ধারিত ফন্টের নাম"
+
+#: ../data/ibus.schemas.in.h:35
+msgid "Embed Preedit Text"
+msgstr "প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
+
+#: ../data/ibus.schemas.in.h:36
+msgid "Embed Preedit Text in Application Window"
+msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
+
+#: ../data/ibus.schemas.in.h:37
+msgid "Use global input method"
+msgstr "সার্বজনীন ইনপুট পদ্ধতি "
+
+#: ../data/ibus.schemas.in.h:39
+msgid "Enable input method by default"
+msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধতি সক্রিয় করা হবে"
+
+#: ../data/ibus.schemas.in.h:40
+msgid "Enable input method by default when the application gets input focus"
+msgstr "ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি সক্রিয় করা হবে"
+
+#: ../data/ibus.schemas.in.h:41
+msgid "DConf preserve name prefixes"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:42
+msgid "Prefixes of DConf keys to stop name conversion"
+msgstr ""
+
+#: ../ibus/_config.py.in:41
+msgid ""
+"Copyright (c) 2007-2010 Peng Huang\n"
+"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr "স্বত্বাধিকার (c) ২০০৭-২০০৯ পেং হুয়াং\nস্বত্বাধিকার (c) ২০০৭-২০০৯ Red Hat, Inc."
+
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
+msgid "Other"
+msgstr "অন্যান্য"
+
+#: ../setup/engineabout.py:68
+#, python-format
+msgid "Language: %s\n"
+msgstr "ভাষা: %s\n"
+
+#: ../setup/engineabout.py:71
+#, python-format
+msgid "Keyboard layout: %s\n"
+msgstr "কি-বোর্ড বিন্যাস: %s\n"
+
+#: ../setup/engineabout.py:74
+#, python-format
+msgid "Author: %s\n"
+msgstr "নির্মাতা: %s\n"
+
+#: ../setup/engineabout.py:77
+msgid "Description:\n"
+msgstr "বিবরণ:\n"
+
+#: ../setup/enginecombobox.py:130
+msgid "Select an input method"
+msgstr "একটি ইনপুট পদ্ধতি নির্বাচন করুন"
+
+#: ../setup/enginetreeview.py:94
+msgid "Kbd"
+msgstr "Kbd"
+
+#: ../setup/ibus-setup.desktop.in.h:2
+msgid "Set IBus Preferences"
+msgstr "IBus সংক্রান্ত পছন্দ নির্ধারণ করুন"
+
+#: ../setup/keyboardshortcut.py:54
+msgid "Keyboard shortcuts"
+msgstr "কি-বোর্ড শর্ট-কাট"
+
+#: ../setup/keyboardshortcut.py:65
+msgid "Key code:"
+msgstr "কি-র কোড:"
+
+#: ../setup/keyboardshortcut.py:80
+msgid "Modifiers:"
+msgstr "পরিবর্তক:"
+
+#: ../setup/keyboardshortcut.py:250
+msgid ""
+"Please press a key (or a key combination).\n"
+"The dialog will be closed when the key is released."
+msgstr "অনুগ্রহ করে কোনো কি (অথবা কি সংকলন) টিপুন।\nকি মুক্ত করা হলে এই ডায়লগ বক্সটি বন্ধ করা হবে।"
+
+#: ../setup/keyboardshortcut.py:252
+msgid "Please press a key (or a key combination)"
+msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
+
+#: ../setup/main.py:98 ../setup/main.py:397
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
+
+#: ../setup/main.py:331
+msgid "The IBus daemon is not running. Do you wish to start it?"
+msgstr ""
+
+#: ../setup/main.py:352
+msgid ""
+"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
+"  export GTK_IM_MODULE=ibus\n"
+"  export XMODIFIERS=@im=ibus\n"
+"  export QT_IM_MODULE=ibus"
+msgstr ""
+
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
+#, python-format
+msgid "IBus daemon could not be started in %d seconds"
+msgstr ""
+
+#: ../setup/main.py:378
+#, python-format
+msgid "Select keyboard shortcut for %s"
+msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
+
+#: ../setup/main.py:379
+msgid "switching input methods"
+msgstr ""
+
+#: ../tools/main.vala:42
+msgid "List engine name only"
+msgstr ""
+
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
+#, c-format
+msgid "Can't connect to IBus.\n"
+msgstr ""
+
+#: ../tools/main.vala:84
+#, c-format
+msgid "language: %s\n"
+msgstr ""
+
+#: ../tools/main.vala:152
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
+
+#: ../tools/main.vala:160
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:165
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
+
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr ""
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:307
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:337
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:657
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:662
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
+
+#: ../ui/gtk3/panel.vala:666
+msgid "translator-credits"
+msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
+
+#: ../ui/gtk3/panel.vala:698
+msgid "Restart"
+msgstr "পুনরারম্ভ"
diff -Nru ibus-1.5.4/po/bn_IN.po ibus-1.5.5/po/bn_IN.po
--- ibus-1.5.4/po/bn_IN.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/bn_IN.po	2014-01-14 12:59:14.000000000 +0900
@@ -1,19 +1,20 @@
 # translation of ibus.pot to Bengali (India)
 # Bengali (India) translation of ibus.
-# Copyright (C) 2008 Peng Huang 
+# Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Runa Bhattacharjee , 2009.
-# Runa Bhattacharjee , 2009, 2010.
-#   , 2012.
+# Runa Bhattacharjee , 2009
+# runab , 2009, 2010
+# runa , 2012
+# bnin , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2012-10-15 11:55+0900\n"
-"PO-Revision-Date: 2012-11-19 14:18+0000\n"
-"Last-Translator: runa \n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
+"Last-Translator: bnin \n"
 "Language-Team: Bengali (India) \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,7 +86,7 @@
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ইনপুট পদ্ধতি খোলা ও বন্ধ করার জন্য প্রয়োজনীয় শর্ট-কাট কি নির্ধারণ করুন"
 
@@ -125,11 +126,11 @@
 msgid "Language panel position:"
 msgstr "ভাষার প্যানেলের অবস্থান:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "সিস্টেম ট্রের মধ্যে আইকন প্রদর্শন করা হবে"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "ভাষার বারের মধ্যে ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
@@ -188,15 +189,15 @@
 msgstr "তালিকার শীর্ষে উপস্থিত ইনপুট পদ্ধতিটি ডিফল্ট পদ্ধতি রূপে ধার্য করা হবে।\nডিফল্ট পদ্ধতি পরিবর্তনের জন্য উপর/নীচে চিহ্নকারী বাটনগুলি প্রয়োগ করা যাবে।"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ইনপুট পদ্ধতি"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "সিস্টেম কি-বোর্ড বিন্যাস প্রয়োগ করা হবে"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "সিস্টেম কি-বোর্ড (XKB) বিন্যাস প্রয়োগ করা হবে"
 
@@ -204,7 +205,7 @@
 msgid "Keyboard Layout"
 msgstr "কি-বোর্ডের বিন্যাস"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "সকল অ্যাপ্লিকেশনের মধ্যে একই ইনপুট পদ্ধতি ব্যবহার করা হবে"
 
@@ -238,18 +239,6 @@
 msgid "About"
 msgstr "পরিচিতি"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "ইনপুট পদ্ধতির পরিকাঠামো"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus ইনপুট পদ্ধতির পরিকাঠামো আরম্ভ করা হবে"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "ইঞ্জিন পূর্বে লোড করা হবে"
@@ -267,114 +256,139 @@
 msgstr "ইনপুট পদ্ধতির তালিকায় সংরক্ষিত ইঞ্জিনের অনুক্রম"
 
 #: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr "IME স্যুইচার উইন্ডোর ক্ষেত্রে পপ-অাপ মিলিসেকেন্ড বিলম্ব"
+
+#: ../data/ibus.schemas.in.h:6
+msgid ""
+"Set popup delay milliseconds to show IME switcher window. The default is "
+"400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do "
+"not show the window and switch prev/next engines."
+msgstr "IME স্যুইচার উইন্ডো দেখাতে পপ-অাপ বিলম্ব মিলিসেকেন্ড সেট করুন। ডিফল্ট হল 400. 0 = উইন্ডো সংগে সংগে দেখান। 0 < মিলিসেকেন্ড বিলম্ব। 0 > উইন্ডো দেখাবেন না এবং পূর্ববর্তী এবং পরবর্তী ইঞ্জিনে পাল্টান।"
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "সংরক্ষিত সংস্করণ নম্বর"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr "পূর্বে ইনস্টল করা ibus এবং বর্তমান ibus এর একটির মধ্যে পার্থক্য যাচাই করতে সংরক্ষিত সংস্করণ নম্বর ব্যবহৃত হবে।"
+
+#: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
 msgstr "ট্রিগারের শর্টকাট-কি"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:11
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr "gtk_accelerator_parse এর ক্ষেত্রে শর্টকাট কী ট্রিগার"
+
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "শর্ট-কাট কি সক্রিয় করুন"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "ইনপুট পদ্ধতি চালু করার জন্য ব্যবহৃত শর্ট-কাট কি"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "শর্ট-কাট কি নিষ্ক্রিয় করুন"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "ইনপুট পদ্ধতি বন্ধ করার জন্য ব্যবহৃত শর্ট-কাট কি"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "পরবর্তী ইঞ্জিনের জন্য শর্টকাট-কি"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "তালিকায় উপস্থিত পরবর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "পূর্ববর্তী ইঞ্জিনের শর্টকাট-কি"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "তালিকায় উপস্থিত পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য প্রযোজ্য শর্ট-কাট কি"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "স্বয়ংক্রিয়ভাবে আড়াল করা হবে"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr "ভাষা প্রদর্শনের প্যানেলের আচরণ। 0 (০) = মেনুর মধ্যে সন্নিবেশ করা হবে, 1 (১) = স্বয়ংক্রিয়ভাবে আড়াল করা হবে, 2 (২) = সর্বদা প্রদর্শন করা হবে"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "ভাষার প্যানেলের অবস্থান"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:23
 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 = নীচে বাঁদিকের কোণায়, 3 = নীচে ডানদিকের কোণায়, 4 = স্বনির্ধারিত"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "লুক-আপ টেবিলের দিশা"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "লুক-আপ টেবিলের দিশা। 0 (০) = অনুভুমিক, 1 (১) = উল্লম্ব"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "ইনপুট পদ্ধতির নাম প্রদর্শন করা হবে"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "স্বনির্ধারিত ফন্ট প্রয়োগ করুন"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য স্বনির্ধারিত ফন্টের নাম ব্যবহার করা হবে"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "স্বনির্ধারিত ফন্ট"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "ভাষার প্যানেলের জন্য ব্যবহারযোগ্য স্বনির্ধারিত ফন্টের নাম"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "অ্যাপ্লিকেশন উইন্ডোর মধ্যে প্রি-এডিট টেক্সট সন্নিবেশ করা হবে"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "সার্বজনীন ইনপুট পদ্ধতি "
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "ডিফল্ট অবস্থায় ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ইনপুট প্রাপ্ত করার উদ্দেশ্যে অ্যাপ্লিকেশনে ফোকাস করা হলে, ডিফল্ট রূপে ইনপুট পদ্ধতি সক্রিয় করা হবে"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "DConf দ্বারা নেম প্রেফিক্স সংরক্ষণ করা হবে"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "নেম পরিবর্তন প্রতিরোধ করার জন্য DConf-কির প্রেফিক্স"
 
@@ -388,30 +402,30 @@
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "ভাষা: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "কি-বোর্ড বিন্যাস: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "নির্মাতা: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "বিবরণ:\n"
 
-#: ../setup/enginecombobox.py:135
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "একটি ইনপুট পদ্ধতি নির্বাচন করুন"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -431,27 +445,19 @@
 msgid "Modifiers:"
 msgstr "পরিবর্তক:"
 
-#: ../setup/keyboardshortcut.py:251
+#: ../setup/keyboardshortcut.py:250
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr "অনুগ্রহ করে কোনো কি (অথবা কি সংকলন) টিপুন।\nকি মুক্ত করা হলে এই ডায়লগ বক্সটি বন্ধ করা হবে।"
 
-#: ../setup/keyboardshortcut.py:253
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "অনুগ্রহ করে একটি কি (অথবা কি সংকলন) টিপুন"
 
-#: ../setup/main.py:87
-msgid "trigger"
-msgstr "ট্রিগার"
-
-#: ../setup/main.py:88
-msgid "enable"
-msgstr "সক্রিয় করুন"
-
-#: ../setup/main.py:89
-msgid "disable"
-msgstr "নিষ্ক্রিয় করুন"
+#: ../setup/main.py:98 ../setup/main.py:397
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr "পূর্ববর্তী ইনপুট পদ্ধতিতে পরিবর্তনের জন্য শিফ্ট সমেত শর্ট-কাট কি ব্যবহার করুন"
 
 #: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
@@ -476,73 +482,137 @@
 msgid "Select keyboard shortcut for %s"
 msgstr "%s-র জন্য কি-বোর্ড শর্ট-কাট ধার্য করুন"
 
-#: ../tools/main.vala:40
+#: ../setup/main.py:379
+msgid "switching input methods"
+msgstr "ইনপুট পদ্ধতি পরিবর্তন"
+
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "শুধুমাত্র ইঞ্জিনের নামের তালিকা প্রদর্শন করা হবে"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "command [OPTIONS]"
-
-#: ../tools/main.vala:56 ../tools/main.vala:138 ../tools/main.vala:148
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBus-র সাথে সংযোগ করতে ব্যর্থ।\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "ভাষা: %s\n"
 
-#: ../tools/main.vala:100
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "কোনো ইঞ্জিন নির্ধারিত হয়নি।\n"
 
-#: ../tools/main.vala:108
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "গ্লোবাল ইঞ্জিন নির্ধারণ করতে ব্যর্থ।\n"
 
-#: ../tools/main.vala:113
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "গ্লোবাল ইঞ্জিন প্রাপ্ত করতে ব্যর্থ।\n"
 
-#: ../tools/main.vala:120
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "সিস্টেম রেজিস্ট্রি ক্যাশ পড়ুন।"
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "রেজিস্ট্রি ক্যাশ FILE পড়ুন।"
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
 #, c-format
-msgid "Switch xkb layout to %s failed."
-msgstr "xkb বিন্যাসকে %s-এ পরিবর্তন করতে ব্যর্থ।"
+msgid "The registry cache is invalid.\n"
+msgstr "রেজিস্ট্রি ক্যাশ অবৈধ।\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "সিস্টেম রেজিস্ট্রি ক্যাশ লিখুন।"
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "রেজিস্ট্রি ক্যাশ FILE লিখুন।"
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr "ইঞ্জিন সেট করুন বা পান"
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon থেকে প্রস্থান করুন"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr "উপলব্ধ ইঞ্জিনগুলি দেখান"
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr "(বাস্তবায়িত নয়)"
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon বন্ধ করে অাবার চালু করুন"
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr "সংস্করণ দেখান"
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr "রেজিস্ট্রি ক্যাশের বিষয়বস্তু দেখান"
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr "রেজিস্ট্রি ক্যাশ তৈরি করুন"
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon এর D-Bus ঠিকানা প্রিন্ট করুন"
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr "এই তথ্য দেখান"
 
-#: ../tools/main.vala:185
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "ব্যবহারপ্রণালী: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:186
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "কমান্ড:\n"
 
-#: ../tools/main.vala:208
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s একটি অজানা কমান্ড!\n"
 
-#: ../ui/gtk3/panel.vala:361
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr "IBus অাপডেট"
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr "Super+space হল এখন ডিফল্ট হট-কী।"
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "স্বত্বাধিকার (c) ২০০৭-২০১২ পেং হুয়াং\n"
 
-#: ../ui/gtk3/panel.vala:366
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "Linux/Unix-র সাথে ব্যবহারযোগ্য বুদ্ধিবিশিষ্ট ইনপুট বাস হল IBus"
 
-#: ../ui/gtk3/panel.vala:370
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "রুণা ভট্টাচার্য্য (runab@fedoraproject.org)"
 
-#: ../ui/gtk3/panel.vala:402
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "পুনরারম্ভ"
diff -Nru ibus-1.5.4/po/da.po ibus-1.5.5/po/da.po
--- ibus-1.5.4/po/da.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/da.po	2014-01-14 12:59:14.000000000 +0900
@@ -1,22 +1,22 @@
 # translation of ibus.pot to Danish
 # Danish translation of ibus.
-# Copyright (C) 2008 Peng Huang 
+# Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Kris Thomsen , 2009, 2011.
+# Kris Thomsen , 2009, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:14+0900\n"
-"PO-Revision-Date: 2011-07-18 20:16+0000\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
 "Last-Translator: kristho \n"
 "Language-Team: Danish \n"
-"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../setup/setup.ui.h:1
@@ -28,37 +28,37 @@
 msgstr "Vertikal"
 
 #: ../setup/setup.ui.h:3
-msgid "Embedded in menu"
-msgstr "Indlejret i menu"
-
-#: ../setup/setup.ui.h:4
-msgid "When active"
-msgstr "Når aktiv"
-
-#: ../setup/setup.ui.h:5
-msgid "Always"
-msgstr "Altid"
-
-#: ../setup/setup.ui.h:6
 msgid "Top left corner"
 msgstr "Øverste venstre hjørne"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Øverste højre hjørne"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
 msgstr "Nederste venstre hjørne"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
 msgstr "Nederste højre hjørne"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Brugertilpasset"
 
+#: ../setup/setup.ui.h:8
+msgid "Embedded in menu"
+msgstr "Indlejret i menu"
+
+#: ../setup/setup.ui.h:9
+msgid "When active"
+msgstr "Når aktiv"
+
+#: ../setup/setup.ui.h:10
+msgid "Always"
+msgstr "Altid"
+
 #: ../setup/setup.ui.h:11 ../setup/ibus-setup.desktop.in.h:1
 msgid "IBus Preferences"
 msgstr "Indstillinger for IBus"
@@ -83,7 +83,7 @@
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:6
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Genvejstasterne for at tænde og slukke inputmetode"
 
@@ -123,11 +123,11 @@
 msgid "Language panel position:"
 msgstr "Placering af sprogpanel:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:21
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "Vis ikon i statusfelt"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:23
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "Vis navn på inputmetode i sprogpanel"
 
@@ -176,28 +176,25 @@
 msgstr "Vis information om den valgte inputmetode"
 
 #: ../setup/setup.ui.h:40
-#, fuzzy
 msgid "Show setup of the selected input method"
-msgstr "Vis information om den valgte inputmetode"
+msgstr "Vis opsætning for den valgte input-metode"
 
 #: ../setup/setup.ui.h:41
 msgid ""
 "The default input method is the top one in the list.\n"
 "You may use up/down buttons to change it."
-msgstr ""
-"Standard inputmetoden er den øverste i listen.\n"
-"Du kan bruge op/ned-knapperne for at ændre det."
+msgstr "Standard inputmetoden er den øverste i listen.\nDu kan bruge op/ned-knapperne for at ændre det."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Inputmetode"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "Brug tastaturlayout for system"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:25
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "Brug systemttastaturlayout (XKB)"
 
@@ -205,7 +202,7 @@
 msgid "Keyboard Layout"
 msgstr "Tastaturlayout"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:33
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "Del den samme inputmetode i alle programmer"
 
@@ -225,13 +222,7 @@
 "\n"
 "\n"
 "\n"
-msgstr ""
-"IBus\n"
-"Den intelligente inddatabus\n"
-"Netsted: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "IBus\nDen intelligente inddatabus\nNetsted: http://code.google.com/p/ibus\n\n\n\n"
 
 #: ../setup/setup.ui.h:57
 msgid "Start ibus on login"
@@ -245,18 +236,6 @@
 msgid "About"
 msgstr "Om"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Framework for inputmetode"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Start IBus, framework for inputmetode"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Forindlæs motorer"
@@ -274,119 +253,139 @@
 msgstr ""
 
 #: ../data/ibus.schemas.in.h:5
+msgid "Popup delay milliseconds for IME switcher window"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:6
+msgid ""
+"Set popup delay milliseconds to show IME switcher window. The default is "
+"400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do "
+"not show the window and switch prev/next engines."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
 msgstr "Udløser tastaturgenveje"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:11
+msgid "Trigger shortcut keys for gtk_accelerator_parse"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Aktivér genvejstaster"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "Genvejstasterne for at tænde inputmetode"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Deaktivér genvejstaster"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "Genvejstasterne for slukning af inputmetode"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Genvejstaster for næste motor"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "Genvejstasterne for at skrive til næste inputmetode i listen"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Genvejstaster for forrige motor"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Genvejstasterne for at skifte til forrige inputmetode"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Skjul automatisk"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
-msgstr ""
-"Sprogpanelets opførsel. 0 = Indlejret i menu, 1 = Skjul automatisk, 2 = Vis "
-"altid"
+msgstr "Sprogpanelets opførsel. 0 = Indlejret i menu, 1 = Skjul automatisk, 2 = Vis altid"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Placering for sprogpanel"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:23
 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 ""
-"Placering af sprogpanelet. 0 = Øverste venstre hjørne, 1 = Øverste højre "
-"hjørne, 2 = Nederste venstre hjørne, 3 = Nederste højre hjørne, 4 = "
-"Brugertilpasset"
+msgstr "Placering af sprogpanelet. 0 = Øverste venstre hjørne, 1 = Øverste højre hjørne, 2 = Nederste venstre hjørne, 3 = Nederste højre hjørne, 4 = Brugertilpasset"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "Orientering af opslagstabel"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientering af opslagstabel. 0 = Horisontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "Vis navn på inputmetode"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "Brug tilpasset skrifttype"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "Brug tilpasset skrifttypenavn til sprogpanel"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "Brugertilpasset skrifttype"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "Tilpasset skrifttypenavn til sprogpanel"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "Indbyg forudredigeret tekst"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "Indlejr forudredigeret tekst i programvindue"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "Brug global inputmetode"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "Aktivér inputmetode som standard"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Aktivér inputmetoder som standard når programmerne modtaget inputfokus"
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
@@ -394,38 +393,36 @@
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr ""
-"Ophavsret (c) 2007-2010 Peng Huang\n"
-"Ophavsret (c) 2007-2010 Red Hat, Inc."
+msgstr "Ophavsret (c) 2007-2010 Peng Huang\nOphavsret (c) 2007-2010 Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
 msgstr "Andre"
 
-#: ../setup/engineabout.py:67
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Sprog: %s\n"
 
-#: ../setup/engineabout.py:70
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastaturlayout: %s\n"
 
-#: ../setup/engineabout.py:73
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Forfatter: %s\n"
 
-#: ../setup/engineabout.py:76
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Beskrivelse:\n"
 
-#: ../setup/enginecombobox.py:136
+#: ../setup/enginecombobox.py:130
 msgid "Select an input method"
 msgstr "Vælg en inddatametode"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -445,125 +442,174 @@
 msgid "Modifiers:"
 msgstr "Kombinationstaster:"
 
-#: ../setup/keyboardshortcut.py:235
+#: ../setup/keyboardshortcut.py:250
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
-msgstr ""
-"Tryk venligst på en tast (eller en tastekombination).\n"
-"Dialogen bliver lukket, når tasten slippes."
+msgstr "Tryk venligst på en tast (eller en tastekombination).\nDialogen bliver lukket, når tasten slippes."
 
-#: ../setup/keyboardshortcut.py:237
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "Tryk venligst på en tast (eller en tastekombination)"
 
-#: ../setup/main.py:79
-msgid "trigger"
-msgstr "udløser"
-
-#: ../setup/main.py:80
-msgid "enable"
-msgstr "aktivér"
-
-#: ../setup/main.py:81
-msgid "disable"
-msgstr "deaktivér"
+#: ../setup/main.py:98 ../setup/main.py:397
+msgid "Use shortcut with shift to switch to the previous input method"
+msgstr ""
 
-#: ../setup/main.py:323
-#, fuzzy
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
-msgstr "IBus-dæmonen er ikke startet. Vil du starte den nu?"
+msgstr ""
 
-#: ../setup/main.py:344
-#, fuzzy
+#: ../setup/main.py:352
 msgid ""
-"IBus has been started! If you cannot use IBus, add the following lines to "
-"your $HOME/.bashrc; then relog into your desktop.\n"
+"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 msgstr ""
-"IBus er blevet startet! Hvis du ikke kan bruge IBus, skal du tilføje disse "
-"linjer i $HOME/.bashrc, og logge ind og ud igen til dit skrivebord.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
 
-#: ../setup/main.py:357
+#. Translators: %d == 5 currently
+#: ../setup/main.py:366
 #, python-format
-msgid "IBus daemon coundn't be started in %d seconds"
+msgid "IBus daemon could not be started in %d seconds"
 msgstr ""
 
-#: ../setup/main.py:369
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Vælg tastaturgenveje til %s"
 
-#: ../ui/gtk3/panel.vala:330
-#, fuzzy
-msgid "Copyright (c) 2007-2012 Peng Huang\n"
+#: ../setup/main.py:379
+msgid "switching input methods"
 msgstr ""
-"Ophavsret (c) 2007-2010 Peng Huang\n"
-"Ophavsret (c) 2007-2010 Red Hat, Inc."
 
-#: ../ui/gtk3/panel.vala:335
-msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus er en intelligent inddatabus til Linux/Unix."
+#: ../tools/main.vala:42
+msgid "List engine name only"
+msgstr ""
 
-#: ../ui/gtk3/panel.vala:339
-msgid "translator-credits"
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
+#, c-format
+msgid "Can't connect to IBus.\n"
 msgstr ""
-"Kris Thomsen\n"
-"\n"
-"Dansk-gruppen \n"
-"Mere info: http://www.dansk-gruppen.dk"
 
-#: ../ui/gtk3/panel.vala:371
-msgid "Restart"
-msgstr "Genstart"
+#: ../tools/main.vala:84
+#, c-format
+msgid "language: %s\n"
+msgstr ""
 
-#~ msgid "Previous page"
-#~ msgstr "Forrige side"
+#: ../tools/main.vala:152
+#, c-format
+msgid "No engine is set.\n"
+msgstr ""
 
-#~ msgid "Next page"
-#~ msgstr "Næste side"
+#: ../tools/main.vala:160
+#, c-format
+msgid "Set global engine failed.\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Some input methods have been installed, removed or updated. Please "
-#~ "restart ibus input platform."
-#~ msgstr ""
-#~ "Nogen inputmetoder er blevet installeret, fjernet eller opdateret. "
-#~ "Genstart inputplatformen IBus."
+#: ../tools/main.vala:165
+#, c-format
+msgid "Get global engine failed.\n"
+msgstr ""
 
-#~ msgid "Restart Now"
-#~ msgstr "Genstart nu"
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr ""
 
-#~ msgid "Later"
-#~ msgstr "Senere"
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr ""
 
-#~ msgid "IBus Panel"
-#~ msgstr "IBus-panel"
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr ""
 
-#~ msgid "IBus input method framework"
-#~ msgstr "IBus-ramme for inddatametode"
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr ""
 
-#~ msgid "Turn off input method"
-#~ msgstr "Sluk for inputmetode"
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr ""
 
-#~ msgid "No input window"
-#~ msgstr "Intet inputvindue"
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr ""
 
-#~ msgid "About the input method"
-#~ msgstr "Om inputmetoden"
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr ""
 
-#~ msgid "Switch input method"
-#~ msgstr "Skift inddatametode"
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr ""
 
-#~ msgid "About the Input Method"
-#~ msgstr "Om inputmetoden"
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
 
-#~ msgid "next input method"
-#~ msgstr "næste inddatametode"
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr ""
 
-#~ msgid "previous input method"
-#~ msgstr "forrige inddatametode"
+#: ../tools/main.vala:307
+#, c-format
+msgid ""
+"Usage: %s COMMAND [OPTION...]\n"
+"\n"
+msgstr ""
+
+#: ../tools/main.vala:308
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: ../tools/main.vala:337
+#, c-format
+msgid "%s is unknown command!\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:657
+msgid "Copyright (c) 2007-2012 Peng Huang\n"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:662
+msgid "IBus is an intelligent input bus for Linux/Unix."
+msgstr "IBus er en intelligent inddatabus til Linux/Unix."
+
+#: ../ui/gtk3/panel.vala:666
+msgid "translator-credits"
+msgstr "Kris Thomsen\n\nDansk-gruppen \nMere info: http://www.dansk-gruppen.dk"
+
+#: ../ui/gtk3/panel.vala:698
+msgid "Restart"
+msgstr "Genstart"
diff -Nru ibus-1.5.4/po/de.po ibus-1.5.5/po/de.po
--- ibus-1.5.4/po/de.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/de.po	2014-01-14 12:59:14.000000000 +0900
@@ -2,19 +2,20 @@
 # German translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Fabian Affolter , 2009
 # hpeters , 2009
 # Mario Blättermann , 2011
+# Rainer , 2013
 # Roman Spirgi , 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2012-12-06 15:35+0900\n"
-"PO-Revision-Date: 2012-12-18 20:39+0000\n"
-"Last-Translator: Roman Spirgi \n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
+"Last-Translator: Rainer \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +87,7 @@
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Tastenkombination zum An- oder Ausschalten der Eingabemethode"
 
@@ -126,11 +127,11 @@
 msgid "Language panel position:"
 msgstr "Position des Sprach-Panels:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "Symbol im Benachrichtigungsfeld anzeigen"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "Name der Eingabemethode auf Sprachleiste anzeigen"
 
@@ -189,15 +190,15 @@
 msgstr "Die standardmäßige Eingabemethode steht in der Liste an erster Stelle.\nSie können dies mit den Hoch/Runter-Schaltflächen ändern."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Eingabemethode"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "System-Tastaturbelegung verwenden"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "System-Tastatur (XKB) Belegung verwenden"
 
@@ -205,7 +206,7 @@
 msgid "Keyboard Layout"
 msgstr "Tastaturbelegung"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "Dieselbe Eingabemethode für alle Anwendungen verwenden"
 
@@ -239,18 +240,6 @@
 msgid "About"
 msgstr "Info"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Eingabemethode-Framework"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus-Eingabemethode-Framework starten"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Engines vorladen"
@@ -279,118 +268,128 @@
 msgstr "Popup-Verzögerung für IME-Wechsel-Fenster setzen. Standardmäßig ist der Wert von 400 gesetzt. 0 = Fenster sofort anzeigen. 0 < Verzögerung in Millisekunden. 0 > Fenster nicht anzeigen und zur vorhergehenden/ nachfolgenden Engine wechseln."
 
 #: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "Gespeicherte Versions-Numnner"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr "Die gespeicherte Versions-Nummer wird verwendet, um den Unterschied zwischen der Version der zuvor installierten ibus und der aktuellen ibus zu überprüfen."
+
+#: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
 msgstr "Auslöser-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Tastenkombinationen auslösen für gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Tastenkürzel aktivieren"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "Tastenkürzel zum Einschalten der Eingabemethoden"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Tastenkürzel deaktivieren"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "Tastenkürzel zum Ausschalten der Eingabemethoden"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Nächste Engine-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "Tastenkombination zum Wechseln zur nächsten Eingabemethode in der Liste"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Vorherige Engine-Tastenkombination"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Tastenkombination zum Wechseln zur vorherigen Eingabemethode"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Automatisch verstecken"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr "Verhalten des Sprach-Panels: 0 = Im Menü einbetten, 1 = Automatisch verstecken, 2 = Immer anzeigen"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Position des Sprach-Panels"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 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 "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:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "Ausrichtung der Lookup-Tabelle"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Ausrichtung der Lookup-Tabelle. 0 = Horizontal, 1 = Vertikal"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "Name der Eingabemethode anzeigen"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "Benutzerdefinierte Schriftart verwenden"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "Benutzerdefinierte Schriftart für Sprach-Panel verwenden"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "Benutzerdefinierte Schriftart"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "Name der benutzerdefinierten Schriftart für Sprach-Panel"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "Preedit-Text einbetten"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "Preedit-Text in Anwendungsfenster einbetten"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "Globale Eingabemethode wählen"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "Eingabemethode standardmäßig aktivieren"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Eingabemethode standardmäßig aktivieren, wenn die Anwendung Eingabefokus erlangt"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "Dconf bewahrt Namenspräfixe"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Namenspräfixe von Dconf-Schlüsseln, um Namenskonvertierung anzuhalten"
 
@@ -427,7 +426,7 @@
 msgid "Select an input method"
 msgstr "Eingabemethode wählen"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -457,15 +456,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "Bitte eine Taste (oder eine Tastenkombination drücken)"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/main.py:98 ../setup/main.py:397
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Tastenkombination mit Umschalttaste benutzen, um zur vorherigen Eingabemethode zu wechseln"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Der IBus-Dienst läuft nicht. Möchten Sie ihn starten?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:352
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -474,82 +473,147 @@
 msgstr "IBus wurde gestartet! Falls Sie IBus nicht nutzen können, fügen Sie bitte in $HOME/.bashrc die nachfolgenden Zeilen an und loggen Sie sich anschließend erneut ein.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:367
+#: ../setup/main.py:366
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus-Dienst konnte innerhalb von %d Sekunden nicht gestartet werden"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wählen Sie eine Tastenkombination für %s"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "Eingabemethoden wechseln"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "Nur Engine-Name auflisten"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "Befehl [OPTIONEN]"
-
-#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "Keine Verbindung zu IBus.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "Sprache: %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "Keine Engine gesetzt.\n\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Setzen der globalen Engine fehlgeschlagen.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Auslesen der globalen Engine fehlgeschlagen.\n"
 
-#: ../tools/main.vala:224
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "Lesen Sie den System-Registry-Cache."
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "Lesen Sie die Registry-Cache DATEI."
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr "Der Registry-Cache ist ungültig.\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "Schreiben Sie den System-Registry-Cache."
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "Schreiben Sie die Registry-Cache DATEI."
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr "Setzen oder erhalten Modul"
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "Beenden ibus-daemon"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr "Anzeigen verfügbare Module"
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr "(Nicht implementiert)"
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "Neustart ibus-daemon"
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr "Anzeigen Version"
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr "Anzeigen Inhalt des Registry-Cache."
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr "Erstellen Registry-Cache"
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Ausgabe der D-Bus-Adresse des ibus-Daemon"
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr "Anzeige dieser Information"
+
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Anwendung: %s BEFEHL [OPTION...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "Befehle:\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ist ein unbekannter Befehl!\n"
 
-#: ../ui/gtk3/panel.vala:498
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr "IBus Aktualisierung"
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr "Super+Leerzeichen ist nun der Standard-Hotkey."
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ist ein intelligenter Eingabe-Bus für Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "Fabian Affolter , 2009.\nHedda Peters , 2009."
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "Neustart"
diff -Nru ibus-1.5.4/po/es.po ibus-1.5.5/po/es.po
--- ibus-1.5.4/po/es.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/es.po	2014-01-14 12:59:14.000000000 +0900
@@ -2,20 +2,21 @@
 # Spanish translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Claudio Rodrigo Pereyra Diaz , 2011
 # Daniel Cabrera , 2011
 # Domingo Becker , 2012
+# Domingo Becker , 2013
 # Gladys Guerrero , 2012-2013
 # Daniel Cabrera , 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2012-12-06 15:35+0900\n"
-"PO-Revision-Date: 2013-04-03 06:06+0000\n"
-"Last-Translator: Gladys Guerrero \n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
+"Last-Translator: Domingo Becker \n"
 "Language-Team: Spanish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,7 +88,7 @@
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Atajo de teclado para encender o apagar el método de entrada"
 
@@ -127,11 +128,11 @@
 msgid "Language panel position:"
 msgstr "Posición del panel de idioma:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "Mostrar un ícono en el área de notificación"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "Mostrar el nombre del método de entrada en la barra de idioma"
 
@@ -190,15 +191,15 @@
 msgstr "El método de entrada determinado está al comienzo de la lista.\nPuede usar los botones arriba/abajo para cambiarlo."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Métodos de Entrada"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "Usar el diseño del teclado del sistema"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "Usar el diseño del teclado del sistema (XKB)"
 
@@ -206,7 +207,7 @@
 msgid "Keyboard Layout"
 msgstr "Diseño del Teclado"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "Compartir el mismo método de entrada con todas las aplicaciones"
 
@@ -240,18 +241,6 @@
 msgid "About"
 msgstr "Acerca de"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Marco de trabajo para métodos de entrada"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Inicie el marco de trabajo para métodos de entrada IBus"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Precargar máquinas"
@@ -280,118 +269,128 @@
 msgstr "Establece retraso del Popup en milisegundos para mostrar la ventana del  interruptor IME. Lo predeterminado es 400. 0 = Muestra la ventana inmediatamente. 0 < Demora en milisegundos. 0 > No muestra la ventana ni los motores siguientes o anteriores."
 
 #: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "Número de versión guardada"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr "El número de versión guardada se usará para chequear la diferencia entre la versión de ibus previamente instalada y la del ibus actual."
+
+#: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
 msgstr "Activadora de los Atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Activador de llaves de atajos para leer gtk_accelerator "
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Habilitar atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "Los atajos de teclado para habilitar el método de entrada"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Inhabilitar atajos de teclado"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "Los atajos de teclado para  inhabilitar el método de entrada"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Atajo de teclado para el siguiente motor"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "Los atajos de teclado para avanzar al siguiente método de entrada de la lista"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Atajo de teclado para la máquina previa"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Los atajos de teclado para retroceder al método de entrada anterior en la lista"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Auto Ocultar"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 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:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Posición del panel de idioma"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 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:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "Orientación de búsqueda en la tabla "
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientación de la tabla de búsqueda. 0 = Horizontal, 1 = Vertical"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "Mostrar el nombre del método de entrada"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "Usar fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "Usar nombre de fuente personalizada para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "Fuente personalizada"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "Nombre de fuente personalizado para el panel de idioma"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "Insertar texto preeditado"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "Insertar texto previamente editado en la ventana de la aplicación"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "Utilizar método de entrada global"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "Habilitar método de entrada en forma predeterminada"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Habilitar método de entrada en forma predeterminada cuando la aplicación en uso solicite alguno"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "DConf preserva los prefijos de nombres"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Prefijos para las claves de DConf para parar la conversión de nombres"
 
@@ -428,7 +427,7 @@
 msgid "Select an input method"
 msgstr "Seleccione un método de entrada"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -458,15 +457,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "Por favor, presione una tecla (o combinación de teclas)"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/main.py:98 ../setup/main.py:397
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Usar atajos con  shift para cambiar al método anterior de entrada"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "El demonio IBus no se está ejecutando. ¿Desea iniciarlo?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:352
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -475,82 +474,147 @@
 msgstr "¡IBus fue iniciado! Sin no puede usar IBus, agregue las siguientes líneas a su $HOME/.bashrc; luego vuelga a ingresar a su cuenta.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:367
+#: ../setup/main.py:366
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "El demonio IBus no se pudo iniciar en %d segundos"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Seleccione la tecla de atajo para %s"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "Cambiando métodos de entrada"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "Listar sólo los nombres de máquinas"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "comando [OPCIONES]"
-
-#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "No se puede conectar a IBus.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "idioma: %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "No se configuró la máquina.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Falló la configuración de la máquina global.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Falló al obtener la máquina global.\n"
 
-#: ../tools/main.vala:224
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "Lea el cache del registro del sistema."
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "Lea el ARCHIVO de caché del registro."
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr "El caché del registro es inválido.\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "Escriba al caché del registro del sistema."
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "Escriba al ARCHIVO caché del registro."
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr "Ponga u obtenga una máquina"
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "Detener el ibus-daemon"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr "Mostrar las máquinas disponibles"
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr "(no implementado)"
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "Reiniciar el ibus-daemon"
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr "Mostrar la versión"
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr "Mostrar el contenido del caché del registro"
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr "Crear el caché del registro"
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Imprimir la dirección de D-Bus de ibus-daemon"
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr "Mostrar esta información"
+
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "USO: %s COMANDO [OPCION...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "¡%s es un comando desconocido!\n"
 
-#: ../ui/gtk3/panel.vala:498
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr "Actualización de IBus"
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr "Super+espacio es ahora el atajo de teclado predeterminado."
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus es un bus de entrada inteligente para Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "Domingo Becker, , 2009"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "Reiniciar"
diff -Nru ibus-1.5.4/po/fr.po ibus-1.5.5/po/fr.po
--- ibus-1.5.4/po/fr.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/fr.po	2014-01-14 12:59:14.000000000 +0900
@@ -4,25 +4,25 @@
 # This file is distributed under the same license as the ibus package.
 #
 # Translators:
-# Charles-Antoine Couret , 2009.
-# dominique bribanick , 2011.
-# Jérôme Fenal , 2012, 2013.
-# Julien Humbert , 2009, 2010, 2011, 2012, 2013.
-# Sam Friedmann , 2010.
+# Charles-Antoine Couret , 2009
+# dominique bribanick , 2011
+# Jérôme Fenal , 2012-2013
+# Jérôme Fenal , 2012
+# Julien Humbert , 2009, 2010, 2011, 2012, 2013
+# Sam Friedmann , 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2012-12-06 15:35+0900\n"
-"PO-Revision-Date: 2013-08-16 11:20+0100\n"
-"Last-Translator: Julien Humbert \n"
+"POT-Creation-Date: 2013-11-29 18:44+0900\n"
+"PO-Revision-Date: 2013-12-03 08:56+0000\n"
+"Last-Translator: Jérôme Fenal \n"
 "Language-Team: French \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
@@ -70,8 +70,7 @@
 
 #: ../setup/setup.ui.h:12
 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 de la liste"
+msgstr "Raccourci clavier pour passer à la méthode d'entrée suivante de la liste"
 
 #: ../setup/setup.ui.h:13
 msgid "Next input method:"
@@ -79,8 +78,7 @@
 
 #: ../setup/setup.ui.h:14
 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 de la liste"
+msgstr "Raccourci clavier pour revenir à la méthode d'entrée précédente de la liste"
 
 #: ../setup/setup.ui.h:15
 msgid "Previous input method:"
@@ -90,11 +88,9 @@
 msgid "..."
 msgstr "…"
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 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 "
-"d'entrées"
+msgstr "Sélection des raccourcis claviers pour activer ou désactiver les méthodes d'entrées"
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
@@ -132,19 +128,17 @@
 msgid "Language panel position:"
 msgstr "Afficher la barre de langue :"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "Afficher l'icône dans la boîte à miniatures"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "Afficher le nom de la méthode d'entrée sur la barre de langue"
 
 #: ../setup/setup.ui.h:29
 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"
+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:30
 msgid "Embed preedit text in application window"
@@ -152,9 +146,7 @@
 
 #: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
-msgstr ""
-"Insérer le texte en cours d'édition par la méthode d'entrée dans la fenêtre "
-"de l'application"
+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:32
 msgid "Use custom font:"
@@ -174,20 +166,15 @@
 
 #: ../setup/setup.ui.h:36
 msgid "Remove the selected input method from the enabled input methods"
-msgstr ""
-"Supprimer la méthode d'entrée sélectionnée des méthodes d'entrées actives"
+msgstr "Supprimer la méthode d'entrée sélectionnée des méthodes d'entrées actives"
 
 #: ../setup/setup.ui.h:37
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"Déplacer vers le haut la méthode d'entrée sélectionnée dans la liste des "
-"méthodes d'entrée actives"
+msgstr "Déplacer vers le haut la méthode d'entrée sélectionnée dans la liste des méthodes d'entrée actives"
 
 #: ../setup/setup.ui.h:38
 msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"Déplacer vers le bas la méthode d'entrée sélectionnée dans la liste des "
-"méthodes d'entrée actives"
+msgstr "Déplacer vers le bas la méthode d'entrée sélectionnée dans la liste des méthodes d'entrée actives"
 
 #: ../setup/setup.ui.h:39
 msgid "Show information of the selected input method"
@@ -199,42 +186,41 @@
 
 #: ../setup/setup.ui.h:41
 msgid ""
-"The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it."
-msgstr ""
-"La méthode d'entrée par défaut se trouve en haut de la liste.\n"
-"Utilisez les touches « Haut/Bas » pour changer l'ordre."
+"The active input method can be switched around from the selected "
+"ones in the above list by pressing the keyboard shortcut keys or clicking "
+"the panel icon."
+msgstr "La méthode de saisie active peut être modifiée vers l'une des méthodes pré-sélectionnées dans la liste ci-dessous en tapant le raccourci clavier ou en cliquant sur l'icône du panneau."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Méthode d'entrée"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "Utiliser la disposition clavier système"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "Utiliser la disposition clavier système (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
 msgid "Keyboard Layout"
 msgstr "Disposition du clavier"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "Partager la même méthode d'entrée pour toutes les applications"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:47
 msgid "Global input method settings"
 msgstr "Configuration de la méthode d'éntrée globale"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:49
 msgid ""
 "IBus\n"
 "The intelligent input bus\n"
@@ -242,38 +228,20 @@
 "\n"
 "\n"
 "\n"
-msgstr ""
-"IBus\n"
-"The intelligent input bus\n"
-"Page d'accueil : http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "IBus\nThe intelligent input bus\nPage d'accueil : http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
 msgid "Start ibus on login"
 msgstr "Démarrer IBus lors de la connexion"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:57
 msgid "Startup"
 msgstr "Démarrage"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
 msgid "About"
 msgstr "À propos"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Framework de méthode de saisie"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Démarrer le framework de méthode de saisie IBus"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Précharger les moteurs"
@@ -292,141 +260,138 @@
 
 #: ../data/ibus.schemas.in.h:5
 msgid "Popup delay milliseconds for IME switcher window"
-msgstr ""
-"Délai en millisecondes d'affichage de la fenêtre du commutateur de méthode "
-"d'entrée"
+msgstr "Délai en millisecondes d'affichage de la fenêtre du commutateur de méthode d'entrée"
 
 #: ../data/ibus.schemas.in.h:6
 msgid ""
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do "
 "not show the window and switch prev/next engines."
-msgstr ""
-"Définit le délai en millisecondes d'affichage de la fenêtre du commutateur "
-"de méthode d'entrée. La valeur par défaut est de 400. 0 = montrer "
-"immédiatement la fenêtre. 0 < délai en millisecondes. 0 > ne pas "
-"afficher la fenêtre et permuter avec le moteur précédent ou suivant."
+msgstr "Définit le délai en millisecondes d'affichage de la fenêtre du commutateur de méthode d'entrée. La valeur par défaut est de 400. 0 = montrer immédiatement la fenêtre. 0 < délai en millisecondes. 0 > ne pas afficher la fenêtre et permuter avec le moteur précédent ou suivant."
 
 #: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "Numéro de version enregistré"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr "Le numéro de version enregistré sera utilisé pour vérifier la différence entre la version d'une installation précédente de ibus et l'actuelle."
+
+#: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
 msgstr "Raccourci clavier déclencheur"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "Raccourci clavier déclencheur pour gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Activer les raccourcis clavier"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "Les raccourcis clavier pour la méthode d'entrée sont activés"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Désactiver les raccourcis clavier"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "Les raccourcis clavier pour la méthode d'entrée sont désactivés"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Raccourci clavier pour passer au moteur suivant"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
-msgstr ""
-"Raccourci clavier pour passer à la méthode d'entrée suivante de la liste"
+msgstr "Raccourci clavier pour passer à la méthode d'entrée suivante de la liste"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Raccourci clavier pour revenir au moteur précédent"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Raccourci clavier pour revenir à la méthode d'entrée précédente"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Masquage automatique"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
-msgstr ""
-"Sélection du comportement d'affichage de la liste des candidats. 0 = Insérée "
-"dans le menu, 1 = Masquer automatiquement, 2 = Toujours afficher"
+msgstr "Sélection du comportement d'affichage de la liste des candidats. 0 = Insérée dans le menu, 1 = Masquer automatiquement, 2 = Toujours afficher"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Position de la barre"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 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 ""
-"Position de la barre de langue. 0 = Coin supérieur gauche, 1 = Coin "
-"supérieur droit, 2 = Coin inférieur gauche, 3 = Coin inférieur droit, 4 = "
-"Personnalisé"
+msgstr "Position de la barre de langue. 0 = Coin supérieur gauche, 1 = Coin supérieur droit, 2 = Coin inférieur gauche, 3 = Coin inférieur droit, 4 = Personnalisé"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "Orientation de la liste des candidats"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Orientation de la liste des candidats. 0 = Horizontale, 1 = Verticale"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "Afficher le nom de la méthode d'entrée"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "Utiliser une police personnalisée :"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "Utiliser une police personnalisée pour la barre de langue"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "Police personnalisée"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "Police personnalisée pour le panneau de langue"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "Insérer le texte en cours d'édition"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "Insérer le texte en cours d'édition dans la fenêtre de l'application"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "Utiliser la méthode d'éntrée globale"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "Par défaut, activer la méthode d'entrée"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"Par défaut, activer la méthode d'entrée lorsque l'application reçoit le focus"
+msgstr "Par défaut, activer la méthode d'entrée lorsque l'application reçoit le focus"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "Préservation des préfixes de nom DConf"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Préfixes des clés DConf pour arrêter la conversion de nom"
 
@@ -434,9 +399,7 @@
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
@@ -465,7 +428,7 @@
 msgid "Select an input method"
 msgstr "Sélectionnez une méthode d'entrée"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -489,117 +452,170 @@
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
-msgstr ""
-"Veuillez appuyer sur une touche (ou une combinaison de touches).\n"
-"La boîte de dialogue se fermera lorsque la touche sera relâchée."
+msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches).\nLa boîte de dialogue se fermera lorsque la touche sera relâchée."
 
 #: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "Veuillez appuyer sur une touche (ou une combinaison de touches)"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/main.py:99 ../setup/main.py:392
 msgid "Use shortcut with shift to switch to the previous input method"
-msgstr ""
-"Utiliser le raccourci clavier pour revenir à la méthode d'entrée précédente"
+msgstr "Utiliser le raccourci clavier pour revenir à la méthode d'entrée précédente"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:326
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Le démon IBus n'est pas démarré. Souhaitez-vous le démarrer ?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:347
 msgid ""
-"IBus has been started! If you cannot use IBus, add the following lines to "
-"your $HOME/.bashrc; then relog into your desktop.\n"
-"  export GTK_IM_MODULE=ibus\n"
-"  export XMODIFIERS=@im=ibus\n"
-"  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus a été démarré ! Si vous ne pouvez pas utiliser IBus, veuillez ajouter "
-"les lignes suivantes dans le fichier « $HOME/.bashrc », et veuillez vous "
-"reconnecter.\n"
+"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
+msgstr "IBus a été démarré ! Si vous ne pouvez pas utiliser IBus, veuillez ajouter les lignes suivantes dans le fichier « $HOME/.bashrc », et veuillez vous reconnecter.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:367
+#: ../setup/main.py:361
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Le démon IBus n'a pas pu être démarré en %d secondes"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:373
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Raccourci clavier pour %s"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:374
 msgid "switching input methods"
 msgstr "Changer de méthodes d'entrée"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "Ne lister que les noms des moteurs"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "commande [OPTIONS]"
-
-#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "Connexion impossible à IBus.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "langue : %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "Aucun moteur n'est configuré.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Échec de la configuration du moteur global.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Échec de la récupération du moteur global.\n"
 
-#: ../tools/main.vala:224
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "Lire le cache du registre système."
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "Lire le fichier FILE du cache du registre système."
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr "Le cache du registre est invalide.\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "Enregistrer le cache du registre système."
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "Enregistrer le fichier FILE du cache du registre."
+
+#: ../tools/main.vala:293
+msgid "Set or get engine"
+msgstr "Définir ou obtenir le moteur"
+
+#: ../tools/main.vala:294
+msgid "Exit ibus-daemon"
+msgstr "Quitter ibus-daemon"
+
+#: ../tools/main.vala:295
+msgid "Show available engines"
+msgstr "Afficher les moteurs disponibles"
+
+#: ../tools/main.vala:296
+msgid "(Not implemented)"
+msgstr "(Non développé)"
+
+#: ../tools/main.vala:297
+msgid "Restart ibus-daemon"
+msgstr "Redémarrer ibus-daemon"
+
+#: ../tools/main.vala:298
+msgid "Show version"
+msgstr "Afficher la version"
+
+#: ../tools/main.vala:299
+msgid "Show the content of registry cache"
+msgstr "Afficher le contenu du cache du registre"
+
+#: ../tools/main.vala:300
+msgid "Create registry cache"
+msgstr "Créer le cache du registre"
+
+#: ../tools/main.vala:301
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "Afficher l'adresse D-Bus de ibus-daemon"
+
+#: ../tools/main.vala:302
+msgid "Show this information"
+msgstr "Afficher cette information"
+
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr ""
-"Utilisation : %s COMMANDE [OPTION…]\n"
-"\n"
+msgstr "Utilisation : %s COMMANDE [OPTION…]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Commandes :\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s n'est pas une commande connue !\n"
 
-#: ../ui/gtk3/panel.vala:498
+#: ../ui/gtk3/panel.vala:382
+msgid "IBus Update"
+msgstr "Mise à jour de IBus"
+
+#: ../ui/gtk3/panel.vala:383 ../ui/gtk3/panel.vala:394
+msgid "Super+space is now the default hotkey."
+msgstr "Super+espace est maintenant le raccourci par défaut."
+
+#: ../ui/gtk3/panel.vala:656
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:661
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus est un IME intelligent pour Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:665
 msgid "translator-credits"
 msgstr "Julien Humbert "
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:697
 msgid "Restart"
 msgstr "Redémarrer"
diff -Nru ibus-1.5.4/po/ja.po ibus-1.5.5/po/ja.po
--- ibus-1.5.4/po/ja.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/ja.po	2014-01-14 12:59:14.000000000 +0900
@@ -14,15 +14,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-09 15:07+0900\n"
-"PO-Revision-Date: 2013-08-09 15:07+0900\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
+"POT-Creation-Date: 2013-11-29 18:44+0900\n"
+"PO-Revision-Date: 2013-11-30 03:26+0000\n"
 "Last-Translator: Hajime Taira \n"
 "Language-Team: Japanese \n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../setup/setup.ui.h:1
@@ -79,8 +79,7 @@
 
 #: ../setup/setup.ui.h:14
 msgid "The shortcut keys for switching to previous input method in the list"
-msgstr ""
-"リストの中でひとつ前のインプットメソッドに切り替えるためのショートカットキー"
+msgstr "リストの中でひとつ前のインプットメソッドに切り替えるためのショートカットキー"
 
 #: ../setup/setup.ui.h:15
 msgid "Previous input method:"
@@ -140,9 +139,7 @@
 
 #: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
-msgstr ""
-"チェックボックスをチェックしたときに言語バー上でインプットメソッドの名前を表"
-"示します"
+msgstr "チェックボックスをチェックしたときに言語バー上でインプットメソッドの名前を表示します"
 
 #: ../setup/setup.ui.h:30
 msgid "Embed preedit text in application window"
@@ -150,9 +147,7 @@
 
 #: ../setup/setup.ui.h:31
 msgid "Embed the preedit text of input method in the application window"
-msgstr ""
-"アプリケーションウィンドウにインプットメソッドのプリエディットテキストを組み"
-"込みます"
+msgstr "アプリケーションウィンドウにインプットメソッドのプリエディットテキストを組み込みます"
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
@@ -176,13 +171,11 @@
 
 #: ../setup/setup.ui.h:37
 msgid "Move up the selected input method in the enabled input methods list"
-msgstr ""
-"選択したインプットメソッドを有効なインプットメソッドの中で上へ移動します"
+msgstr "選択したインプットメソッドを有効なインプットメソッドの中で上へ移動します"
 
 #: ../setup/setup.ui.h:38
 msgid "Move down the selected input method in the enabled input methods"
-msgstr ""
-"選択したインプットメソッドを有効なインプットメソッドの中で下へ移動します"
+msgstr "選択したインプットメソッドを有効なインプットメソッドの中で下へ移動します"
 
 #: ../setup/setup.ui.h:39
 msgid "Show information of the selected input method"
@@ -194,42 +187,41 @@
 
 #: ../setup/setup.ui.h:41
 msgid ""
-"The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it."
-msgstr ""
-"デフォルトのインプットメソッドはリストの中で一番上のものです。\n"
-"「上へ/下へ」ボタンを使ってデフォルトを変更できます。"
+"The active input method can be switched around from the selected "
+"ones in the above list by pressing the keyboard shortcut keys or clicking "
+"the panel icon."
+msgstr "アクティブなインプットメソッドは、キーボードショートカットキーを押すかパネルアイコンをクリックすることによってリストされている中から１つのインプットメソッドを選択することで切り替えることが可能です。"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "インプットメソッド"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "システムキーボードレイアウトを使用する"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "システムキーボード (XKB) レイアウトを使用する"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
 msgid "Keyboard Layout"
 msgstr "キーボードレイアウト"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "すべてのアプリケーション間で同じインプットメソッドを共有する"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:47
 msgid "Global input method settings"
 msgstr "グローバルインプットメソッドの設定"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
 msgid "Advanced"
 msgstr "詳細"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:49
 msgid ""
 "IBus\n"
 "The intelligent input bus\n"
@@ -237,23 +229,17 @@
 "\n"
 "\n"
 "\n"
-msgstr ""
-"IBus\n"
-"インテリジェントなインプットバス\n"
-"ホームページ: http://code.google.com/p/ibus\n"
-"\n"
-"\n"
-"\n"
+msgstr "IBus\nインテリジェントなインプットバス\nホームページ: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
 msgid "Start ibus on login"
 msgstr "ログイン時に IBus を起動"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:57
 msgid "Startup"
 msgstr "スタートアップ"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
 msgid "About"
 msgstr "情報"
 
@@ -282,10 +268,7 @@
 "Set popup delay milliseconds to show IME switcher window. The default is "
 "400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do "
 "not show the window and switch prev/next engines."
-msgstr ""
-"IME スイッチャーウィンドウを表示するまでのミリ秒単位の遅延を指定してくださ"
-"い。デフォルトは400ミリ秒です。0 = ウィンドウをすぐに表示。0 < ミリ秒単位"
-"の遅延。0 > ウィンドウの表示をせずに、以前と次のエンジンの切り替え。"
+msgstr "IME スイッチャーウィンドウを表示するまでのミリ秒単位の遅延を指定してください。デフォルトは400ミリ秒です。0 = ウィンドウをすぐに表示。0 < ミリ秒単位の遅延。0 > ウィンドウの表示をせずに、以前と次のエンジンの切り替え。"
 
 #: ../data/ibus.schemas.in.h:7
 msgid "Saved version number"
@@ -295,9 +278,7 @@
 msgid ""
 "The saved version number will be used to check the difference between the "
 "version of the previous installed ibus and one of the current ibus."
-msgstr "保存されているバージョンナンバーは以前インストールされていた ibus "
-"のバージョンと現在インストールされている ibus のバージョンの違いを検査する"
-"ために使用されます。"
+msgstr "保存されているバージョンナンバーは以前インストールされていた ibus のバージョンと現在インストールされている ibus のバージョンの違いを検査するために使用されます。"
 
 #: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
@@ -337,8 +318,7 @@
 
 #: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
-msgstr ""
-"リスト中のひとつ前のインプットメソッドに切り替えるためのショートカットキー"
+msgstr "リスト中のひとつ前のインプットメソッドに切り替えるためのショートカットキー"
 
 #: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
@@ -348,8 +328,7 @@
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
-msgstr ""
-"言語パネルの動作。0 = メニューに組み込む、1 = 自動的に隠す、2 = 常に表示"
+msgstr "言語パネルの動作。0 = メニューに組み込む、1 = 自動的に隠す、2 = 常に表示"
 
 #: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
@@ -359,9 +338,7 @@
 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 = 左下隅、3 = 右下隅、4 = カスタ"
-"ム"
+msgstr "言語パネルの位置。0 = 左上隅、1 = 右上隅、2 = 左下隅、3 = 右下隅、4 = カスタム"
 
 #: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
@@ -409,9 +386,7 @@
 
 #: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
-msgstr ""
-"アプリケーションに入力フォーカスが当たったとき標準でインプットメソッドを有効"
-"にする"
+msgstr "アプリケーションに入力フォーカスが当たったとき標準でインプットメソッドを有効にする"
 
 #: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
@@ -425,9 +400,7 @@
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr ""
-"Copyright (c) 2007-2010 Peng Huang\n"
-"Copyright (c) 2007-2010 Red Hat, Inc."
+msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
@@ -480,48 +453,40 @@
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
-msgstr ""
-"キーもしくはキーの組み合わせを入力してください。\n"
-"キーを離すとダイアログを閉じます"
+msgstr "キーもしくはキーの組み合わせを入力してください。\nキーを離すとダイアログを閉じます"
 
 #: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
 msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/main.py:99 ../setup/main.py:392
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "以前のインプットメソッドに切り替えるを使用する"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:326
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus デーモンは稼働していません。開始しますか？"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:347
 msgid ""
-"IBus has been started! If you cannot use IBus, add the following lines to "
-"your $HOME/.bashrc; then relog into your desktop.\n"
+"IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
-msgstr ""
-"IBus は開始しました。もし IBus を利用できない場合、次の環境変数を $HOME/."
-"bashrc へ追記し、デスクトップに再ログインしてください。\n"
-"export GTK_IM_MODULE=ibus\n"
-"export XMODIFIERS=@im=ibus\n"
-"export QT_IM_MODULE=ibus"
+msgstr "IBus は開始しました。もし IBus を利用できない場合、次の環境変数を $HOME/.bashrc へ追記し、デスクトップに再ログインしてください。\nexport GTK_IM_MODULE=ibus\nexport XMODIFIERS=@im=ibus\nexport QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:366
+#: ../setup/main.py:361
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus デーモンは %d 秒以内に開始できませんでした。"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:373
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:374
 msgid "switching input methods"
 msgstr "インプットメソッドの切り替え"
 
@@ -575,100 +540,83 @@
 msgid "Write the registry cache FILE."
 msgstr "レジストリーキャッシュ FILE を書き込む。"
 
-#: ../tools/main.vala:292
+#: ../tools/main.vala:293
 msgid "Set or get engine"
 msgstr "エンジンを設定もしくは表示する。"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:294
 msgid "Exit ibus-daemon"
 msgstr "ibus-daemon を終了する"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:295
 msgid "Show available engines"
 msgstr "利用可能なエンジンを表示する"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:296
 msgid "(Not implemented)"
 msgstr "(実装されていません)"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:297
 msgid "Restart ibus-daemon"
 msgstr "ibus-daemon を再起動する"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:298
 msgid "Show version"
 msgstr "バージョンを表示する"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:299
 msgid "Show the content of registry cache"
 msgstr "レジストリーキャッシュの内容を表示する"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:300
 msgid "Create registry cache"
 msgstr "レジストリーキャッシュを作成する"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:301
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "ibus-daemon の D-Bus アドレスを表示する"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:302
 msgid "Show this information"
 msgstr "この情報を表示する"
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
-msgstr ""
-"使い方: %s コマンド [オプション...]\n"
-"\n"
+msgstr "使い方: %s コマンド [オプション...]\n\n"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "コマンド:\n"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s は不明なコマンドです。\n"
 
-#: ../ui/gtk3/panel.vala:348
+#: ../ui/gtk3/panel.vala:382
 msgid "IBus Update"
 msgstr "IBus の更新"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:383 ../ui/gtk3/panel.vala:394
 msgid "Super+space is now the default hotkey."
 msgstr "Super+space が現在のデフォルトのホットキーです。"
 
-#: ../ui/gtk3/panel.vala:657
+#: ../ui/gtk3/panel.vala:656
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:662
+#: ../ui/gtk3/panel.vala:661
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus は Linux/Unix のためのインテリジェントなインプットバスです。"
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:665
 msgid "translator-credits"
-msgstr ""
-"UTUMI Hirosi \n"
-"IWAI, Masaharu \n"
-"日向原 龍一 "
+msgstr "UTUMI Hirosi \nIWAI, Masaharu \n日向原 龍一 "
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:697
 msgid "Restart"
 msgstr "再起動"
-
-#~ msgid "IBus"
-#~ msgstr "IBus"
-
-#~ msgid "Input Method Framework"
-#~ msgstr "インプットメソッドフレームワーク"
-
-#~ msgid "Start IBus Input Method Framework"
-#~ msgstr "IBus インプットメソッドフレームワークを起動"
-
-#~ msgid "command [OPTIONS]"
-#~ msgstr "コマンド [オプション]"
diff -Nru ibus-1.5.4/po/kn.po ibus-1.5.5/po/kn.po
--- ibus-1.5.4/po/kn.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/kn.po	2014-01-14 12:59:14.000000000 +0900
@@ -2,7 +2,7 @@
 # Kannada translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # shanky , 2013
 # shanky , 2012
@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2012-12-06 15:35+0900\n"
-"PO-Revision-Date: 2013-04-08 12:04+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
 "Last-Translator: shanky \n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -86,7 +86,7 @@
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ಇನ್‌ಪುಟ್‌ ವಿಧಾನಗಳನ್ನು ಆಫ್ ಹಾಗು ಆನ್ ಮಾಡಲು ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳು"
 
@@ -126,11 +126,11 @@
 msgid "Language panel position:"
 msgstr "ಭಾಷೆಯ ಫಲಕದ ಸ್ಥಳ:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಟ್ರೇಯಲ್ಲಿ ಚಿಹ್ನೆಯನ್ನು ತೋರಿಸು"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "ಭಾಷೆಯ ಫಲಕದಲ್ಲಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
@@ -189,15 +189,15 @@
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವು ಪಟ್ಟಿಯ ಮೇಲ್ಬಾಗದಲ್ಲಿದೆ.\nಅದನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಮೇಲೆ/ಕೆಳಗಿನ ಬಾಣದ ಗುರುತಿನ ಗುಂಡಿಗಳನ್ನು ಬಳಸಬಹುದು."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನ"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಕೀಲಿಮಣೆ (XKB) ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
 
@@ -205,7 +205,7 @@
 msgid "Keyboard Layout"
 msgstr "ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "ಒಂದೇ ಇನ್‌ಪುಟ್‌ ವಿಧಾನವನ್ನು ಎಲ್ಲಾ ಅನ್ವಯಗಳಲ್ಲೂ ಬಳಸು"
 
@@ -239,18 +239,6 @@
 msgid "About"
 msgstr "ಇದರ ಬಗ್ಗೆ"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "IBus ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಫ್ರೇಮ್‌ವರ್ಕ್ ಅನ್ನು ಆರಂಭಿಸು"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "ಎಂಜಿನ್‌ಗಳನ್ನು ಮೊದಲೆ ಲೋಡ್ ಮಾಡು"
@@ -279,118 +267,128 @@
 msgstr "IME ಬದಲಾವಣೆಗಾರ ಕಿಟಕಿಗಾಗಿ ಪುಟಿಕೆ (ಪಾಪಪ್) ವಿಳಂಬ, ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ. ಪೂರ್ವನಿಯೋಜಿತವು 400. 0 = ತಕ್ಷಣ ಕಿಟಕಿಯನ್ನು ತೋರಿಸುತ್ತದೆ. 0 < ಮಿಲಿಸೆಕೆಂಡುಗಳ ವಿಳಂಬ. 0 > ಕಿಟಕಿಯನ್ನು ತೋರಿಸಬೇಡ ಮತ್ತು ಮುಂದಿನ/ಹಿಂದಿನ ಎಂಜಿನ್‌ಗಳಿಗೆ ಬದಲಾಯಿಸಬೇಡ."
 
 #: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "ಉಳಿಸಲಾದ ಆವೃತ್ತಿ ಸಂಖ್ಯೆ"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr "ಉಳಿಸಲಾದ ಆವೃತ್ತಿ ಸಂಖ್ಯೆಯಿಂದಾಗಿ, ಈ ಹಿಂದೆ ಉಳಿಸಲಾದ ibus ನ ಆವೃತ್ತಿ ಮತ್ತು ಪ್ರಸಕ್ತ ಅನುಸ್ಥಾಪಿಸಲಾದ ಆವೃತ್ತಿಯ ನಡುವೆ ವ್ಯತ್ಯಾಸವನ್ನು ಪರಿಶೀಲಿಸಲು ಸಹಾಯಕವಾಗುತ್ತದೆ."
+
+#: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
 msgstr "ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳನ್ನು ಟ್ರಿಗರ್ ಮಾಡು"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse ಗೆ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಗಳನ್ನು ಆರಂಭಿಸುತ್ತದೆ"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆನ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿ"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಫ್ ಮಾಡಲು ಬಳಸಬಹುದಾದ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿ"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "ಮುಂದಿನ ಎಂಜಿನ್ ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "ಪಟ್ಟಿಯಲ್ಲಿನ ಮುಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "ಹಿಂದಿನ ಎಂಜಿನ್ ಸುಲಭಆಯ್ಕೆ (ಶಾರ್ಟ್-ಕಟ್) ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಗಳು"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "ಸ್ವಯಂ ಅಡಗಿಸುವಿಕೆ"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr "ಭಾಷೆಯ ಫಲಕದ ವರ್ತನೆ. 0 = ಮೆನುವಿನಲ್ಲಿ ಅಡಕಗೊಳಿಸಲಾಗಿದೆ, 1 = ಸ್ವಯಂ ಅಡಗಿಸು, 2 = ಯಾವಾಗಲೂ ತೋರಿಸು"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "ಭಾಷೆಯ ಫಲಕವನ್ನು ತೋರಿಸು"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 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 = ಕೆಳಗಿನ ಎಡ ಮೂಲೆ, 3 = ಕೆಳಗಿನ ಬಲ ಮೂಲೆ, 4 = ಇಚ್ಛೆಯ"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "ನೋಡಬೇಕಿರುವ (ಲುಕ್‌ಅಪ್‌) ಕೋಷ್ಟಕದ ಹೊಂದಿಕೆ. 0 = ಅಡ್ಡಲಾಗಿ, 1 = ಲಂಬವಾಗಿ"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನದ ಹೆಸರನ್ನು ತೋರಿಸು"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿ ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿ"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "ಭಾಷೆಯ ಫಲಕಕ್ಕಾಗಿನ ಅಗತ್ಯಾನುಗುಣ ಅಕ್ಷರಶೈಲಿಯ ಹೆಸರು"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "ಪೂರ್ವ-ಸಂಪಾದನಾ (ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "ಅನ್ವಯ ಕಿಟಕಿಯಲ್ಲಿ ಪೂರ್ವ-ಸಂಪಾದನಾ (ಪ್ರಿ-ಎಡಿಟ್) ಪಠ್ಯವನ್ನು ಅಡಕಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "ಜಾಗತಿಕ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಬಳಸಿ"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
 msgstr "ಅನ್ವಯವು ಇನ್‌ಪುಟ್ ಗಮನವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "ಹೆಸರಿನ ಪ್ರಿಫಿಕ್ಸುಗಳನ್ನು DConf ಕಾದಿರುಸುತ್ತದೆ"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "ಹೆಸರನ್ನು ಪರಿವರ್ತಿಸುವುದನ್ನು ತಡೆಯಲು DConf ಕೀಲಿಗಳ ಪ್ರಿಫಿಕ್ಸುಗಳು"
 
@@ -427,7 +425,7 @@
 msgid "Select an input method"
 msgstr "ಒಂದು ಇನ್‌ಪುಟ್ ವಿಧಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -457,15 +455,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "ದಯವಿಟ್ಟು ಒಂದು ಕೀಲಿಯನ್ನು (ಅಥವ ಒಂದು ಕೀಲಿ ಸಂಯೋಜನೆಯನ್ನು) ಒತ್ತಿ"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/main.py:98 ../setup/main.py:397
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನಕ್ಕೆ ಬದಲಾಯಿಸಲು ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಗಳನ್ನು ಶಿಫ್ಟಿನೊಂದಿಗೆ ಬಳಸು"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus ಡೀಮನ್ ಚಾಲನೆಯಲ್ಲಿಲ್ಲ. ನೀವದನ್ನು ಪ್ರಾರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:352
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -474,82 +472,147 @@
 msgstr "IBus ಅನ್ನು ಆರಂಭಿಸಲಾಗಿದೆ! ನೀವು IBus ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ, ಈ ಕೆಳಗಿನ ಸಾಲುಗಳನ್ನು $HOME/.bashrc ಗೆ ಸೇರಿಸಿ; ನಂತರ ನಿಮ್ಮ ಗಣಕತೆರೆಗೆ ಮರಳಿ ಪ್ರವೇಶಿಸಿ.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:367
+#: ../setup/main.py:366
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus ಡೀಮನ್ ಅನ್ನು %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ಗಾಗಿ ಕೀಲಿಮಣೆ ಸುಲಭಆಯ್ಕೆ ಕೀಲಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಬದಲಿಸುವಿಕೆ"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "ಕೇವಲ ಎಂಜಿನ್‌ನ ಹೆಸರನ್ನು ಮಾತ್ರ ಪಟ್ಟಿ ಮಾಡು"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "command [OPTIONS]"
-
-#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBusಗೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "ಭಾಷೆ: %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "ಯಾವುದೆ ಎಂಜಿನ್ ಅನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "ಜಾಗತಿಕ ಎಂಜಿನ್ ಅನ್ನು ಹೊಂದಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "ಜಾಗತಿಕ ಎಂಜಿನ್ ಅನ್ನು ಪಡೆಯುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ.\n"
 
-#: ../tools/main.vala:224
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "ವ್ಯವಸ್ಥೆಯ ನೋಂದಣಿ ಕ್ಯಾಶೆಯನ್ನು ಓದು."
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ FILE ಅನ್ನು ಓದು."
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ ಅಮಾನ್ಯವಾಗಿದೆ.\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "ವ್ಯವಸ್ಥೆಯ ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ಬರೆ."
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆ FILE ಅನ್ನು ಬರೆ."
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr "ಎಂಜಿನ್  ಅನ್ನು ಹೊಂದಿಸು ಅಥವ ಪಡೆದುಕೊ"
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon ಇಂದ ನಿರ್ಗಮಿಸು"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr "ಲಭ್ಯವಿರುವ ಎಂಜಿನ್‌ಗಳನ್ನು ತೋರಿಸು"
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr "(ಅನ್ವಯಿಸಲಾಗಿಲ್ಲ)"
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon ಅನ್ನು ಮರಳಿ ಸ್ಥಾಪಿಸು"
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr "ಆವೃತ್ತಿಯನ್ನು ತೋರಿಸು"
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯಲ್ಲಿರುವ ವಿಷಯವನ್ನು ತೋರಿಸು"
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr "ರಿಜಿಸ್ಟ್ರಿ ಕ್ಯಾಶೆಯನ್ನು ರಚಿಸು."
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon ನ D-Bus ವಿಳಾಸವನ್ನು ಮುದ್ರಿಸು"
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr "ಈ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
+
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "ಬಳಕೆ: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "ಆದೇಶಗಳು:\n\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s ಗೊತ್ತಿರದ ಆದೇಶ!\n"
 
-#: ../ui/gtk3/panel.vala:498
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr "IBus ಅಪ್‌ಡೇಟ್"
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr "ಸೂಪರ್+ಸ್ಪೇಸ್ ಈಗ ಪೂರ್ವನಿಯೋಜಿತ ಹಾಟ್‌ಕೀಲಿಯಾಗಿದೆ."
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "ಹಕ್ಕು (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus ಎನ್ನುವುದು Linux/Unix ಗಾಗಿನ ಒಂದು ಚತುರ ಇನ್‌ಪುಟ್ ಬಸ್."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ "
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "ಮರಳಿ ಆರಂಭಿಸು"
diff -Nru ibus-1.5.4/po/ko.po ibus-1.5.5/po/ko.po
--- ibus-1.5.4/po/ko.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/ko.po	2014-01-14 12:59:14.000000000 +0900
@@ -2,19 +2,19 @@
 # Korean translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Eunju Kim , 2009
-# Eun-Ju Kim , 2012
+# eukim , 2009
+# eukim , 2012
 # Hyunsok Oh , 2010
 # Michelle Kim , 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2012-12-06 15:35+0900\n"
-"PO-Revision-Date: 2013-04-05 00:44+0000\n"
-"Last-Translator: eukim \n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
+"Last-Translator: Michelle Kim \n"
 "Language-Team: Korean \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +86,7 @@
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr "입력 방식을 활성 또는 해제하기 위한 단축키"
 
@@ -126,11 +126,11 @@
 msgid "Language panel position:"
 msgstr "언어 패널 위치:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "시스템 트레이에 아이콘 보여주기"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "언어 도구 모음에 입력 방식 이름 보여주기"
 
@@ -189,15 +189,15 @@
 msgstr "기본 입력 방식은 목록의 맨 위에 있습니다.\n위로/아래 버튼을 사용하여 변경할 수 있습니다. "
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "입력 방식  "
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "시스템 키보드 레이아웃 사용  "
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "시스템 키보드 (XKB) 레이아웃 사용  "
 
@@ -205,7 +205,7 @@
 msgid "Keyboard Layout"
 msgstr "키보드 레이아웃  "
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "모든 어플리케이션에서 동일한 입력 방식 공유"
 
@@ -239,18 +239,6 @@
 msgid "About"
 msgstr "정보  "
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "입력 방식 프레임워크"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus 입력 방식 프레임워크 시작"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "엔진 미리로드"
@@ -279,118 +267,128 @@
 msgstr "IME 스위치 창을 표시하기 위해 밀리초 단위의 지연을 지정합니다. 기본값은 400입니다. 0 = 창을 즉시 표시합니다. 0 < 밀리초 단위로 지연합니다. 0 > 창을 표시하지 않고 이전/다음 엔진으로 전환합니다."
 
 #: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr ""
+
+#: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
 msgstr "트리거 단축키"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse의 트리거 단축키 "
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "단축키 활성화 "
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "입력 방식 전환을 위한 단축키 활성화 "
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "단축키 비활성화 "
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "입력 방식 전환을 위한 단축키 비활성화 "
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "다음 엔진 단축키"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "목록에 있는 다음 입력 방식으로 전환하기 위한 단축 키"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "이전 엔진 단축키"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "목록에 있는 이전 입력 방식으로 전환하기 위한 단축 키"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "자동 숨기기"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr "언어 패널의 동작 0 = 메뉴에 포함, 1 = 자동 숨기기, 2 = 항상 표시  "
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "언어 패널 위치"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 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 = 왼쪽 아래, 3 = 오른쪽 아래, 4 = 사용자 지정"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "검색 테이블의 방향  "
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "검색 테이블의 방향. 0 = 가로, 1 = 세로  "
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "입력 방식 이름 보여주기"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "사용자 정의 글꼴 사용  "
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름 사용"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "사용자 정의 글꼴"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "언어 패널 용 사용자 정의 글꼴 이름"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "편집전 텍스트 포함"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "어플리케이션 창에 편집전 텍스트를 포함"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "전역 입력 방식 사용"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "입력기를 디폴트로 활성화"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
 msgstr "프로그램의 입력창에 포커스가 가면 디폴트로 입력기를 활성화합니다"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "DConf는 이름 접두사를 보존합니다 "
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "DConf 키 접두사는 이름 변환을 중지합니다 "
 
@@ -427,7 +425,7 @@
 msgid "Select an input method"
 msgstr "입력 방식을 선택합니다"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -457,15 +455,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "키 또는 키 조합을 입력하십시오. "
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/main.py:98 ../setup/main.py:397
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "이전 입력 방식으로 전환하기 위해 shift를 단축키로 사용"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 데몬이 실행되고 있지 않습니다. 이를 시작하시겠습니까?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:352
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -474,82 +472,147 @@
 msgstr "IBus를 시작했습니다! IBus를 사용할 수 없는 경우 다음과 같은 행을 $HOME/.bashrc;에 추가하고 바탕 화면으로 다시 로그인합니다.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:367
+#: ../setup/main.py:366
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 데몬이 %d 초 이내에 시작하지 못했습니다 "
 
-#: ../setup/main.py:379
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s의 단축키를 선택"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "입력 방식 전환 중 "
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "엔진 이름만 나열 "
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "command [OPTIONS]"
-
-#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBus에 연결할 수 없습니다.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "언어: %s⏎\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "엔진이 설정되어 있지 않습니다.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "글로벌 엔진의 설정에 실패했습니다.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "글로벌 엔진의 취득에 실패했습니다.\n"
 
-#: ../tools/main.vala:224
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr ""
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon 종료"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon 재시작"
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr "버전 보기"
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "사용법: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "명령:\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s는 알 수 없는 명령입니다!\n"
 
-#: ../ui/gtk3/panel.vala:498
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr "IBus 업데이트"
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr "Super+space는 이제 기본 단축키입니다."
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus는 Linux/Unix를 위한 지능형 입력 버스입니다. "
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "김은주(eukim@redhat.com)"
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "재시작"
diff -Nru ibus-1.5.4/po/nl.po ibus-1.5.5/po/nl.po
--- ibus-1.5.4/po/nl.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/nl.po	2014-01-14 12:59:14.000000000 +0900
@@ -2,15 +2,15 @@
 # Dutch translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Geert Warrink , 2011-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2013-08-09 15:07+0900\n"
-"PO-Revision-Date: 2013-08-12 14:48+0000\n"
+"POT-Creation-Date: 2013-11-29 18:44+0900\n"
+"PO-Revision-Date: 2013-11-30 12:13+0000\n"
 "Last-Translator: Geert Warrink \n"
 "Language-Team: Dutch \n"
 "MIME-Version: 1.0\n"
@@ -181,40 +181,41 @@
 
 #: ../setup/setup.ui.h:41
 msgid ""
-"The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it."
-msgstr "De standaard invoermethode is de bovenste in de lijst.\nje kunt op/neer toetsen gebruiken om dit te veranderen."
+"The active input method can be switched around from the selected "
+"ones in the above list by pressing the keyboard shortcut keys or clicking "
+"the panel icon."
+msgstr "De actieve invoermethode kan omgeschakeld worden tussen de geselecteerden in de bovenstaande lijst met het induwen van de toetsenbord sneltoets of met het klikken op het paneel icoon."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Invoermethode"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "Gebruik systeem toetsenbordindeling"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "Gebruik systeem toetsenbord (XKB) indeling"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
 msgid "Keyboard Layout"
 msgstr "Toetsenbordindeling"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "Deel dezelfde input-methode voor alle toepassingen"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:47
 msgid "Global input method settings"
 msgstr "Globale invoermethode instellingen"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:49
 msgid ""
 "IBus\n"
 "The intelligent input bus\n"
@@ -224,15 +225,15 @@
 "\n"
 msgstr "IBus\nDe intelligente invoer bus\nHomepagina: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
 msgid "Start ibus on login"
 msgstr "Start ibus bij inloggen"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:57
 msgid "Startup"
 msgstr "Opstarten"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
 msgid "About"
 msgstr "Over"
 
@@ -452,15 +453,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "Druk op een toets (of een toetsencombinatie)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/main.py:99 ../setup/main.py:392
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Gebruik snelkoppeling met Shift voor het omschakelen naar de vorige invoermethode"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:326
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "De IBus daemon draait niet. Wil je het starten?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:347
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -469,17 +470,17 @@
 msgstr "IBus is gestart! Als je IBus niet kunt gebruiken, voeg je de volgende regels toe aan je $HOME/.bashrc; log daarna opnieuw in op je bureaublad.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:366
+#: ../setup/main.py:361
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus daemon kon niet binnen %d seconden gestart worden"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:373
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Selecteer sneltoets voor %s"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:374
 msgid "switching input methods"
 msgstr "bezig met omschakelen van invoermethodes "
 
@@ -533,83 +534,83 @@
 msgid "Write the registry cache FILE."
 msgstr "Schrijf het registry cache BESTAND."
 
-#: ../tools/main.vala:292
+#: ../tools/main.vala:293
 msgid "Set or get engine"
 msgstr "Stel engine in of haal deze op"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:294
 msgid "Exit ibus-daemon"
 msgstr "Verlaat ibus-daemon"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:295
 msgid "Show available engines"
 msgstr "Toon beschikbare engines"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:296
 msgid "(Not implemented)"
 msgstr "(Niet geimplementeerd)"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:297
 msgid "Restart ibus-daemon"
 msgstr "Start ibus-daemon opnieuw op"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:298
 msgid "Show version"
 msgstr "Toon versie"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:299
 msgid "Show the content of registry cache"
 msgstr "Toon de inhoud van registry cache"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:300
 msgid "Create registry cache"
 msgstr "Maak registry cache aan"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:301
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Print het D-Bus adres van ibus-daemon"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:302
 msgid "Show this information"
 msgstr "Toon deze informatie"
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Gebruik: %s COMMANDO [OPTIE...]\n\n"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Commando's:\n"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s is een onbekend commando!\n"
 
-#: ../ui/gtk3/panel.vala:348
+#: ../ui/gtk3/panel.vala:382
 msgid "IBus Update"
 msgstr "IBus update"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:383 ../ui/gtk3/panel.vala:394
 msgid "Super+space is now the default hotkey."
 msgstr "Super+spatie is nu de standaard snelkoppeling."
 
-#: ../ui/gtk3/panel.vala:657
+#: ../ui/gtk3/panel.vala:656
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:662
+#: ../ui/gtk3/panel.vala:661
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus is een intelligente invoer bus voor Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:665
 msgid "translator-credits"
 msgstr "Geert Warrink"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:697
 msgid "Restart"
 msgstr "Opnieuw starten"
diff -Nru ibus-1.5.4/po/pl.po ibus-1.5.5/po/pl.po
--- ibus-1.5.4/po/pl.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/pl.po	2014-01-14 12:59:14.000000000 +0900
@@ -2,15 +2,15 @@
 # Polish translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Piotr Drąg , 2011-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2013-08-09 15:07+0900\n"
-"PO-Revision-Date: 2013-08-09 16:52+0000\n"
+"POT-Creation-Date: 2013-11-29 18:44+0900\n"
+"PO-Revision-Date: 2013-12-01 15:22+0000\n"
 "Last-Translator: Piotr Drąg \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
@@ -181,40 +181,41 @@
 
 #: ../setup/setup.ui.h:41
 msgid ""
-"The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it."
-msgstr "Domyślna metoda wprowadzania znajduje się na górze listy.\nMożna użyć klawiszy w górę/w dół, aby ją zmienić."
+"The active input method can be switched around from the selected "
+"ones in the above list by pressing the keyboard shortcut keys or clicking "
+"the panel icon."
+msgstr "Aktywna metoda wprowadzania może być przełączana z wybranych metod na powyższej liście za pomocą skrótu klawiszowego lub kliknięcia ikony na panelu."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Metoda wprowadzania"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "Użycie systemowych ustawień układu klawiatury"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "Użycie systemowego układu klawiatury (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
 msgid "Keyboard Layout"
 msgstr "Układ klawiatury"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "Używanie tej samej metody wprowadzania we wszystkich aplikacjach"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:47
 msgid "Global input method settings"
 msgstr "Ustawienia globalnej metody wprowadzania"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:49
 msgid ""
 "IBus\n"
 "The intelligent input bus\n"
@@ -224,15 +225,15 @@
 "\n"
 msgstr "IBus\nInteligentna magistrala wprowadzania\nStrona domowa: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
 msgid "Start ibus on login"
 msgstr "Uruchamianie IBus podczas logowania"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:57
 msgid "Startup"
 msgstr "Uruchomienie"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
 msgid "About"
 msgstr "O programie"
 
@@ -452,15 +453,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "Proszę nacisnąć klawisz (lub kombinację klawiszy)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/main.py:99 ../setup/main.py:392
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Użycie skrótu z klawiszem Shift do przełączania do poprzedniej metody wprowadzania"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:326
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Usługa IBus nie jest uruchomiona. Uruchomić ją?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:347
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -469,17 +470,17 @@
 msgstr "IBus został uruchomiony. Jeśli nie można używać iBus, należy dodać poniższe wiersze do pliku $HOME/.bashrc i zalogować się ponownie.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:366
+#: ../setup/main.py:361
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Nie można uruchomić usługi IBus od %d sekund"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:373
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Wybór skrótu klawiszowego dla %s"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:374
 msgid "switching input methods"
 msgstr "przełączanie metod wprowadzania"
 
@@ -533,83 +534,83 @@
 msgid "Write the registry cache FILE."
 msgstr "Zapisuje PLIK pamięci podręcznej systemu."
 
-#: ../tools/main.vala:292
+#: ../tools/main.vala:293
 msgid "Set or get engine"
 msgstr "Ustawia lub uzyskuje mechanizm"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:294
 msgid "Exit ibus-daemon"
 msgstr "Kończy działanie usługi ibus-daemon"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:295
 msgid "Show available engines"
 msgstr "Wyświetla dostępne mechanizmy"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:296
 msgid "(Not implemented)"
 msgstr "(Niezaimplementowane)"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:297
 msgid "Restart ibus-daemon"
 msgstr "Ponownie uruchamia usługę ibus-daemon"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:298
 msgid "Show version"
 msgstr "Wyświetla wersję"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:299
 msgid "Show the content of registry cache"
 msgstr "Wyświetla zawartość pamięci podręcznej rejestru"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:300
 msgid "Create registry cache"
 msgstr "Tworzy pamięć podręczną rejestru"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:301
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Wyświetla adres D-Bus usługi ibus-daemon"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:302
 msgid "Show this information"
 msgstr "Wyświetla tę informację"
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Użycie %s POLECENIE [OPCJA...]\n\n"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Polecenia:\n"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s jest nieznanym poleceniem.\n"
 
-#: ../ui/gtk3/panel.vala:348
+#: ../ui/gtk3/panel.vala:382
 msgid "IBus Update"
 msgstr "Aktualizacja IBus"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:383 ../ui/gtk3/panel.vala:394
 msgid "Super+space is now the default hotkey."
 msgstr "Domyślnym przełącznikiem są teraz klawisze Super+Spacja."
 
-#: ../ui/gtk3/panel.vala:657
+#: ../ui/gtk3/panel.vala:656
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "Copyright (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:662
+#: ../ui/gtk3/panel.vala:661
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus jest inteligentną magistralą wprowadzania dla systemu Linux/UNIX."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:665
 msgid "translator-credits"
 msgstr "Piotr Drąg , 2009"
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:697
 msgid "Restart"
 msgstr "Uruchom ponownie"
diff -Nru ibus-1.5.4/po/ru.po ibus-1.5.5/po/ru.po
--- ibus-1.5.4/po/ru.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/ru.po	2014-01-14 12:59:14.000000000 +0900
@@ -2,7 +2,7 @@
 # Russian translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Koterpillar , 2009
 # Yulia , 2010
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2012-12-06 15:35+0900\n"
-"PO-Revision-Date: 2013-04-07 00:16+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
 "Last-Translator: Yulia \n"
 "Language-Team: Russian \n"
 "MIME-Version: 1.0\n"
@@ -85,7 +85,7 @@
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Сочетание клавиш для включения/выключения метода ввода"
 
@@ -125,11 +125,11 @@
 msgid "Language panel position:"
 msgstr "Расположение языковой панели:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "Показать значок в области уведомлений"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "Показывать название метода ввода на языковой панели"
 
@@ -188,15 +188,15 @@
 msgstr "По умолчанию используется первый в списке метод ввода.\nИспользуйте кнопки вверх/вниз для изменения."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Метод ввода"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "Использовать системную раскладку клавиатуры"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "Использовать системную раскладку (XKB)"
 
@@ -204,7 +204,7 @@
 msgid "Keyboard Layout"
 msgstr "Раскладка клавиатуры"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "Использовать один метод ввода для всех приложений"
 
@@ -238,18 +238,6 @@
 msgid "About"
 msgstr "О программе"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "Система методов ввода"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "Запустить систему методов ввода IBus"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "Предварительная загрузка методов ввода"
@@ -278,118 +266,128 @@
 msgstr "Настройте задержку показа окна выбора метода ввода, которое по умолчанию будет равно 400 мсек. Возможные значения: 0 - окно будет открыто сразу, 0 < задержка в миллисекундах, 0 > окно не будет показано."
 
 #: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "Сохраненный номер версии"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr "Сохраненный номер версии используется для сравнения предыдущей версии ibus с текущей."
+
+#: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
 msgstr "Сочетание клавиш для включения/выключения"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
-msgstr "Сочетание клавиш для "
+msgstr "Сочетание клавиш для  gtk_accelerator_parse"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "Включить сочетания клавиш"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "Сочетания для включения метода ввода"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "Отключить сочетания клавиш"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "Сочетание для отключения метода ввода"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "Клавиши для следующего метода ввода"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "Сочетание клавиш для переключения на следующий метод ввода в списке:"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "Клавиши для предыдущего метода ввода"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "Сочетание клавиш для переключения на предыдущий метод ввода в списке:"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "Автоматически скрывать"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr "Поведение языковой панели: 0 = встроена в меню, 1 = автоматически скрывать, 2 = всегда показывать"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "Расположение языковой панели"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 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 = левый нижний угол, 3 = правый нижний угол, 4 = произвольное"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "Ориентация таблицы поиска"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "Ориентация таблицы: 0 = горизонтально, 1 = вертикально."
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "Показывать название метода ввода"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "Использовать свой шрифт"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "Использовать свой шрифт для языковой панели"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "Свой шрифт"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "Свой шрифт для языковой панели"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "Вставить готовый текст"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "Вставить готовый текст в окно приложения"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "Использовать глобальный метод ввода"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "Включить метод ввода по умолчанию"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
 msgstr "Включить метод ввода по умолчанию при получении приложением фокуса ввода"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
-msgstr "DConf не сохраняет префиксы имен."
+msgstr "DConf сохраняет префиксы имен."
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "Префиксы ключей DConf для предотвращения преобразования имен"
 
@@ -426,7 +424,7 @@
 msgid "Select an input method"
 msgstr "Выберите метод ввода"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -456,15 +454,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "Нажмите клавишу (или сочетание клавиш)"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/main.py:98 ../setup/main.py:397
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Использовать сочетание SHIFT для выбора предыдущего метода ввода"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus не выполняется. Запустить?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:352
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -473,82 +471,147 @@
 msgstr "IBus запущен. Если у вас нет доступа к IBus, добавьте приведенные ниже строки в $HOME/.bashrc и заново войдите в систему.\nexport GTK_IM_MODULE=ibus\nexport XMODIFIERS=@im=ibus\nexport QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:367
+#: ../setup/main.py:366
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Не удалось запустить IBus через %d сек."
 
-#: ../setup/main.py:379
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Выберите комбинацию клавиш для %s"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "изменение методов ввода"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "Показать имя модуля"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "команда [ПАРАМЕТРЫ]"
-
-#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "Не удалось подключиться к IBus.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "язык: %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "Модуль не выбран.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "Не удалось настроить глобальный модуль.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "Не удалось получить глобальный модуль.\n"
 
-#: ../tools/main.vala:224
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "Чтение кэша системного реестра."
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr "Недействительный кэш реестра.\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr ""
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr ""
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr ""
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr ""
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr ""
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr ""
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr ""
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr ""
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr ""
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr ""
+
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Формат: %s КОМАНДА [ПАРАМЕТР...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "Команды:\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "Неизвестная команда: %s\n"
 
-#: ../ui/gtk3/panel.vala:498
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr ""
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "(c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — интеллектуальная система ввода для Linux и Unix."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "Alexey Kotlyarov , 2009.\nYulia , 2010."
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "Перезапустить"
diff -Nru ibus-1.5.4/po/ta.po ibus-1.5.5/po/ta.po
--- ibus-1.5.4/po/ta.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/ta.po	2014-01-14 12:59:14.000000000 +0900
@@ -2,20 +2,22 @@
 # Tamil translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Arun Prakash , 2012
+# Arun Prakash , 2012
 # Felix I , 2011
 # Felix I , 2011
 # I Felix , 2010
 # I. Felix , 2009
 # shkumar , 2012
+# shkumar , 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2012-12-06 15:35+0900\n"
-"PO-Revision-Date: 2012-12-06 11:22+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
 "Last-Translator: shkumar \n"
 "Language-Team: Tamil \n"
 "MIME-Version: 1.0\n"
@@ -50,7 +52,7 @@
 
 #: ../setup/setup.ui.h:7
 msgid "Custom"
-msgstr "தனிபயன்"
+msgstr "தனிப்பயன்"
 
 #: ../setup/setup.ui.h:8
 msgid "Embedded in menu"
@@ -88,7 +90,7 @@
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr "உள்ளீடு முறைமை துவக்க அல்லது நிறுத்த குறுக்குவிசைகளை அமை"
 
@@ -128,11 +130,11 @@
 msgid "Language panel position:"
 msgstr "மொழி பேனல் படம்:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "கணினி தட்டில் சின்னத்தை காட்டு"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "மொழி பட்டையில் உள்ளீடு முறையின் பெயரை காட்டு"
 
@@ -150,7 +152,7 @@
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
-msgstr "தனிபயன் எழுத்துருவை பயன்படுத்து:"
+msgstr "தனிப்பயன் எழுத்துருவை பயன்படுத்து:"
 
 #: ../setup/setup.ui.h:33
 msgid "Font and Style"
@@ -191,15 +193,15 @@
 msgstr "பட்டியலில் முன்னிருப்பு உள்ளீடு முறை மேலே இருக்கும்.\nமேல்/கீழ் பொத்தானை பயன்படுத்தி அதனை மாற்றவும்."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "உள்ளீடு முறை"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "கணினி விசைப்பலகை அமைப்பை பயன்படுத்து"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "கணினி விசைப்பலகை (XKB) அமைப்பை பயன்படுத்து"
 
@@ -207,7 +209,7 @@
 msgid "Keyboard Layout"
 msgstr "விசைப்பலகை அமைப்பு"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "அனைத்து பயன்பாடுகளிலும் சில உள்ளீடு முறையை பகிரவும்"
 
@@ -241,21 +243,9 @@
 msgid "About"
 msgstr "பற்றி"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "உள்ளீடு முறை ஃபிரேம்வொர்க்"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus உள்ளீடு முறை ஃபிரேம்வொர்க்கை துவக்கு"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
-msgstr "முன்ஏற்றப்பட்ட இயந்திரங்கள்"
+msgstr "முன்ஏற்றல் இயந்திரங்கள்"
 
 #: ../data/ibus.schemas.in.h:2
 msgid "Preload engines during ibus starts up"
@@ -281,118 +271,128 @@
 msgstr "IME மாற்ற சாளரத்தைக் காண்பிக்க, பாப்-அப் தாமத மில்லிசெகன்டை அமைக்கவும். முன்னிருப்பு மதிப்பு400 ஆகும். 0 = உடனடியாக சாளரத்தைக் காண்பிக்க. 0 < தாமத மில்லிசெகன்ட். 0 > சாளரத்தைக் காண்பிக்காமல் முந்தைய/அடுத்த எஞ்சின்களுக்கு மாற்ற."
 
 #: ../data/ibus.schemas.in.h:7
-msgid "Trigger shortcut keys"
-msgstr "ட்ரிகர் குறுக்குவிசை"
+msgid "Saved version number"
+msgstr "சேமிக்கப்பட்ட பதிப்பு எண்"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr "சேமிக்கப்பட்ட பதிப்பு எண்ணானது முன்னர் நிறுவப்பட்ட ibus மற்றும் தற்போதுள்ள ibus இல் ஒன்று ஆகியவற்றுக்கு இடையே உள்ள வேறுபாட்டைக் கண்டறியப் பயன்படும்."
 
 #: ../data/ibus.schemas.in.h:9
+msgid "Trigger shortcut keys"
+msgstr "குறுக்குவிசைகளை செயல்படுத்து"
+
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse க்கான குறுக்கு விசைகளை இயக்கு"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "குறுக்குவிசைக்களை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "உள்ளீடு முறையை இயக்கும் குறுக்குவிசைகள்"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "குறுக்குவிசைகளை செயல்நீக்கு"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "உள்ளீடு முறையை நிறுத்தும் குறுக்குவிசைகள்"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "அடுத்த இயந்திர குறுக்குவிசை"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "பட்டியலில் அடுத்த உள்ளீடு முறைக்கு மாற்றுவதற்கான குறுக்குவழி விசைகள்"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "முந்தைய இயந்திர குறுக்குவிசைகள்"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "முந்தைய உள்ளீடு முறைக்கு மாற்றுவதற்கான குறுக்குவழி விசைகள்"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "தானாக மறை"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr "மொழி பலகத்தின் பண்புகள். 0 = மெனுவில் உட்பொதியப்பட்டது, 1 = தானாக மறை, 2 = எப்போதும் காட்டு"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "மொழி பேனல் இடம்"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 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 = கீழ் இடது ஓரம், 3 = கீழ் வலது ஓரம், 4 = தனிபயன்"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "காணும் அட்டவணையின் திசை"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "காணும் அட்டவணையின் திசை. 0 = கிடைமட்டம், 1 = செங்குத்து"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "உள்ளீடு முறையின் பெயரை காட்டு"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
-msgstr "தனிபயன் எழுத்துருவை பயன்படுத்து"
+msgstr "தனிப்பயன் எழுத்துருவை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "மொழி பலகத்தில் தனிபயன் எழுத்துரு பெயர்"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
-msgstr "தனிபயன் எழுத்துரு"
+msgstr "தனிப்பயன் எழுத்துரு"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
-msgstr "தனிபயன் எழுத்துரு பெயர் மொழி பலகத்துக்கு"
+msgstr "மொழி பலகத்துக்கான தனிப்பயன் எழுத்துரு பெயர்"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "பயன்பாடு சாளரத்தில் உட்பொதியப்பட்ட Preedit உரை"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "பொது உள்ளீடு முறையை பயன்படுத்து"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
 msgstr "பயன்பாடு உள்ளீடுக்கு உட்படும்போது முன்னிருப்பாக உள்ளீடு முறையை செயல்படுத்து"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "DConf ஆனது பெயர் முன்னொட்டுகளைப் பாதுகாத்து வைக்கிறது"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "பெயர் மரபை நிறுத்த DConf விசைகளின் முன்னொட்டுகள்"
 
@@ -400,7 +400,7 @@
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "Copyright (c) 2007-2010 Peng Huang\nCopyright (c) 2007-2010 Red Hat, Inc."
+msgstr "பதிப்புரிமை (c) 2007-2010 Peng Huang\nபதிப்புரிமை (c) 2007-2010 Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
@@ -429,7 +429,7 @@
 msgid "Select an input method"
 msgstr "ஒரு உள்ளீடு முறையை தேர்ந்தெடு"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -459,15 +459,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "ஒரு விசையை அழுத்தவும் (அல்லது ஒரு விசை கலவையை)"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/main.py:98 ../setup/main.py:397
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "முந்தைய உள்ளீட்டு முறைக்கு மாற குறுக்குவழியை ஷிஃப்ட் விசையுடன் பயன்படுத்தவும்"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus டெமான் இயங்கவில்லை. அதைத் தொடங்க வேண்டுமா?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:352
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -476,82 +476,147 @@
 msgstr "IBus தொடங்கப்பட்டது! உங்களால் IBus ஐப் பயன்படுத்த முடியாவிட்டால், உங்கள் $HOME/.bashrc; இல் பின்வரும் வரிகளைச் சேர்த்து உங்கள் டெஸ்க்டாப்பில் மீண்டும் புகுபதிவு செய்யவும்.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:367
+#: ../setup/main.py:366
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "%d வினாடிகளில் IBus டெமானைத் தொடக்க முடியவில்லை"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%sக்கான விசைப்பலகை குறுக்குவழியை தேர்ந்தெடு"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "உள்ளீட்டு முறைகளை மாற்றுதல்"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "எஞ்சின் பெயரை மட்டும் பட்டியலிடு"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "கட்டளை [OPTIONS]"
-
-#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBus உடன் இணைக்க முடியாது.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "மொழி: %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "எஞ்சின் அமைக்கப்படவில்லை.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "முழுமைக்குமான எஞ்சினை அமைத்தல் தோல்வி.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "முழுமைக்குமான எஞ்சினை பெறுதல் தோல்வி.\n"
 
-#: ../tools/main.vala:224
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "கணினி பதிவக தேக்ககத்தை வாசி."
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "பதிவக தேக்கக FILE ஐ வாசி."
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr "பதிவக தேக்ககம் செல்லுபடியாகாதது.\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "கணினி பதிவக தேக்ககத்தில் எழுது."
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "பதிவக தேக்கக FILE இல் எழுது."
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr "எஞ்சினை அமை அல்லது பெறு"
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon இலிருந்து வெளியேறு"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr "இருக்கும் எஞ்சின்களைக் காட்டு"
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr "(செயல்படுத்தப்படவில்லை)"
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon ஐ மறுதுவக்கு"
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr "பதிப்பைக் காட்டு"
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr "பதிவக தேக்கக உள்ளடக்கத்தைக் காண்பி"
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr "பதிவக தேக்ககத்தை உருவாக்கு"
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon இன் D-Bus முகவரியை அச்சிடு"
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr "இந்தத் தகவலைக் காட்டு"
+
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "பயன்பாடு: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "கட்டளைகள் :\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s என்பது தெரியாத கட்டளை!\n"
 
-#: ../ui/gtk3/panel.vala:498
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr "IBus புதுப்பிப்பு"
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr "இப்போது Super+space என்பது முன்னிருப்பு குறுக்குவிசையாகும்."
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "பதிப்புரிமை (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus Linux/Unixக்கான உள்ளிடு பஸ்."
+msgstr "IBus Linux/Unixக்கான உள்ளீடு பஸ்."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "I. Felix "
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "மறுதுவக்கம்"
diff -Nru ibus-1.5.4/po/te.po ibus-1.5.5/po/te.po
--- ibus-1.5.4/po/te.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/te.po	2014-01-14 12:59:14.000000000 +0900
@@ -2,17 +2,19 @@
 # Telugu translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Krishnababu Krothapalli , 2009
+# Krishnababu Krothapalli , 2009
 # Krishnababu Krothapalli , 2012-2013
 # ప్రవీణ్ ఇళ్ళ , 2011
+# ప్రవీణ్ ఇళ్ళ , 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2012-12-06 15:35+0900\n"
-"PO-Revision-Date: 2013-03-29 12:30+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
 "Last-Translator: Krishnababu Krothapalli \n"
 "Language-Team: Telugu \n"
 "MIME-Version: 1.0\n"
@@ -85,7 +87,7 @@
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr "ఇన్‌పుట్ పద్ధతిని ఆన్ చేయుటకు లేదా ఆఫ్ చేయుటకు లఘువులు"
 
@@ -125,11 +127,11 @@
 msgid "Language panel position:"
 msgstr "భాషా ప్యానల్ స్థానము:"
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "సిస్టమ్ ట్రే నందు ప్రతీకను చూపించు"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "భాషా పట్టీపై ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
@@ -188,15 +190,15 @@
 msgstr "జాబితాలో పైన వున్నది అప్రమేయ ఇన్‌పుట్ విధానం అవుతుంది.\nదానిని మార్చుటకు మీరు పైకి/క్రిందకు బటన్సును వుపయోగించవచ్చు."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "ఇన్‌పుట్ పద్ధతి"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "వ్యవస్థ కీబోర్డు నమూనా ఉపయోగించు"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "వ్యవస్థ కీబోర్డు (XKB) నమూనా ఉపయోగించు"
 
@@ -204,7 +206,7 @@
 msgid "Keyboard Layout"
 msgstr "కీబోర్డు నమూనా"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "అన్ని అనువర్తనములనందు యిన్పుట్ పద్దతిని భాగస్వామ్యపరచుము"
 
@@ -238,18 +240,6 @@
 msgid "About"
 msgstr "గురించి"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "ఇన్‌పుట్ పద్ధతి ఫ్రేమ్‌వర్క్"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "IBus ఇన్‌పుట్ పద్ధతి ఫ్రేమ్‌వర్కును ప్రారంభించు"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "ముందుగా లోడైన ఇంజన్లు"
@@ -278,118 +268,128 @@
 msgstr "IME స్విజర్ విండోను చూపుటకు పాపప్ ఆలస్యాన్ని మిల్లీసెకన్లలో అమర్చు. అప్రమేయం 400. 0 = విండోను తక్షణమే చూపును. 0 < ఆలస్యం మిల్లీసెకన్లలో. 0 > విండోను చూపదు మరియు క్రితం/తరువాతి యింజన్లకు మారును."
 
 #: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "దాచిన వర్షన్ సంఖ్య"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr "దాచిన వర్షన్ సంఖ్య అనునది గతంలో సంస్థాపించిన ibus వర్షనుకు మరియు ప్రస్తుత ibus వర్షనుకు మధ్యని తేడాను పరిశీలించుటకు వుపయోగించును."
+
+#: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
 msgstr "లఘవులను నొక్కుము"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "gtk_accelerator_parse కొరకు ట్రిగ్గర్ లఘ కీలు"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "లఘు కీ లను చేతనంచేయి"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "ఇన్‌పుట్ పద్ధతి ఆన్ చేయుటకు కీ లఘువులు"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "అడ్డదారి కీలను అచేతనంచేయి"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "ఇన్‌పుట్ పద్ధతి ఆపుటకు కీ లఘువులు"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "తరువాతి ఇంజన్‌కు లఘువులు"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "జాబితానందలి తరువాతి ఇన్పుట్ పద్ధతినకు మారుటకు లఘువులు"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "క్రితం ఇంజన్ లఘువులు"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "జాబితానందలి ముందరి ఇన్‌పుట్ పద్ధతినకు మారుటకు లఘువులు"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "స్వయంచాలకంగా దాగిఉండు"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr "భాషా ప్యానల్ యొక్క ప్రవర్తన. 0 = మెనూనందు యెంబెడ్‌చేయి, 1 = స్వయంచాలకంగా మరుగునవుంచు, 2 = ఎల్లప్పుడూ చూపించు"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "భాషా ప్యానల్ స్థానము"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 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 = క్రింది ఎడమ మూల, 3 = క్రింది కుడి మూల, 4 = మలచుకొనిన"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "లుకప్ పట్టిక సర్దుబాటు"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "లుకప్ పట్టిక సర్దుబాటు. 0 = చదరముగా, 1 = నిలువుగా"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "ఇన్‌పుట్ పద్ధతి పేరును చూపించు"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "మలచుకొనిన ఫాంటు ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "భాషా ప్యానల్ కొరకు మలచుకొనిన ఫాంట్ నామము వుపయోగించుము"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "అనురూపిత ఫాంటు"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "భాష ప్యానల్ కొరకు మలచుకొనిన ఫాంటు పేరు"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "ఎంబెడెడ్ ప్రిఎడిట్ పాఠము"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "అనువర్తన విండోనందు ఎంబెడెడ్ ప్రిఎడిట్ పాఠము"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "గ్లోబల్ ఇన్‌పుట్ పద్ధతిని ఉపయోగించు"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనముచేయుము"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
 msgstr "అనువర్తనము ఇన్‌పుట్ ఫోకస్‌ను పొందగానే ఇన్‌పుట్ పద్ధతిని అప్రమేయంగా చేతనము చేయుము"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "DConf వుంచిన పేరు ప్రిఫిక్సెస్"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "పేరు మార్పును ఆపుటకు DConf కీల ప్రిఫిక్సులు"
 
@@ -426,7 +426,7 @@
 msgid "Select an input method"
 msgstr "ఒక ఇన్‌పుట్ పద్ధతిని ఎంచుకోండి"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -456,15 +456,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "దయచేసి కీను వత్తండి (లేదా కీ మిశ్రమాన్ని)"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/main.py:98 ../setup/main.py:397
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "క్రితం యిన్పుట్ పద్దతికి మారుటకు లఘవును shift తో వుపయోగించు"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus డెమోన్ నడుచుటలేదు. మీరు ప్రారంభించాలని అనుకొనుచున్నారా?"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:352
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -473,82 +473,147 @@
 msgstr "IBus ప్రారంభమైంది! మీరు IBus వుపయోగించలేకుంటే, మీ $HOME/.bashrc కు కింది పంక్తులను జతచేయండి; అప్పుడు తిరిగి డెస్కుటాప్‌కు ప్రవేశించండి.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:367
+#: ../setup/main.py:366
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus డీమన్ %d క్షణాలలో ప్రారంభం కాలేకపోయింది"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s కొరకు కీబోర్డు లఘువును ఎంచుకోండి"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "ఇన్పుట్ పద్దతులు మార్చుట"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "ఇంజన్ పేరు మాత్రమే జాబితాచేయి"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "ఆదేశం [ఐచ్చికాలు]"
-
-#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "IBus కు అనుసంధానం కాలేదు.\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "భాష: %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "ఏ యింజన్ అమర్చలేదు.\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "గ్లోబల్ యింజన్ అమర్చుట విఫలమైంది.\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "గ్లోబల్ యింజన్ పొందుట విఫలమైంది.\n"
 
-#: ../tools/main.vala:224
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "వ్యవస్థ రిజిస్ట్రీ క్యాచీ చదువు."
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "రిజిస్ట్రీ క్యాచీ FILE చదువు."
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr "రిజిస్ట్రీ క్యాచీ చెల్లనిది.\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "వ్యవస్థ రిజిస్ట్రీ క్యాచీ వ్రాయి."
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "రిజిస్ట్రీ క్యాచీ FILE వ్రాయి."
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr "ఇంజన్ అమర్చు లేదా పొందు"
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "ibus-daemon నిష్క్రమించు"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr "అందుబాటులోని ఇంజన్లు చూపుము"
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr "(ఇంప్లిమెంట్ చేయలేదు)"
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "ibus-daemon పునఃప్రారంభించు"
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr "వర్షన్ చూపు"
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr "రిజిస్ట్రీ క్యాచీ యొక్క కాంటెంట్ చూపు"
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr "రిజిస్ట్రీ క్యాచీ సృష్టించు"
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "ibus-daemon యొక్క D-Bus చిరునామా ముద్రించు"
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr "ఈ సమాచారం చూపుము"
+
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "వాడుక: %s COMMAND [OPTION...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "ఆదేశాలు:\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s తెలియని ఆదేశం!\n"
 
-#: ../ui/gtk3/panel.vala:498
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr "IBus నవీకరణ"
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr "ఇప్పుడు Super+space అప్రమేయ హాట్‌కీ."
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "కాపీరైట్ (c) 2007-2012 Peng Huang\n"
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus అనునది Linux/Unix కొరకు తెలివైన ఇన్‌పుట్ బస్."
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "కృష్ణబాబు కె  2009.\nప్రవీణ్ యిళ్ళ  2010-11."
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "పునఃప్రారంభించు"
diff -Nru ibus-1.5.4/po/uk.po ibus-1.5.5/po/uk.po
--- ibus-1.5.4/po/uk.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/uk.po	2014-01-14 12:59:14.000000000 +0900
@@ -2,16 +2,16 @@
 # Ukrainian translation of ibus.
 # Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
-# Yuri Chornoivan , 2011-2012
+# Yuri Chornoivan , 2011-2013
 # Yuri Chornoivan , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2013-08-09 15:07+0900\n"
-"PO-Revision-Date: 2013-08-09 12:44+0000\n"
+"POT-Creation-Date: 2013-11-29 18:44+0900\n"
+"PO-Revision-Date: 2013-11-30 07:01+0000\n"
 "Last-Translator: Yuri Chornoivan \n"
 "Language-Team: Ukrainian \n"
 "MIME-Version: 1.0\n"
@@ -182,40 +182,41 @@
 
 #: ../setup/setup.ui.h:41
 msgid ""
-"The default input method is the top one in the list.\n"
-"You may use up/down buttons to change it."
-msgstr "Типовий спосіб введення — найвищий пункт у списку.\nЗмінити порядок пунктів можна за допомогою кнопок «Вгору/Вниз»."
+"The active input method can be switched around from the selected "
+"ones in the above list by pressing the keyboard shortcut keys or clicking "
+"the panel icon."
+msgstr "Активний спосіб введення можна перемкнути у межах визначеного вище списку натисканням клавіатурного скорочення або піктограми на панелі."
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
+#: ../setup/setup.ui.h:42 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Спосіб введення"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
+#: ../setup/setup.ui.h:43 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "Використовувати розкладку клавіатури системи"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "Використовувати розкладку клавіатури системи (XKB)"
 
-#: ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:45
 msgid "Keyboard Layout"
 msgstr "Розкладка клавіатури"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
+#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "Використовувати один спосіб введення для всіх програм"
 
-#: ../setup/setup.ui.h:48
+#: ../setup/setup.ui.h:47
 msgid "Global input method settings"
 msgstr "Загальні параметри способів введення"
 
-#: ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:48
 msgid "Advanced"
 msgstr "Додатково"
 
-#: ../setup/setup.ui.h:50
+#: ../setup/setup.ui.h:49
 msgid ""
 "IBus\n"
 "The intelligent input bus\n"
@@ -225,15 +226,15 @@
 "\n"
 msgstr "IBus\nІнтелектуальний канал введення\nДомашня сторінка: http://code.google.com/p/ibus\n\n\n\n"
 
-#: ../setup/setup.ui.h:57
+#: ../setup/setup.ui.h:56
 msgid "Start ibus on login"
 msgstr "Запускати ibus при вході"
 
-#: ../setup/setup.ui.h:58
+#: ../setup/setup.ui.h:57
 msgid "Startup"
 msgstr "Запуск"
 
-#: ../setup/setup.ui.h:59 ../setup/engineabout.py:34
+#: ../setup/setup.ui.h:58 ../setup/engineabout.py:34
 msgid "About"
 msgstr "Інформація"
 
@@ -453,15 +454,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "Будь ласка, натисніть клавішу (або комбінацію клавіш)"
 
-#: ../setup/main.py:98 ../setup/main.py:397
+#: ../setup/main.py:99 ../setup/main.py:392
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "Використовувати комбінацію з Shift для перемикання на попередній спосіб введення"
 
-#: ../setup/main.py:331
+#: ../setup/main.py:326
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "Фонову службу IBus не запущено. Хочете її запустити?"
 
-#: ../setup/main.py:352
+#: ../setup/main.py:347
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -470,17 +471,17 @@
 msgstr "IBus запущено! Якщо ви не можете скористатися IBus, додайте вказані нижче рядки до файла $HOME/.bashrc; потім вийдіть зі стільничного середовища і увійдіть до нього знову.\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:366
+#: ../setup/main.py:361
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "Не вдалося запустити фонову службу IBus протягом %d секунд"
 
-#: ../setup/main.py:378
+#: ../setup/main.py:373
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Виберіть клавіатурне скорочення для дії %s"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:374
 msgid "switching input methods"
 msgstr "перемикання способів введення"
 
@@ -534,83 +535,83 @@
 msgid "Write the registry cache FILE."
 msgstr "Записати дані до кешу регістру у файлі ФАЙЛ."
 
-#: ../tools/main.vala:292
+#: ../tools/main.vala:293
 msgid "Set or get engine"
 msgstr "Встановити рушій або отримати дані щодо встановленого рушія"
 
-#: ../tools/main.vala:293
+#: ../tools/main.vala:294
 msgid "Exit ibus-daemon"
 msgstr "Завершити роботу фонової служби ibus"
 
-#: ../tools/main.vala:294
+#: ../tools/main.vala:295
 msgid "Show available engines"
 msgstr "Показати список доступних рушіїв"
 
-#: ../tools/main.vala:295
+#: ../tools/main.vala:296
 msgid "(Not implemented)"
 msgstr "(не реалізовано)"
 
-#: ../tools/main.vala:296
+#: ../tools/main.vala:297
 msgid "Restart ibus-daemon"
 msgstr "Перезапустити фонову службу ibus"
 
-#: ../tools/main.vala:297
+#: ../tools/main.vala:298
 msgid "Show version"
 msgstr "Показати дані щодо версії"
 
-#: ../tools/main.vala:298
+#: ../tools/main.vala:299
 msgid "Show the content of registry cache"
 msgstr "Показати вміст кешу регістру"
 
-#: ../tools/main.vala:299
+#: ../tools/main.vala:300
 msgid "Create registry cache"
 msgstr "Створити кеш регістру"
 
-#: ../tools/main.vala:300
+#: ../tools/main.vala:301
 msgid "Print the D-Bus address of ibus-daemon"
 msgstr "Вивести адресу D-Bus фонової служби ibus"
 
-#: ../tools/main.vala:301
+#: ../tools/main.vala:302
 msgid "Show this information"
 msgstr "Показати цю довідкову інформацію"
 
-#: ../tools/main.vala:307
+#: ../tools/main.vala:308
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "Користування: %s КОМАНДА [ПАРАМЕТР...]\n\n"
 
-#: ../tools/main.vala:308
+#: ../tools/main.vala:309
 #, c-format
 msgid "Commands:\n"
 msgstr "Команди:\n"
 
-#: ../tools/main.vala:337
+#: ../tools/main.vala:338
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "Команда %s є невідомою програмі!\n"
 
-#: ../ui/gtk3/panel.vala:348
+#: ../ui/gtk3/panel.vala:382
 msgid "IBus Update"
 msgstr "Оновлення IBus"
 
-#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+#: ../ui/gtk3/panel.vala:383 ../ui/gtk3/panel.vala:394
 msgid "Super+space is now the default hotkey."
 msgstr "Тепер типовим клавіатурним скороченням є Super+Пробіл."
 
-#: ../ui/gtk3/panel.vala:657
+#: ../ui/gtk3/panel.vala:656
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "© Peng Huang, 2007–2012\n"
 
-#: ../ui/gtk3/panel.vala:662
+#: ../ui/gtk3/panel.vala:661
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus — інтелектуальний канал введення даних у Linux/Unix."
 
-#: ../ui/gtk3/panel.vala:666
+#: ../ui/gtk3/panel.vala:665
 msgid "translator-credits"
 msgstr "Юрій Чорноіван "
 
-#: ../ui/gtk3/panel.vala:698
+#: ../ui/gtk3/panel.vala:697
 msgid "Restart"
 msgstr "Перезапустити"
diff -Nru ibus-1.5.4/po/zh_CN.po ibus-1.5.5/po/zh_CN.po
--- ibus-1.5.4/po/zh_CN.po	2013-09-20 12:15:50.000000000 +0900
+++ ibus-1.5.5/po/zh_CN.po	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 # translation of ibus.pot to Simplified Chinese
 # Simplified Chinese Translation of ibus.
-# Copyright (C) 2007-2013 Peng Huang 
+# Copyright (C) 2008-2013 Peng Huang 
 # This file is distributed under the same license as the ibus package.
-# 
+#
 # Translators:
 # Christopher Meng , 2012-2013
 # Tommy He , 2012
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: IBus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/list\n"
-"POT-Creation-Date: 2012-12-06 15:35+0900\n"
-"PO-Revision-Date: 2013-03-01 13:24+0000\n"
+"POT-Creation-Date: 2013-08-09 15:07+0900\n"
+"PO-Revision-Date: 2013-11-20 11:18+0000\n"
 "Last-Translator: Christopher Meng \n"
 "Language-Team: Chinese (China) \n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@
 msgid "..."
 msgstr "..."
 
-#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:8
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:10
 msgid "The shortcut keys for turning input method on or off"
 msgstr "打开关闭输入法的快捷键"
 
@@ -128,11 +128,11 @@
 msgid "Language panel position:"
 msgstr "语言栏位置："
 
-#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:24
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:26
 msgid "Show icon on system tray"
 msgstr "在系统托盘上显示图标"
 
-#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:26
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:28
 msgid "Show input method name on language bar"
 msgstr "语言栏上显示输入法名称"
 
@@ -191,15 +191,15 @@
 msgstr "列表中的第一个输入法是默认输入法。\n您可以使用上/下按钮更改。"
 
 #. create im name & icon column
-#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:64
+#: ../setup/setup.ui.h:43 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "输入法"
 
-#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:27
+#: ../setup/setup.ui.h:44 ../data/ibus.schemas.in.h:29
 msgid "Use system keyboard layout"
 msgstr "使用系统键盘布局"
 
-#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:28
+#: ../setup/setup.ui.h:45 ../data/ibus.schemas.in.h:30
 msgid "Use system keyboard (XKB) layout"
 msgstr "使用系统键盘（XKB）布局"
 
@@ -207,7 +207,7 @@
 msgid "Keyboard Layout"
 msgstr "键盘布局"
 
-#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:36
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:38
 msgid "Share the same input method among all applications"
 msgstr "在所有应用程序中共享同一个输入法"
 
@@ -241,18 +241,6 @@
 msgid "About"
 msgstr "关于"
 
-#: ../bus/ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../bus/ibus.desktop.in.h:2
-msgid "Input Method Framework"
-msgstr "输入法框架"
-
-#: ../bus/ibus.desktop.in.h:3
-msgid "Start IBus Input Method Framework"
-msgstr "启动 IBus 输入法框架"
-
 #: ../data/ibus.schemas.in.h:1
 msgid "Preload engines"
 msgstr "预加载引擎"
@@ -281,118 +269,128 @@
 msgstr "设定输入法切换窗口弹出的延时微秒数。默认为 400。0 代表立即显示窗口。 0 < 延迟微秒数 0 > 当切换上一个/下一个输入法引擎时不显示窗口。"
 
 #: ../data/ibus.schemas.in.h:7
+msgid "Saved version number"
+msgstr "已储存的版本号"
+
+#: ../data/ibus.schemas.in.h:8
+msgid ""
+"The saved version number will be used to check the difference between the "
+"version of the previous installed ibus and one of the current ibus."
+msgstr "已保存的版本号将被用作检查之前安装的 ibus 版本和当前版本间的区别。"
+
+#: ../data/ibus.schemas.in.h:9
 msgid "Trigger shortcut keys"
 msgstr "触发快捷键"
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:11
 msgid "Trigger shortcut keys for gtk_accelerator_parse"
 msgstr "为 gtk_accelerator_parse 触发快捷键"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:12
 msgid "Enable shortcut keys"
 msgstr "应用快捷键"
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:13
 msgid "The shortcut keys for turning input method on"
 msgstr "开启输入法的快捷键"
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:14
 msgid "Disable shortcut keys"
 msgstr "禁用快捷键"
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:15
 msgid "The shortcut keys for turning input method off"
 msgstr "关闭输入法的快捷键"
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:16
 msgid "Next engine shortcut keys"
 msgstr "下一个引擎快捷键"
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:17
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr "切换到列表中下一个输入法快捷键"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:18
 msgid "Prev engine shortcut keys"
 msgstr "上一个引擎快捷键"
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for switching to the previous input method"
 msgstr "切换到列表中上一个输入法快捷键"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:20
 msgid "Auto hide"
 msgstr "自动隐藏"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:21
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr "语言栏行为。0 = 嵌入菜单，1 = 自动隐藏，2 = 总是显示。"
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:22
 msgid "Language panel position"
 msgstr "语言栏位置"
 
-#: ../data/ibus.schemas.in.h:21
+#: ../data/ibus.schemas.in.h:23
 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 = 左下角，3 = 右下角，4 = 自定义"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:24
 msgid "Orientation of lookup table"
 msgstr "候选词表方向"
 
-#: ../data/ibus.schemas.in.h:23
+#: ../data/ibus.schemas.in.h:25
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr "候选词表方向。0 = 水平，1 = 竖直。"
 
-#: ../data/ibus.schemas.in.h:25
+#: ../data/ibus.schemas.in.h:27
 msgid "Show input method name"
 msgstr "显示输入法名称"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:31
 msgid "Use custom font"
 msgstr "使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:32
 msgid "Use custom font name for language panel"
 msgstr "语言栏上使用自定义字体"
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:33
 msgid "Custom font"
 msgstr "自定义字体"
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:34
 msgid "Custom font name for language panel"
 msgstr "自定义语言栏字体"
 
-#: ../data/ibus.schemas.in.h:33
+#: ../data/ibus.schemas.in.h:35
 msgid "Embed Preedit Text"
 msgstr "内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:36
 msgid "Embed Preedit Text in Application Window"
 msgstr "在应用程序窗口中启用内嵌编辑模式"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:37
 msgid "Use global input method"
 msgstr "使用全局输入法"
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:39
 msgid "Enable input method by default"
 msgstr "默认启动输入法"
 
-#: ../data/ibus.schemas.in.h:38
+#: ../data/ibus.schemas.in.h:40
 msgid "Enable input method by default when the application gets input focus"
 msgstr "当应用程序需要使用输入时自动启用输入法"
 
-#: ../data/ibus.schemas.in.h:39
+#: ../data/ibus.schemas.in.h:41
 msgid "DConf preserve name prefixes"
 msgstr "DConf 保留名称前缀"
 
-#: ../data/ibus.schemas.in.h:40
+#: ../data/ibus.schemas.in.h:42
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr "用来停止名称转换的 DConf 键前缀"
 
@@ -400,7 +398,7 @@
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
-msgstr "版权所有 (c) 2007-2010 黄鹏\n版权所有 (c) 2007-2010 Red Hat 公司"
+msgstr "版权所有 (c) 2007-2010 黄鹏\n版权所有 (c) 2007-2010 Red Hat, Inc."
 
 #: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
@@ -429,7 +427,7 @@
 msgid "Select an input method"
 msgstr "选择输入法"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
 msgstr "Kbd"
 
@@ -459,15 +457,15 @@
 msgid "Please press a key (or a key combination)"
 msgstr "请按一个键盘按键（或者一个组合按键）"
 
-#: ../setup/main.py:99 ../setup/main.py:398
+#: ../setup/main.py:98 ../setup/main.py:397
 msgid "Use shortcut with shift to switch to the previous input method"
 msgstr "和 SHIFT 一起使用快捷键来切换到先前的输入法"
 
-#: ../setup/main.py:332
+#: ../setup/main.py:331
 msgid "The IBus daemon is not running. Do you wish to start it?"
 msgstr "IBus 守护进程尚未运行。您希望启动它吗？"
 
-#: ../setup/main.py:353
+#: ../setup/main.py:352
 msgid ""
 "IBus has been started! If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n"
 "  export GTK_IM_MODULE=ibus\n"
@@ -476,82 +474,147 @@
 msgstr "IBus 已经启动！如果您无法使用 IBus，添加以下行至 $HOME/.bashrc；然后请重新登录您的桌面。\n  export GTK_IM_MODULE=ibus\n  export XMODIFIERS=@im=ibus\n  export QT_IM_MODULE=ibus"
 
 #. Translators: %d == 5 currently
-#: ../setup/main.py:367
+#: ../setup/main.py:366
 #, python-format
 msgid "IBus daemon could not be started in %d seconds"
 msgstr "IBus 守护在 %d 秒内无法启动"
 
-#: ../setup/main.py:379
+#: ../setup/main.py:378
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择 %s 的快捷键"
 
-#: ../setup/main.py:380
+#: ../setup/main.py:379
 msgid "switching input methods"
 msgstr "切换输入法"
 
-#: ../tools/main.vala:40
+#: ../tools/main.vala:42
 msgid "List engine name only"
 msgstr "仅列出引擎名称"
 
-#: ../tools/main.vala:44
-msgid "command [OPTIONS]"
-msgstr "命令 [选项]"
-
-#: ../tools/main.vala:56 ../tools/main.vala:177 ../tools/main.vala:187
+#: ../tools/main.vala:58 ../tools/main.vala:179 ../tools/main.vala:189
 #, c-format
 msgid "Can't connect to IBus.\n"
 msgstr "无法连接 IBus。\n"
 
-#: ../tools/main.vala:82
+#: ../tools/main.vala:84
 #, c-format
 msgid "language: %s\n"
 msgstr "语言： %s\n"
 
-#: ../tools/main.vala:150
+#: ../tools/main.vala:152
 #, c-format
 msgid "No engine is set.\n"
 msgstr "尚未设置引擎。\n"
 
-#: ../tools/main.vala:158
+#: ../tools/main.vala:160
 #, c-format
 msgid "Set global engine failed.\n"
 msgstr "设定全局引擎失败。\n"
 
-#: ../tools/main.vala:163
+#: ../tools/main.vala:165
 #, c-format
 msgid "Get global engine failed.\n"
 msgstr "获取全局引擎失败。\n"
 
-#: ../tools/main.vala:224
+#: ../tools/main.vala:204
+msgid "Read the system registry cache."
+msgstr "读取系统注册缓存。"
+
+#: ../tools/main.vala:206
+msgid "Read the registry cache FILE."
+msgstr "读取注册缓存 FILE。"
+
+#: ../tools/main.vala:224 ../tools/main.vala:229
+#, c-format
+msgid "The registry cache is invalid.\n"
+msgstr "注册缓存无效。\n"
+
+#: ../tools/main.vala:244
+msgid "Write the system registry cache."
+msgstr "写入系统注册缓存。"
+
+#: ../tools/main.vala:246
+msgid "Write the registry cache FILE."
+msgstr "写入注册缓存 FILE。"
+
+#: ../tools/main.vala:292
+msgid "Set or get engine"
+msgstr "设定或获取引擎"
+
+#: ../tools/main.vala:293
+msgid "Exit ibus-daemon"
+msgstr "退出 ibus-daemon"
+
+#: ../tools/main.vala:294
+msgid "Show available engines"
+msgstr "显示可用引擎"
+
+#: ../tools/main.vala:295
+msgid "(Not implemented)"
+msgstr "(暂不可用)"
+
+#: ../tools/main.vala:296
+msgid "Restart ibus-daemon"
+msgstr "重启 ibus-daemon"
+
+#: ../tools/main.vala:297
+msgid "Show version"
+msgstr "显示版本号"
+
+#: ../tools/main.vala:298
+msgid "Show the content of registry cache"
+msgstr "显示注册缓存内容。"
+
+#: ../tools/main.vala:299
+msgid "Create registry cache"
+msgstr "创建注册缓存"
+
+#: ../tools/main.vala:300
+msgid "Print the D-Bus address of ibus-daemon"
+msgstr "输出 ibus-daemon 位于 D-Bus 中的地址"
+
+#: ../tools/main.vala:301
+msgid "Show this information"
+msgstr "显示本信息"
+
+#: ../tools/main.vala:307
 #, c-format
 msgid ""
 "Usage: %s COMMAND [OPTION...]\n"
 "\n"
 msgstr "用法：%s 命令 [选项...]\n\n"
 
-#: ../tools/main.vala:225
+#: ../tools/main.vala:308
 #, c-format
 msgid "Commands:\n"
 msgstr "命令：\n"
 
-#: ../tools/main.vala:247
+#: ../tools/main.vala:337
 #, c-format
 msgid "%s is unknown command!\n"
 msgstr "%s 是未知命令！\n"
 
-#: ../ui/gtk3/panel.vala:498
+#: ../ui/gtk3/panel.vala:348
+msgid "IBus Update"
+msgstr "IBus 更新"
+
+#: ../ui/gtk3/panel.vala:349 ../ui/gtk3/panel.vala:360
+msgid "Super+space is now the default hotkey."
+msgstr "Super+space 是目前默认的快捷键。"
+
+#: ../ui/gtk3/panel.vala:657
 msgid "Copyright (c) 2007-2012 Peng Huang\n"
 msgstr "版权所有 (c) 2007-2012 黄鹏\n"
 
-#: ../ui/gtk3/panel.vala:503
+#: ../ui/gtk3/panel.vala:662
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "IBus 是一个适用于 Linux/Unix 系统的智能输入平台。"
 
-#: ../ui/gtk3/panel.vala:507
+#: ../ui/gtk3/panel.vala:666
 msgid "translator-credits"
 msgstr "黄鹏 \nFedora 简体中文组 "
 
-#: ../ui/gtk3/panel.vala:539
+#: ../ui/gtk3/panel.vala:698
 msgid "Restart"
 msgstr "重新启动"
diff -Nru ibus-1.5.4/setup/Makefile.am ibus-1.5.5/setup/Makefile.am
--- ibus-1.5.4/setup/Makefile.am	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/setup/Makefile.am	2014-01-14 12:59:14.000000000 +0900
@@ -45,7 +45,7 @@
 man_one_in_files = ibus-setup.1.in
 man_one_files = $(man_one_in_files:.1.in=.1)
 man_one_DATA =$(man_one_files:.1=.1.gz) 
-man_onedir = $(datadir)/man/man1
+man_onedir = $(mandir)/man1
 %.1: %.1.in
 	$(AM_V_GEN) sed \
 		-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
diff -Nru ibus-1.5.4/setup/Makefile.in ibus-1.5.5/setup/Makefile.in
--- ibus-1.5.4/setup/Makefile.in	2013-09-20 12:17:27.000000000 +0900
+++ ibus-1.5.5/setup/Makefile.in	2014-01-14 13:00:23.000000000 +0900
@@ -441,7 +441,7 @@
 man_one_in_files = ibus-setup.1.in
 man_one_files = $(man_one_in_files:.1.in=.1)
 man_one_DATA = $(man_one_files:.1=.1.gz) 
-man_onedir = $(datadir)/man/man1
+man_onedir = $(mandir)/man1
 CLEANFILES = \
 	$(man_one_DATA) \
 	$(man_one_files) \
diff -Nru ibus-1.5.4/setup/setup.ui ibus-1.5.5/setup/setup.ui
--- ibus-1.5.4/setup/setup.ui	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/setup/setup.ui	2014-01-14 12:59:14.000000000 +0900
@@ -45,10 +45,10 @@
     
     
       
-        Embedded in menu
+        Do not show
       
       
-        When active
+        Hide automatically
       
       
         Always
@@ -459,11 +459,11 @@
                                 
                                 
                                   
-                                    True
+                                    True
                                     False
                                     Set the behavior of ibus how to show or hide language bar
                                     0
-                                    Show language panel:
+                                    Show property panel:
                                     right
                                   
                                   
@@ -490,7 +490,7 @@
                                 
                                 
                                   
-                                    True
+                                    True
                                     False
                                     model_panel_show_mode
                                     
@@ -889,8 +889,8 @@
                                 True
                                 False
                                 0
-                                <small><i>The default input method is the top one in the list.
-You may use up/down buttons to change it.</i></small>
+                                True
+                                <small><i>The active input method can be switched around from the selected ones in the above list by pressing the keyboard shortcut keys or clicking the panel icon.</i></small>
                                 True
                               
                               
diff -Nru ibus-1.5.4/src/IBus-1.0.gir ibus-1.5.5/src/IBus-1.0.gir
--- ibus-1.5.4/src/IBus-1.0.gir	2013-09-20 12:19:51.000000000 +0900
+++ ibus-1.5.5/src/IBus-1.0.gir	2014-01-14 13:02:09.000000000 +0900
@@ -860,41 +860,41 @@
            glib:get-type="ibus_attr_list_get_type"
            glib:type-struct="AttrListClass">
       
-        New an IBusAttrList.
+        New an IBusAttrList.
         
-          A newly allocated IBusAttrList.
+          A newly allocated IBusAttrList.
           
         
       
       
-        Append an IBusAttribute to IBusAttrList, and increase reference.
+        Append an IBusAttribute to IBusAttrList, and increase reference.
         
           
         
         
           
-            An IBusAttrList instance.
+            An IBusAttrList instance.
             
           
           
-            The IBusAttribute instance to be appended.
+            The IBusAttribute instance to be appended.
             
           
         
       
       
-        Returns IBusAttribute at given index. Borrowed reference.
+        Returns IBusAttribute at given index. Borrowed reference.
         
-          IBusAttribute at given index, NULL if no such IBusAttribute.
+          IBusAttribute at given index, NULL if no such IBusAttribute.
           
         
         
           
-            An IBusAttrList instance.
+            An IBusAttrList instance.
             
           
           
-            Index of the @attr_list.
+            Index of the @attr_list.
             
           
         
@@ -919,78 +919,78 @@
                  glib:type-name="IBusAttrType"
                  glib:get-type="ibus_attr_type_get_type"
                  c:type="IBusAttrType">
-      Type enumeration of IBusText attribute.
+      Type enumeration of IBusText attribute.
       
-        Decorate with underline.
+        Decorate with underline.
       
       
-        Foreground color.
+        Foreground color.
       
       
-        Background color.
+        Background color.
       
     
     
-      Type of IBusText attribute.
+      Type of IBusText attribute.
       
-        No underline.
+        No underline.
       
       
-        Single underline.
+        Single underline.
       
       
-        Double underline.
+        Double underline.
       
       
-        Low underline ? %FIXME
+        Low underline ? %FIXME
       
       
-        Error underline
+        Error underline
       
       
-        New an underline #IBusAttribute.
+        New an underline #IBusAttribute.
         
-          A newly allocated #IBusAttribute.
+          A newly allocated #IBusAttribute.
           
         
         
           
-            Type of underline.
+            Type of underline.
             
           
           
-            Where attribute starts.
+            Where attribute starts.
             
           
           
-            Where attribute ends.
+            Where attribute ends.
             
           
         
@@ -1003,37 +1003,38 @@
            glib:type-name="IBusAttribute"
            glib:get-type="ibus_attribute_get_type"
            glib:type-struct="AttributeClass">
-      An IBusAttribute represents an attribute that associate to IBusText.
-It decorates preedit buffer and auxiliary text with underline, foreground and background colors.
+      An IBusAttribute represents an attribute that associate to IBusText.
+It decorates preedit buffer and auxiliary text with underline, foreground
+and background colors.
       
-        New an IBusAttribute.
+        New an IBusAttribute.
         
-          A newly allocated IBusAttribute.
+          A newly allocated IBusAttribute.
           
         
         
           
-            Type of the attribute.
+            Type of the attribute.
             
           
           
-            Value of the attribute.
+            Value of the attribute.
             
           
           
-            Where attribute starts.
+            Where attribute starts.
             
           
           
-            Where attribute ends.
+            Where attribute ends.
             
           
         
       
       
-        Returns an enum of #IBusAttrType.
+        Returns an enum of #IBusAttrType.
         
-          An enum of #IBusAttrType.
+          An enum of #IBusAttrType.
           
         
         
@@ -1043,9 +1044,9 @@
         
       
       
-        Returns a end unsigned index
+        Returns a end unsigned index
         
-          A end unsigned index
+          A end unsigned index
           
         
         
@@ -1056,9 +1057,9 @@
       
       
-        Returns a start unsigned index
+        Returns a start unsigned index
         
-          A start unsigned index
+          A start unsigned index
           
         
         
@@ -1068,12 +1069,12 @@
         
       
       
-        Returns an unsigned int value relative with #IBusAttrType.
+        Returns an unsigned int value relative with #IBusAttrType.
 If the type is %IBUS_ATTR_TYPE_UNDERLINE, the return value is
 #IBusAttrUnderline. If the type is %IBUS_ATTR_TYPE_FOREGROUND,
 the return value is the color RGB.
         
-          An unsigned int value relative with #IBusAttrType.
+          An unsigned int value relative with #IBusAttrType.
           
         
         
@@ -1137,61 +1138,61 @@
            glib:type-name="IBusBus"
            glib:get-type="ibus_bus_get_type"
            glib:type-struct="BusClass">
-      An IBusBus connects with IBus daemon.
+      An IBusBus connects with IBus daemon.
       
-        New an #IBusBus instance.
+        New an #IBusBus instance.
         
-          A newly allocated #IBusBus instance, and the instance is not floating.
+          A newly allocated #IBusBus instance, and the instance is not floating.
           
         
       
       
-        New an #IBusBus instance. The instance will asynchronously connect to the IBus
+        New an #IBusBus instance. The instance will asynchronously connect to the IBus
 daemon.
         
-          A newly allocated #IBusBus instance, and the instance is not floating.
+          A newly allocated #IBusBus instance, and the instance is not floating.
           
         
       
       
-        Add a match rule to an #IBusBus synchronously.
+        Add a match rule to an #IBusBus synchronously.
         
-          %TRUE if the rule is added. %FALSE otherwise.
+          %TRUE if the rule is added. %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Match rule.
+            Match rule.
             
           
         
       
       
-        Add a match rule to an #IBusBus asynchronously.
+        Add a match rule to an #IBusBus asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Match rule.
+            Match rule.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -1211,63 +1212,63 @@
       
-        Finishes an operation started with ibus_bus_add_match_async().
+        Finishes an operation started with ibus_bus_add_match_async().
         
-          %TRUE if the rule is added. %FALSE otherwise.
+          %TRUE if the rule is added. %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_add_match_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_add_match_async().
             
           
         
       
       
-        Create an input context for client synchronously.
+        Create an input context for client synchronously.
         
-          An newly allocated #IBusInputContext if the "CreateInputContext" call is suceeded, %NULL otherwise.
+          An newly allocated #IBusInputContext if the "CreateInputContext" call is suceeded, %NULL otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Name of client.
+            Name of client.
             
           
         
       
       
-        Create an input context for client asynchronously.
+        Create an input context for client asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Name of client.
+            Name of client.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied. It should not be %NULL.
+            A #GAsyncReadyCallback to call when the request is satisfied. It should not be %NULL.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -1287,55 +1288,55 @@
       
-        Finishes an operation started with ibus_bus_create_input_context_async().
+        Finishes an operation started with ibus_bus_create_input_context_async().
         
-          An newly allocated #IBusInputContext if the "CreateInputContext" call is suceeded, %NULL otherwise.
+          An newly allocated #IBusInputContext if the "CreateInputContext" call is suceeded, %NULL otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_create_input_context_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_create_input_context_async().
             
           
         
       
       
-        Get the current focused input context synchronously.
+        Get the current focused input context synchronously.
         
-          The named of currently focued #IBusInputContext if the "CurrentInputContext" call suceeded, %NULL otherwise. The return value must be freed with g_free().
+          The named of currently focued #IBusInputContext if the "CurrentInputContext" call suceeded, %NULL otherwise. The return value must be freed with g_free().
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
       
       
-        Get the current focused input context asynchronously.
+        Get the current focused input context asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -1355,61 +1356,61 @@
       
-        Finishes an operation started with ibus_bus_current_input_context_async().
+        Finishes an operation started with ibus_bus_current_input_context_async().
         
-          The named of currently focued IBusInputContext if the "CurrentInputContext" call suceeded, %NULL otherwise. The return value must be freed with g_free().
+          The named of currently focued IBusInputContext if the "CurrentInputContext" call suceeded, %NULL otherwise. The return value must be freed with g_free().
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_current_input_context_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_current_input_context_async().
             
           
         
       
       
-        Exit or restart ibus-daemon synchronously.
+        Exit or restart ibus-daemon synchronously.
         
-          %TRUE if the "Exit" call is suceeded, %FALSE otherwise.
+          %TRUE if the "Exit" call is suceeded, %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Whether restarting the ibus.
+            Whether restarting the ibus.
             
           
         
       
       
-        Exit or restart ibus-daemon asynchronously.
+        Exit or restart ibus-daemon asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Whether restarting the ibus.
+            Whether restarting the ibus.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -1429,66 +1430,66 @@
       
-        Finishes an operation started with ibus_bus_exit_async().
+        Finishes an operation started with ibus_bus_exit_async().
         
-          %TRUE if the "Exit" call is suceeded, %FALSE otherwise.
+          %TRUE if the "Exit" call is suceeded, %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_exit_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_exit_async().
             
           
         
       
       
-        Get the config instance from #IBusBus.
+        Get the config instance from #IBusBus.
         
-          An #IBusConfig object which is configurable with @bus.
+          An #IBusConfig object which is configurable with @bus.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
       
       
-        Return #GDBusConnection of an #IBusBus instance.
+        Return #GDBusConnection of an #IBusBus instance.
         
-          A #GDBusConnection of an #IBusBus instance.
+          A #GDBusConnection of an #IBusBus instance.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
       
       
-        Get engines by given names synchronously. If some engine names do not exist, this function
+        Get engines by given names synchronously. If some engine names do not exist, this function
 will simplly ignore them, and return rest of engines.
 TODO(penghuang): add asynchronous version
         
-          A %NULL-terminated array of engines.
+          A %NULL-terminated array of engines.
           
             
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A %NULL-terminated array of names.
+            A %NULL-terminated array of names.
             
               
             
@@ -1497,37 +1498,37 @@
       
       
-        Get the description of current global engine synchronously.
+        Get the description of current global engine synchronously.
         
-          The description of current global engine, or %NULL if there is no global engine.
+          The description of current global engine, or %NULL if there is no global engine.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
       
       
-        Get the description of current global engine asynchronously.
+        Get the description of current global engine asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -1547,63 +1548,63 @@
       
-        Finishes an operation started with ibus_bus_get_global_engine_async_finish().
+        Finishes an operation started with ibus_bus_get_global_engine_async_finish().
         
-          The description of current global engine, or %NULL if there is no global engine.
+          The description of current global engine, or %NULL if there is no global engine.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_get_global_engine_async_finish().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_get_global_engine_async_finish().
             
           
         
       
       
-        Get org.freedesktop.DBus.Properties.
+        Get org.freedesktop.DBus.Properties.
         
-          The value in org.freedesktop.DBus.Properties.Get The returned value must be freed with g_variant_unref().
+          The value in org.freedesktop.DBus.Properties.Get The returned value must be freed with g_variant_unref().
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            property name in org.freedesktop.DBus.Properties.Get
+            property name in org.freedesktop.DBus.Properties.Get
             
           
         
       
       
-        Get org.freedesktop.DBus.Properties asynchronously.
+        Get org.freedesktop.DBus.Properties asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            property name in org.freedesktop.DBus.Properties.Get
+            property name in org.freedesktop.DBus.Properties.Get
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -1623,62 +1624,62 @@
       
-        Finishes an operation started with ibus_bus_get_ibus_property_async().
+        Finishes an operation started with ibus_bus_get_ibus_property_async().
         
-          The value in org.freedesktop.DBus.Properties.Get The returned value must be freed with g_variant_unref().
+          The value in org.freedesktop.DBus.Properties.Get The returned value must be freed with g_variant_unref().
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_get_property_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_get_property_async().
             
           
         
       
       
-        Return the name owner synchronously.
+        Return the name owner synchronously.
         
-          Owner of the name. The returned value must be freed with g_free().
+          Owner of the name. The returned value must be freed with g_free().
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Name.
+            Name.
             
           
         
       
       
-        Return the name owner asynchronously.
+        Return the name owner asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Name.
+            Name.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -1698,18 +1699,18 @@
       
-        Finishes an operation started with ibus_bus_get_name_owner_async().
+        Finishes an operation started with ibus_bus_get_name_owner_async().
         
-          Owner of the name. The returned value must be freed with g_free().
+          Owner of the name. The returned value must be freed with g_free().
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_get_name_owner_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_get_name_owner_async().
             
           
         
@@ -1718,14 +1719,14 @@
               c:identifier="ibus_bus_get_use_global_engine"
               deprecated="Currently global engine is always used."
               deprecated-version="1.5.3">
-        Check if the bus's "use_global_engine" option is enabled or not synchronously.
+        Check if the bus's "use_global_engine" option is enabled or not synchronously.
         
-          TRUE if "use_global_engine" option is enabled.
+          TRUE if "use_global_engine" option is enabled.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
@@ -1734,23 +1735,23 @@
               c:identifier="ibus_bus_get_use_global_engine_async"
               deprecated="Currently global engine is always used."
               deprecated-version="1.5.3">
-        Check if the bus's "use_global_engine" option is enabled or not asynchronously.
+        Check if the bus's "use_global_engine" option is enabled or not asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -1772,18 +1773,18 @@
               deprecated="Currently global engine is always used."
               deprecated-version="1.5.3"
               throws="1">
-        Finishes an operation started with ibus_bus_get_use_global_engine_async().
+        Finishes an operation started with ibus_bus_get_use_global_engine_async().
         
-          %TRUE if "use_global_engine" option is enabled.
+          %TRUE if "use_global_engine" option is enabled.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_get_use_global_engine_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_get_use_global_engine_async().
             
           
         
@@ -1792,14 +1793,14 @@
               c:identifier="ibus_bus_get_use_sys_layout"
               deprecated="Read dconf value /desktop/ibus/general/use_system_keyboard_layout instead."
               deprecated-version="1.5.3">
-        Check if the bus's "use_sys_layout" option is enabled or not synchronously.
+        Check if the bus's "use_sys_layout" option is enabled or not synchronously.
         
-          %TRUE if "use_sys_layout" option is enabled.
+          %TRUE if "use_sys_layout" option is enabled.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
@@ -1808,23 +1809,23 @@
               c:identifier="ibus_bus_get_use_sys_layout_async"
               deprecated="Read dconf value /desktop/ibus/general/use_system_keyboard_layout instead."
               deprecated-version="1.5.3">
-        Check if the bus's "use_sys_layout" option is enabled or not asynchronously.
+        Check if the bus's "use_sys_layout" option is enabled or not asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -1846,45 +1847,45 @@
               deprecated="Read dconf value /desktop/ibus/general/use_system_keyboard_layout instead."
               deprecated-version="1.5.3"
               throws="1">
-        Finishes an operation started with ibus_bus_get_use_sys_layout_async().
+        Finishes an operation started with ibus_bus_get_use_sys_layout_async().
         
-          TRUE if "use_sys_layout" option is enabled.
+          TRUE if "use_sys_layout" option is enabled.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_get_use_sys_layout_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_get_use_sys_layout_async().
             
           
         
       
       
-        This function sends a "HELLO" message to DBus daemon,
+        This function sends a "HELLO" message to DBus daemon,
 which replies the unique name of current IBus process.
         
-          The unique name of IBus process in DBus.
+          The unique name of IBus process in DBus.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
       
       
-        Return %TRUE if @bus is connected to IBus daemon.
+        Return %TRUE if @bus is connected to IBus daemon.
         
-          %TRUE if @bus is connected, %FALSE otherwise.
+          %TRUE if @bus is connected, %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
@@ -1893,14 +1894,14 @@
               c:identifier="ibus_bus_is_global_engine_enabled"
               deprecated="Probably this would be used for Chrome OS only. Currently global engine is always used and ibus_bus_get_global_engine() returns NULL until the first global engine is assigned. You can use ibus_set_log_handler() to disable a warning when ibus_bus_get_global_engine() returns NULL."
               deprecated-version="1.5.3">
-        Check if the current global engine is enabled or not synchronously.
+        Check if the current global engine is enabled or not synchronously.
         
-          %TRUE if the current global engine is enabled.
+          %TRUE if the current global engine is enabled.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
@@ -1909,23 +1910,23 @@
               c:identifier="ibus_bus_is_global_engine_enabled_async"
               deprecated="Probably this would be used for Chrome OS only. Currently global engine is always used and ibus_bus_get_global_engine() returns NULL until the first global engine is assigned. You can use ibus_set_log_handler() to disable a warning when ibus_bus_get_global_engine() returns NULL."
               deprecated-version="1.5.3">
-        Check if the current global engine is enabled or not asynchronously.
+        Check if the current global engine is enabled or not asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -1947,18 +1948,18 @@
               deprecated="Probably this would be used for Chrome OS only. Currently global engine is always used and ibus_bus_get_global_engine() returns NULL until the first global engine is assigned. You can use ibus_set_log_handler() to disable a warning when ibus_bus_get_global_engine() returns NULL."
               deprecated-version="1.5.3"
               throws="1">
-        Finishes an operation started with ibus_bus_is_global_engine_enabled_async().
+        Finishes an operation started with ibus_bus_is_global_engine_enabled_async().
         
-          %TRUE if the current global engine is enabled.
+          %TRUE if the current global engine is enabled.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_is_global_engine_enabled_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_is_global_engine_enabled_async().
             
           
         
@@ -1967,16 +1968,16 @@
               c:identifier="ibus_bus_list_active_engines"
               deprecated="Read dconf value /desktop/ibus/general/preload-engines instead."
               deprecated-version="1.5.3">
-        List active engines synchronously.
+        List active engines synchronously.
         
-          A List of active engines.
+          A List of active engines.
           
             
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
@@ -1985,23 +1986,23 @@
               c:identifier="ibus_bus_list_active_engines_async"
               deprecated="Read dconf value /desktop/ibus/general/preload-engines instead."
               deprecated-version="1.5.3">
-        List active engines asynchronously.
+        List active engines asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -2023,58 +2024,58 @@
               deprecated="Read dconf value /desktop/ibus/general/preload-engines instead."
               deprecated-version="1.5.3"
               throws="1">
-        Finishes an operation started with ibus_bus_list_active_engines_async().
+        Finishes an operation started with ibus_bus_list_active_engines_async().
         
-          A List of active engines.
+          A List of active engines.
           
             
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_list_active_engines_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_list_active_engines_async().
             
           
         
       
       
-        List engines synchronously.
+        List engines synchronously.
         
-          A List of engines.
+          A List of engines.
           
             
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
       
       
-        List engines asynchronously.
+        List engines asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -2094,103 +2095,103 @@
       
-        Finishes an operation started with ibus_bus_list_engines_async().
+        Finishes an operation started with ibus_bus_list_engines_async().
         
-          A List of engines.
+          A List of engines.
           
             
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_list_engines_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_list_engines_async().
             
           
         
       
       
-        Return lists that attached to @bus.
+        Return lists that attached to @bus.
 <note><para>[FixMe] Not implemented yet, only return NULL.</para></note>
 <note><para>[FixMe] Add async version.</para></note>
         
-          Lists that attached to @bus.
+          Lists that attached to @bus.
           
             
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
         
       
       
-        Lists the unique bus names of connections currently queued for a bus name.
+        Lists the unique bus names of connections currently queued for a bus name.
 
 FIXME add an asynchronous version.
         
-          The unique bus names of connections currently queued for @name.
+          The unique bus names of connections currently queued for @name.
           
             
           
         
         
           
-            An IBusBus.
+            An IBusBus.
             
           
           
-            Name to be queried.
+            Name to be queried.
             
           
         
       
       
-        Checks whether the name has owner synchronously.
+        Checks whether the name has owner synchronously.
         
-          %TRUE if the name has owner, %FALSE otherwise.
+          %TRUE if the name has owner, %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Name to be checked.
+            Name to be checked.
             
           
         
       
       
-        Checks whether the name has owner asynchronously.
+        Checks whether the name has owner asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Name to be checked.
+            Name to be checked.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -2210,35 +2211,35 @@
       
-        Finishes an operation started with ibus_bus_name_has_owner_async().
+        Finishes an operation started with ibus_bus_name_has_owner_async().
         
-          %TRUE if the name has owner, %FALSE otherwise.
+          %TRUE if the name has owner, %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_name_has_owner_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_name_has_owner_async().
             
           
         
       
       
-        Start bus components by engine names synchronously.
+        Start bus components by engine names synchronously.
         
-          %TRUE if components start. %FALSE otherwise.
+          %TRUE if components start. %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A %NULL-terminated array of engine names.
+            A %NULL-terminated array of engine names.
             
               
             
@@ -2247,29 +2248,29 @@
       
       
-        Start bus components by engine names asynchronously.
+        Start bus components by engine names asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A %NULL-terminated array of engine names.
+            A %NULL-terminated array of engine names.
             
               
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -2289,63 +2290,63 @@
       
-        Finishes an operation started with ibus_bus_preload_engines_async().
+        Finishes an operation started with ibus_bus_preload_engines_async().
         
-          %TRUE if component starts. %FALSE otherwise.
+          %TRUE if component starts. %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_preload_engines_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_preload_engines_async().
             
           
         
       
       
-        Register a componet to an #IBusBus synchronously.
+        Register a componet to an #IBusBus synchronously.
         
-          %TRUE if the "RegisterComponent" call is suceeded, %FALSE otherwise.
+          %TRUE if the "RegisterComponent" call is suceeded, %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A input engine component.
+            A input engine component.
             
           
         
       
       
-        Register a componet to an #IBusBus asynchronously.
+        Register a componet to an #IBusBus asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A input engine component.
+            A input engine component.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -2365,62 +2366,62 @@
       
-        Finishes an operation started with ibus_bus_register_component_async().
+        Finishes an operation started with ibus_bus_register_component_async().
         
-          %TRUE if the "RegisterComponent" call is suceeded, %FALSE otherwise.
+          %TRUE if the "RegisterComponent" call is suceeded, %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_register_component_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_register_component_async().
             
           
         
       
       
-        Release a name to IBus daemon synchronously.
+        Release a name to IBus daemon synchronously.
         
-          0 if failed; positive number otherwise.
+          0 if failed; positive number otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Name to be released.
+            Name to be released.
             
           
         
       
       
-        Release a name to IBus daemon asynchronously.
+        Release a name to IBus daemon asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Name to be released.
+            Name to be released.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -2440,62 +2441,62 @@
       
-        Finishes an operation started with ibus_bus_release_name_async().
+        Finishes an operation started with ibus_bus_release_name_async().
         
-          0 if failed; positive number otherwise.
+          0 if failed; positive number otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_release_name_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_release_name_async().
             
           
         
       
       
-        Remove a match rule to an #IBusBus synchronously.
+        Remove a match rule to an #IBusBus synchronously.
         
-          %TRUE if the rule is removed. %FALSE otherwise.
+          %TRUE if the rule is removed. %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Match rule.
+            Match rule.
             
           
         
       
       
-        Remove a match rule to an IBusBus asynchronously.
+        Remove a match rule to an IBusBus asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Match rule.
+            Match rule.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -2515,70 +2516,70 @@
       
-        Finishes an operation started with ibus_bus_remove_match_async().
+        Finishes an operation started with ibus_bus_remove_match_async().
         
-          %TRUE if the rule is removed. %FALSE otherwise.
+          %TRUE if the rule is removed. %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_remove_match_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_remove_match_async().
             
           
         
       
       
-        Request a name from IBus daemon synchronously.
+        Request a name from IBus daemon synchronously.
         
-          0 if failed; IBusBusRequestNameReply otherwise.
+          0 if failed; IBusBusRequestNameReply otherwise.
           
         
         
           
-            the IBusBus instance to be processed.
+            the IBusBus instance to be processed.
             
           
           
-            Name to be requested.
+            Name to be requested.
             
           
           
-            IBusBusNameFlag.
+            IBusBusNameFlag.
             
           
         
       
       
-        Request a name from IBus daemon asynchronously.
+        Request a name from IBus daemon asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            Name to be requested.
+            Name to be requested.
             
           
           
-            Flags (FixMe).
+            Flags (FixMe).
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -2598,63 +2599,63 @@
       
-        Finishes an operation started with ibus_bus_request_name_async().
+        Finishes an operation started with ibus_bus_request_name_async().
         
-          0 if failed; positive number otherwise.
+          0 if failed; positive number otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_request_name_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_request_name_async().
             
           
         
       
       
-        Set current global engine synchronously.
+        Set current global engine synchronously.
         
-          %TRUE if the global engine was set successfully.
+          %TRUE if the global engine was set successfully.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A new engine name.
+            A new engine name.
             
           
         
       
       
-        Set current global engine asynchronously.
+        Set current global engine asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A new engine name.
+            A new engine name.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -2674,70 +2675,70 @@
       
-        Finishes an operation started with ibus_bus_set_global_engine_async().
+        Finishes an operation started with ibus_bus_set_global_engine_async().
         
-          %TRUE if no IPC errros. %FALSE otherwise.
+          %TRUE if no IPC errros. %FALSE otherwise.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_set_global_engine_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_set_global_engine_async().
             
           
         
       
       
-        Set org.freedesktop.DBus.Properties.
+        Set org.freedesktop.DBus.Properties.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            property name in org.freedesktop.DBus.Properties.Set
+            property name in org.freedesktop.DBus.Properties.Set
             
           
           
-            value in org.freedesktop.DBus.Properties.Set
+            value in org.freedesktop.DBus.Properties.Set
             
           
         
       
       
-        Set org.freedesktop.DBus.Properties asynchronously.
+        Set org.freedesktop.DBus.Properties asynchronously.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            property name in org.freedesktop.DBus.Properties.Set
+            property name in org.freedesktop.DBus.Properties.Set
             
           
           
-            value in org.freedesktop.DBus.Properties.Set
+            value in org.freedesktop.DBus.Properties.Set
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -2757,52 +2758,52 @@
       
-        Finishes an operation started with ibus_bus_set_ibus_property_async().
+        Finishes an operation started with ibus_bus_set_ibus_property_async().
         
-          %TRUE if property is set with async. %FALSE failed.
+          %TRUE if property is set with async. %FALSE failed.
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_set_property_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_bus_set_property_async().
             
           
         
       
       
-        Start or stop watching the NameOwnerChanged DBus signal.
+        Start or stop watching the NameOwnerChanged DBus signal.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            %TRUE if you want ibusbus to emit "name-owner-changed" signal when ibus-daemon emits the NameOwnerChanged DBus signal.
+            %TRUE if you want ibusbus to emit "name-owner-changed" signal when ibus-daemon emits the NameOwnerChanged DBus signal.
             
           
         
       
       
-        Start or stop watching the GlobalEngineChanged IBus signal.
+        Start or stop watching the GlobalEngineChanged IBus signal.
         
           
         
         
           
-            An #IBusBus.
+            An #IBusBus.
             
           
           
-            %TRUE if you want ibusbus to emit "global-engine-changed" signal when ibus-daemon emits the GlobalEngineChanged IBus signal.
+            %TRUE if you want ibusbus to emit "global-engine-changed" signal when ibus-daemon emits the GlobalEngineChanged IBus signal.
             
           
         
@@ -2811,7 +2812,7 @@
                 writable="1"
                 construct-only="1"
                 transfer-ownership="none">
-        Whether the #IBusBus object should connect asynchronously to the bus.
+        Whether the #IBusBus object should connect asynchronously to the bus.
         
       
       
@@ -2821,45 +2822,45 @@
         
       
       
-        Emitted when #IBusBus is connected to ibus-daemon.
+        Emitted when #IBusBus is connected to ibus-daemon.
         
           
         
       
       
-        Emitted when #IBusBus is disconnected from ibus-daemon.
+        Emitted when #IBusBus is disconnected from ibus-daemon.
         
           
         
       
       
-        Emitted when global engine is changed.
+        Emitted when global engine is changed.
         
           
         
         
           
-            The name of the new global engine.
+            The name of the new global engine.
             
           
         
       
       
-        Emitted when D-Bus name owner is changed.
+        Emitted when D-Bus name owner is changed.
         
           
         
         
           
-            The name which ower is changed.
+            The name which ower is changed.
             
           
           
-            The unique bus name of the old owner.
+            The unique bus name of the old owner.
             
           
           
-            The unique bus name of the new owner.
+            The unique bus name of the new owner.
             
           
         
@@ -2880,19 +2881,19 @@
               value="1"
               c:identifier="IBUS_BUS_NAME_FLAG_ALLOW_REPLACEMENT"
               glib:nick="allow-replacement">
-        same as DBUS_NAME_FLAG_ALLOW_REPLACEMENT
+        same as DBUS_NAME_FLAG_ALLOW_REPLACEMENT
       
       
-        same as DBUS_NAME_FLAG_REPLACE_EXISTING
+        same as DBUS_NAME_FLAG_REPLACE_EXISTING
       
       
-        same as DBUS_NAME_FLAG_DO_NOT_QUEUE
+        same as DBUS_NAME_FLAG_DO_NOT_QUEUE
       
     
     
@@ -2905,25 +2906,25 @@
               value="1"
               c:identifier="IBUS_BUS_REQUEST_NAME_REPLY_PRIMARY_OWNER"
               glib:nick="primary-owner">
-        same as DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER
+        same as DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER
       
       
-        same as DBUS_REQUEST_NAME_REPLY_IN_QUEUE
+        same as DBUS_REQUEST_NAME_REPLY_IN_QUEUE
       
       
-        same as DBUS_REQUEST_NAME_REPLY_EXISTS
+        same as DBUS_REQUEST_NAME_REPLY_EXISTS
       
       
-        same as DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER
+        same as DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER
       
     
     
-        same as DBUS_START_REPLY_SUCCESS
+        same as DBUS_START_REPLY_SUCCESS
       
       
-        same as DBUS_START_REPLY_ALREADY_RUNNING
+        same as DBUS_START_REPLY_ALREADY_RUNNING
       
     
     
-      Capability flags of UI.
+      Capability flags of UI.
       
-        UI is capable to show pre-edit text.
+        UI is capable to show pre-edit text.
       
       
-        UI is capable to show auxiliary text.
+        UI is capable to show auxiliary text.
       
       
-        UI is capable to show the lookup table.
+        UI is capable to show the lookup table.
       
       
-        UI is capable to get focus.
+        UI is capable to get focus.
       
       
-        UI is capable to have property.
+        UI is capable to have property.
       
       
-        Client can provide surround text, or IME can handle surround text.
+        Client can provide surround text, or IME can handle surround text.
       
     
     
@@ -3023,7 +3024,7 @@
       
     
     
-      International and multi-key character composition.
+      International and multi-key character composition.
       
     
     
@@ -3036,7 +3037,7 @@
            glib:type-name="IBusComponent"
            glib:get-type="ibus_component_get_type"
            glib:type-struct="ComponentClass">
-      An IBusComponent is an executable program.
+      An IBusComponent is an executable program.
 It provides services such as user interface, configuration,
 and input method engine (IME).
 
@@ -3047,59 +3048,59 @@
 The format of a component XML file is described  at
 <ulink url="http://code.google.com/p/ibus/wiki/DevXML">http://code.google.com/p/ibus/wiki/DevXML</ulink>
       
-        New an IBusComponent.
+        New an IBusComponent.
         
-          A newly allocated IBusComponent.
+          A newly allocated IBusComponent.
           
         
         
           
-            Name of the component.
+            Name of the component.
             
           
           
-            Detailed description of component.
+            Detailed description of component.
             
           
           
-            Component version.
+            Component version.
             
           
           
-            Distribution license of this component.
+            Distribution license of this component.
             
           
           
-            Author(s) of the component.
+            Author(s) of the component.
             
           
           
-            Homepage of the component.
+            Homepage of the component.
             
           
           
-            path to component executable.
+            path to component executable.
             
           
           
-            Domain name for dgettext()
+            Domain name for dgettext()
             
           
         
       
       
-        New an IBusComponent from an XML file.
+        New an IBusComponent from an XML file.
 Note that a component file usually contains engine descriptions,
 if it does, ibus_engine_desc_new_from_xml_node() will be called
 to load the engine descriptions.
         
-          A newly allocated IBusComponent.
+          A newly allocated IBusComponent.
           
         
         
           
-            An XML file that contains component information.
+            An XML file that contains component information.
             
           
         
@@ -3107,14 +3108,14 @@
       
-        New an IBusComponent from an XML tree.
+        New an IBusComponent from an XML tree.
         
-          A newly allocated IBusComponent.
+          A newly allocated IBusComponent.
           
         
         
           
-            Root node of component XML tree.
+            Root node of component XML tree.
             
           
         
@@ -3122,7 +3123,7 @@
       
-        New an IBusComponent.
+        New an IBusComponent.
 ibus_component_new_varargs() supports the va_list format.
 name property is required. e.g.
 IBusComponent *component = ibus_component_new_varargs ("name", "ibus-foo",
@@ -3133,7 +3134,7 @@
         
         
           
-            Name of the first property.
+            Name of the first property.
             
           
           
@@ -3143,232 +3144,232 @@
         
       
       
-        Add an engine to IBusComponent according to the description in @engine.
+        Add an engine to IBusComponent according to the description in @engine.
         
           
         
         
           
-            An IBusComponent
+            An IBusComponent
             
           
           
-            A description of an engine.
+            A description of an engine.
             
           
         
       
       
-        Add an observed path to IBusComponent.
+        Add an observed path to IBusComponent.
         
           
         
         
           
-            An IBusComponent
+            An IBusComponent
             
           
           
-            Observed path to be added.
+            Observed path to be added.
             
           
           
-            TRUE for filling the file status; FALSE otherwise.
+            TRUE for filling the file status; FALSE otherwise.
             
           
         
       
       
-        Check whether the observed paths of component is modified.
+        Check whether the observed paths of component is modified.
         
-          TRUE if at least one of the observed paths is modified; FALSE otherwise.
+          TRUE if at least one of the observed paths is modified; FALSE otherwise.
           
         
         
           
-            An IBusComponent.
+            An IBusComponent.
             
           
         
       
       
-        Return the author property in IBusComponent. It should not be freed.
+        Return the author property in IBusComponent. It should not be freed.
         
-          author property in IBusComponent
+          author property in IBusComponent
           
         
         
           
-            An IBusComponent
+            An IBusComponent
             
           
         
       
       
-        Return the description property in IBusComponent. It should not be freed.
+        Return the description property in IBusComponent. It should not be freed.
         
-          description property in IBusComponent
+          description property in IBusComponent
           
         
         
           
-            An IBusComponent
+            An IBusComponent
             
           
         
       
       
-        Get the engines of this component.
+        Get the engines of this component.
         
-          A newly allocated GList that contains engines.
+          A newly allocated GList that contains engines.
           
             
           
         
         
           
-            An IBusComponent.
+            An IBusComponent.
             
           
         
       
       
-        Return the exec property in IBusComponent. It should not be freed.
+        Return the exec property in IBusComponent. It should not be freed.
         
-          exec property in IBusComponent
+          exec property in IBusComponent
           
         
         
           
-            An IBusComponent
+            An IBusComponent
             
           
         
       
       
-        Return the homepage property in IBusComponent. It should not be freed.
+        Return the homepage property in IBusComponent. It should not be freed.
         
-          homepage property in IBusComponent
+          homepage property in IBusComponent
           
         
         
           
-            An IBusComponent
+            An IBusComponent
             
           
         
       
       
-        Return the license property in IBusComponent. It should not be freed.
+        Return the license property in IBusComponent. It should not be freed.
         
-          license property in IBusComponent
+          license property in IBusComponent
           
         
         
           
-            An IBusComponent
+            An IBusComponent
             
           
         
       
       
-        Return the name property in IBusComponent. It should not be freed.
+        Return the name property in IBusComponent. It should not be freed.
         
-          name property in IBusComponent
+          name property in IBusComponent
           
         
         
           
-            An IBusComponent
+            An IBusComponent
             
           
         
       
       
-        Get the observed paths of this component.
+        Get the observed paths of this component.
         
-          A newly allocated GList that contains observed paths.
+          A newly allocated GList that contains observed paths.
           
             
           
         
         
           
-            An IBusComponent.
+            An IBusComponent.
             
           
         
       
       
-        Return the textdomain property in IBusComponent. It should not be freed.
+        Return the textdomain property in IBusComponent. It should not be freed.
         
-          textdomain property in IBusComponent
+          textdomain property in IBusComponent
           
         
         
           
-            An IBusComponent
+            An IBusComponent
             
           
         
       
       
-        Return the version property in IBusComponent. It should not be freed.
+        Return the version property in IBusComponent. It should not be freed.
         
-          version property in IBusComponent
+          version property in IBusComponent
           
         
         
           
-            An IBusComponent
+            An IBusComponent
             
           
         
       
       
-        Output IBusComponent as an XML-formatted string.
+        Output IBusComponent as an XML-formatted string.
 The output string can be then shown on the screen or written to file.
         
           
         
         
           
-            An IBusComponent.
+            An IBusComponent.
             
           
           
-            GString that holds the result.
+            GString that holds the result.
             
           
           
-            level of indent.
+            level of indent.
             
           
         
       
       
-        Output engine description  as an XML-formatted string.
+        Output engine description  as an XML-formatted string.
 The output string can be then shown on the screen or written to file.
         
           
         
         
           
-            An IBusComponent.
+            An IBusComponent.
             
           
           
-            GString that holds the result.
+            GString that holds the result.
             
           
           
-            level of indent.
+            level of indent.
             
           
         
@@ -3377,56 +3378,56 @@
                 writable="1"
                 construct-only="1"
                 transfer-ownership="none">
-        The author of component
+        The author of component
         
       
       
-        The exec path of component
+        The exec path of component
         
       
       
-        The description of component
+        The description of component
         
       
       
-        The homepage of component
+        The homepage of component
         
       
       
-        The license of component
+        The license of component
         
       
       
-        The name of component
+        The name of component
         
       
       
-        The textdomain of component
+        The textdomain of component
         
       
       
-        The version of component
+        The version of component
         
       
       
@@ -3459,7 +3460,7 @@
            glib:type-name="IBusConfig"
            glib:get-type="ibus_config_get_type"
            glib:type-struct="ConfigClass">
-      An IBusConfig provides engine configuration methods
+      An IBusConfig provides engine configuration methods
 such as get and set the configure settings to configuration file.
 
 Currently, IBusConfig supports gconf.
@@ -3467,14 +3468,14 @@
       
       
       
-        New an #IBusConfig from existing #GDBusConnection.
+        New an #IBusConfig from existing #GDBusConnection.
         
-          An newly allocated #IBusConfig corresponding to @connection.
+          An newly allocated #IBusConfig corresponding to @connection.
           
         
         
           
-            A #GDBusConnection.
+            A #GDBusConnection.
             
           
           
-        Finishes an operation started with ibus_config_new_async().
+        Finishes an operation started with ibus_config_new_async().
         
-          A newly allocated #IBusConfig.
+          A newly allocated #IBusConfig.
           
         
         
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback pass to ibus_config_new_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback pass to ibus_config_new_async().
             
           
         
       
       
-        New an #IBusConfig asynchronously.
+        New an #IBusConfig asynchronously.
         
           
         
         
           
-            An #GDBusConnection.
+            An #GDBusConnection.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied. The callback should not be %NULL.
+            A #GAsyncReadyCallback to call when the request is satisfied. The callback should not be %NULL.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
       
       
-        Get the value of a configuration option synchronously.
+        Get the value of a configuration option synchronously.
 
 GConf stores configure options in a tree-like structure,
 and the IBus related setting is at /desktop/ibus,
@@ -3541,27 +3542,27 @@
 so the section name for it is "engine/Chewing".
 See also: ibus_config_set_value().
         
-          A #GVariant or %NULL. Free with g_variant_unref().
+          A #GVariant or %NULL. Free with g_variant_unref().
           
         
         
           
-            An #IBusConfig
+            An #IBusConfig
             
           
           
-            Section name of the configuration option.
+            Section name of the configuration option.
             
           
           
-            Name of the configure option.
+            Name of the configure option.
             
           
         
       
       
-        Get the value of a configuration option asynchronously.
+        Get the value of a configuration option asynchronously.
 
 See also: ibus_config_get_value().
         
@@ -3569,25 +3570,25 @@
         
         
           
-            An #IBusConfig
+            An #IBusConfig
             
           
           
-            Section name of the configuration option.
+            Section name of the configuration option.
             
           
           
-            Name of the configure option.
+            Name of the configure option.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            Callback function to invoke when the return value is ready.
+            Callback function to invoke when the return value is ready.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -3607,46 +3608,46 @@
       
-        Finish get value of a configuration option.
+        Finish get value of a configuration option.
 
 See also: ibus_config_get_value_async().
         
-          A #GVariant or %NULL if error is set. Free with g_variant_unref().
+          A #GVariant or %NULL if error is set. Free with g_variant_unref().
           
         
         
           
-            A #IBusConfig.
+            A #IBusConfig.
             
           
           
-            A #GAsyncResult.
+            A #GAsyncResult.
             
           
         
       
       
-        Get all values in a section synchronously.
+        Get all values in a section synchronously.
 
 See also: ibus_config_set_value().
         
-          A #GVariant or %NULL. Free with g_variant_unref().
+          A #GVariant or %NULL. Free with g_variant_unref().
           
         
         
           
-            An #IBusConfig
+            An #IBusConfig
             
           
           
-            Section name of the configuration option.
+            Section name of the configuration option.
             
           
         
       
       
-        Get all values in a section asynchronously.
+        Get all values in a section asynchronously.
 
 See also: ibus_config_get_values().
         
@@ -3654,21 +3655,21 @@
         
         
           
-            An #IBusConfig
+            An #IBusConfig
             
           
           
-            Section name of the configuration option.
+            Section name of the configuration option.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            Callback function to invoke when the return value is ready.
+            Callback function to invoke when the return value is ready.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -3688,53 +3689,53 @@
       
-        Finish get values in a section.
+        Finish get values in a section.
 
 See also: ibus_config_get_values_async().
         
-          A #GVariant or %NULL if error is set. Free with g_variant_unref().
+          A #GVariant or %NULL if error is set. Free with g_variant_unref().
           
         
         
           
-            A #IBusConfig.
+            A #IBusConfig.
             
           
           
-            A #GAsyncResult.
+            A #GAsyncResult.
             
           
         
       
       
-        Set the value of a configuration option synchronously.
+        Set the value of a configuration option synchronously.
 See also: ibus_config_get_value().
         
-          %TRUE if succeed; %FALSE otherwise.
+          %TRUE if succeed; %FALSE otherwise.
           
         
         
           
-            An #IBusConfig
+            An #IBusConfig
             
           
           
-            Section name of the configuration option.
+            Section name of the configuration option.
             
           
           
-            Name of the configure option its self.
+            Name of the configure option its self.
             
           
           
-            A #GVariant that holds the value. If the value is floating, the function takes ownership of it.
+            A #GVariant that holds the value. If the value is floating, the function takes ownership of it.
             
           
         
       
       
-        Set the value of a configuration option asynchronously.
+        Set the value of a configuration option asynchronously.
 
 See also: ibus_config_set_value().
         
@@ -3742,29 +3743,29 @@
         
         
           
-            An #IBusConfig
+            An #IBusConfig
             
           
           
-            Section name of the configuration option.
+            Section name of the configuration option.
             
           
           
-            Name of the configure option.
+            Name of the configure option.
             
           
           
-            A #GVariant that holds the value. If the value is floating, the function takes ownership of it.
+            A #GVariant that holds the value. If the value is floating, the function takes ownership of it.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            Callback function to invoke when the return value is ready.
+            Callback function to invoke when the return value is ready.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -3784,71 +3785,71 @@
       
-        Finish set value of a configuration option.
+        Finish set value of a configuration option.
 
 See also: ibus_config_set_value_async().
         
-          %TRUE or %FALSE if error is set.
+          %TRUE or %FALSE if error is set.
           
         
         
           
-            A #IBusConfig.
+            A #IBusConfig.
             
           
           
-            A #GAsyncResult.
+            A #GAsyncResult.
             
           
         
       
       
-        Remove an entry of a configuration option.
+        Remove an entry of a configuration option.
 See also: ibus_config_get_value().
         
-          %TRUE if succeed; %FALSE otherwise.
+          %TRUE if succeed; %FALSE otherwise.
           
         
         
           
-            An #IBusConfig
+            An #IBusConfig
             
           
           
-            Section name of the configuration option.
+            Section name of the configuration option.
             
           
           
-            Name of the configure option its self.
+            Name of the configure option its self.
             
           
         
       
       
-        Unsubscribe from the configuration option change notification.
+        Unsubscribe from the configuration option change notification.
 
 See also: ibus_config_watch.
         
-          %TRUE if succeed; %FALSE otherwise.
+          %TRUE if succeed; %FALSE otherwise.
           
         
         
           
-            An #IBusConfig
+            An #IBusConfig
             
           
           
-            Section name of the configuration option.
+            Section name of the configuration option.
             
           
           
-            Name of the configure option its self.
+            Name of the configure option its self.
             
           
         
       
       
-        Subscribe to the configuration option change notification.
+        Subscribe to the configuration option change notification.
 
 Until this function is called, every change will be notified to the
 client through #IBusConfig::value-changed signal.  Clients should
@@ -3857,20 +3858,20 @@
 
 See also: ibus_config_unwatch().
         
-          %TRUE if succeed; %FALSE otherwise.
+          %TRUE if succeed; %FALSE otherwise.
           
         
         
           
-            An #IBusConfig
+            An #IBusConfig
             
           
           
-            Section name of the configuration option.
+            Section name of the configuration option.
             
           
           
-            Name of the configure option its self.
+            Name of the configure option its self.
             
           
         
@@ -3882,22 +3883,22 @@
         
       
       
-        Emitted when configuration value is changed.
+        Emitted when configuration value is changed.
 <note><para>Argument @user_data is ignored in this function.</para></note>
         
           
         
         
           
-            Section name.
+            Section name.
             
           
           
-            Name of the property.
+            Name of the property.
             
           
           
-            Value.
+            Value.
             
           
         
@@ -3919,7 +3920,7 @@
            glib:type-name="IBusConfigService"
            glib:get-type="ibus_config_service_get_type"
            glib:type-struct="ConfigServiceClass">
-      An IBusConfigService is a base class for other configuration services such as GConf.
+      An IBusConfigService is a base class for other configuration services such as GConf.
 Currently, directly known sub class is IBusConfigGConf.
 
 IBusConfigServiceClass has following member functions:
@@ -3986,7 +3987,7 @@
                 <term>Returns:</term>
                 <listitem>TRUE if succeed; FALSE otherwise.</listitem>
             </varlistentry>
-        </variablelist>
+       </variablelist>
        <para>Get value of a configuration option.
        </para>
     </listitem>
@@ -4021,14 +4022,14 @@
     </listitem>
 </itemizedlist>
       
-        New an IBusConfigService from an GDBusConnection.
+        New an IBusConfigService from an GDBusConnection.
         
-          A newly allocated IBusConfigServices.
+          A newly allocated IBusConfigServices.
           
         
         
           
-            An GDBusConnection.
+            An GDBusConnection.
             
           
         
@@ -4099,26 +4100,26 @@
       
       
-        Change a value of a configuration option
+        Change a value of a configuration option
 by sending a "ValueChanged" message to IBus service.
         
           
         
         
           
-            An IBusConfigService.
+            An IBusConfigService.
             
           
           
-            Section name of the configuration option.
+            Section name of the configuration option.
             
           
           
-            Name of the configure option.
+            Name of the configure option.
             
           
           
-            GVariant that holds the value.
+            GVariant that holds the value.
             
           
         
@@ -4705,53 +4706,53 @@
            glib:type-name="IBusEngine"
            glib:get-type="ibus_engine_get_type"
            glib:type-struct="EngineClass">
-      An IBusEngine provides infrastructure for input method engine.
+      An IBusEngine provides infrastructure for input method engine.
 Developers can "extend" this class for input method engine development.
 
 see_also: #IBusComponent, #IBusEngineDesc
       
-        New an IBusEngine.
+        New an IBusEngine.
         
-          A newly allocated IBusEngine.
+          A newly allocated IBusEngine.
           
         
         
           
-            Name of the IBusObject.
+            Name of the IBusObject.
             
           
           
-            Path for IBusService.
+            Path for IBusService.
             
           
           
-            An opened GDBusConnection.
+            An opened GDBusConnection.
             
           
         
       
       
-        New an IBusEngine.
+        New an IBusEngine.
         
-          A newly allocated IBusEngine.
+          A newly allocated IBusEngine.
           
         
         
           
-            GType of #IBusEngine.
+            GType of #IBusEngine.
             
           
           
-            Name of the IBusObject.
+            Name of the IBusObject.
             
           
           
-            Path for IBusService.
+            Path for IBusService.
             
           
           
-            An opened GDBusConnection.
+            An opened GDBusConnection.
             
           
         
@@ -5026,7 +5027,7 @@
         
       
       
-        Commit output of input method to IBus client.
+        Commit output of input method to IBus client.
 
 (Note: The text object will be released, if it is floating.
  If caller want to keep the object, caller should make the object
@@ -5036,64 +5037,64 @@
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            String commit to IBusEngine.
+            String commit to IBusEngine.
             
           
         
       
       
-        Delete surrounding text.
+        Delete surrounding text.
         
           
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            The offset of the first char.
+            The offset of the first char.
             
           
           
-            Number of chars to be deleted.
+            Number of chars to be deleted.
             
           
         
       
       
-        Forward the key event.
+        Forward the key event.
         
           
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            KeySym.
+            KeySym.
             
           
           
-            keyboard scancode.
+            keyboard scancode.
             
           
           
-            Key modifier flags.
+            Key modifier flags.
             
           
         
       
       
-        Get content-type (primary purpose and hints) of the current input
+        Get content-type (primary purpose and hints) of the current input
 context.
 
 See also: #IBusEngine::set-content-type
@@ -5102,7 +5103,7 @@
         
         
           
-            An #IBusEngine.
+            An #IBusEngine.
             
           
           
-            Primary purpose of the input context.
+            Primary purpose of the input context.
             
           
           
-            Hints that augument @purpose.
+            Hints that augument @purpose.
             
           
         
       
       
-        Return the name of IBusEngine.
+        Return the name of IBusEngine.
         
-          Name of IBusEngine.
+          Name of IBusEngine.
           
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
         
       
       
-        Get surrounding text.
+        Get surrounding text.
 
 It is also used to tell the input-context that the engine will
 utilize surrounding-text.  In that case, it must be called in
@@ -5151,7 +5152,7 @@
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            Location to store surrounding text.
+            Location to store surrounding text.
             
           
           
-            Cursor position in characters in @text.
+            Cursor position in characters in @text.
             
           
           
-            Anchor position of selection in @text.
+            Anchor position of selection in @text.
             
           
         
       
       
-        Hide the auxiliary bar.
+        Hide the auxiliary bar.
         
           
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
         
       
       
-        Hide the lookup table.
+        Hide the lookup table.
         
           
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
         
       
       
-        Hide the pre-edit buffer.
+        Hide the pre-edit buffer.
         
           
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
         
       
       
-        Register and show properties in language bar.
+        Register and show properties in language bar.
 
 (Note: The prop_list object will be released, if it is floating.
  If caller want to keep the object, caller should make the object
@@ -5231,57 +5232,57 @@
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            Property List.
+            Property List.
             
           
         
       
       
-        Show the auxiliary bar.
+        Show the auxiliary bar.
         
           
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
         
       
       
-        Show the lookup table.
+        Show the lookup table.
         
           
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
         
       
       
-        Show the pre-edit buffer.
+        Show the pre-edit buffer.
         
           
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
         
       
       
-        Update the auxiliary bar.
+        Update the auxiliary bar.
 
 (Note: The text object will be released, if it is floating.
  If caller want to keep the object, caller should make the object
@@ -5291,22 +5292,22 @@
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            Update content.
+            Update content.
             
           
           
-            Whether the auxiliary text bar is visible.
+            Whether the auxiliary text bar is visible.
             
           
         
       
       
-        Update the lookup table.
+        Update the lookup table.
 
 (Note: The table object will be released, if it is floating.
  If caller want to keep the object, caller should make the object
@@ -5316,22 +5317,22 @@
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            An lookup_table.
+            An lookup_table.
             
           
           
-            Whether the lookup_table is visible.
+            Whether the lookup_table is visible.
             
           
         
       
       
-        Fast update for big lookup table.
+        Fast update for big lookup table.
 
 If size of lookup table is not over table page size *4,
 then it calls ibus_engine_update_lookup_table().
@@ -5344,22 +5345,22 @@
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            An lookup_table.
+            An lookup_table.
             
           
           
-            Whether the lookup_table is visible.
+            Whether the lookup_table is visible.
             
           
         
       
       
-        Update the pre-edit buffer.
+        Update the pre-edit buffer.
 
 (Note: The text object will be released, if it is floating.
  If caller want to keep the object, caller should make the object
@@ -5369,26 +5370,26 @@
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            Update content.
+            Update content.
             
           
           
-            Current position of cursor
+            Current position of cursor
             
           
           
-            Whether the pre-edit buffer is visible.
+            Whether the pre-edit buffer is visible.
             
           
         
       
       
-        Update the pre-edit buffer with commit mode. Similar to
+        Update the pre-edit buffer with commit mode. Similar to
 ibus_engine_update_preedit_text(), this function allows users to specify
 the behavior on focus out when the pre-edit buffer is visible.
 
@@ -5405,30 +5406,30 @@
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            Update content.
+            Update content.
             
           
           
-            Current position of cursor
+            Current position of cursor
             
           
           
-            Whether the pre-edit buffer is visible.
+            Whether the pre-edit buffer is visible.
             
           
           
-            Pre-edit commit mode when the focus is lost.
+            Pre-edit commit mode when the focus is lost.
             
           
         
       
       
-        Update the state displayed in language bar.
+        Update the state displayed in language bar.
 
 (Note: The prop object will be released, if it is floating.
  If caller want to keep the object, caller should make the object
@@ -5438,11 +5439,11 @@
         
         
           
-            An IBusEngine.
+            An IBusEngine.
             
           
           
-            IBusProperty to be updated.
+            IBusProperty to be updated.
             
           
         
@@ -5472,7 +5473,7 @@
         
       
       
-        Emitted when a hand writing operation is cancelled.
+        Emitted when a hand writing operation is cancelled.
 Implement the member function cancel_hand_writing() in extended class to receive this signal.
 
 <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -5481,13 +5482,13 @@
         
         
           
-            The number of strokes to be removed. 0 means "remove all".
+            The number of strokes to be removed. 0 means "remove all".
             
           
         
       
       
-        Emitted when candidate on lookup table is clicked.
+        Emitted when candidate on lookup table is clicked.
 Implement the member function candidate_clicked() in extended class to receive this signal.
 
 <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -5496,21 +5497,21 @@
         
         
           
-            Index of candidate be clicked.
+            Index of candidate be clicked.
             
           
           
-            Mouse button.
+            Mouse button.
             
           
           
-            Keyboard state.
+            Keyboard state.
             
           
         
       
       
-        Emitted when the down cursor button is pressed.
+        Emitted when the down cursor button is pressed.
 Implement the member function cursor_down() in extended class to receive this signal.
 
 <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -5519,7 +5520,7 @@
         
       
       
-        Emitted when the up cursor button is pressed.
+        Emitted when the up cursor button is pressed.
 Implement the member function cursor_up() in extended class to receive this signal.
 
 <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -5528,7 +5529,7 @@
         
       
       
-        Emitted when the IME is disabled.
+        Emitted when the IME is disabled.
 Implement the member function set_disable() in extended class to receive this signal.
 
 See also:  ibus_input_context_disable().
@@ -5538,7 +5539,7 @@
         
       
       
-        Emitted when the IME is enabled.
+        Emitted when the IME is enabled.
 Implement the member function set_enable() in extended class to receive this signal.
 
 See also:  ibus_input_context_enable().
@@ -5548,7 +5549,7 @@
         
       
       
-        Emitted when the client application get the focus.
+        Emitted when the client application get the focus.
 Implement the member function focus_in() in extended class to receive this signal.
 
 See also: ibus_input_context_focus_in()
@@ -5558,7 +5559,7 @@
         
       
       
-        Emitted when the client application  lost the focus.
+        Emitted when the client application  lost the focus.
 Implement the member function focus_out() in extended class to receive this signal.
 
 See also: ibus_input_context_focus_out()
@@ -5568,7 +5569,7 @@
         
       
       
-        Emitted when the page-down button is pressed.
+        Emitted when the page-down button is pressed.
 Implement the member function page_down() in extended class to receive this signal.
 
 <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -5577,7 +5578,7 @@
         
       
       
-        Emitted when the page-up button is pressed.
+        Emitted when the page-up button is pressed.
 Implement the member function page_up() in extended class to receive this signal.
 
 <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -5586,7 +5587,7 @@
         
       
       
-        Emitted when a hand writing operation is cancelled.
+        Emitted when a hand writing operation is cancelled.
 Implement the member function cancel_hand_writing() in extended class to receive this signal.
 
 <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -5595,42 +5596,42 @@
         
         
           
-            An array of double (0.0 to 1.0) which represents a stroke (i.e. [x1, y1, x2, y2, x3, y3, ...]).
+            An array of double (0.0 to 1.0) which represents a stroke (i.e. [x1, y1, x2, y2, x3, y3, ...]).
             
           
           
-            The number of elements in the array.
+            The number of elements in the array.
             
           
         
       
       
-        Emitted when a key event is received.
+        Emitted when a key event is received.
 Implement the member function process_key_event() in extended class to receive this signal.
 Both the key symbol and keycode are passed to the member function.
 See ibus_input_context_process_key_event() for further explanation of
 key symbol, keycode and which to use.
         
-          TRUE for successfully process the key; FALSE otherwise. See also:  ibus_input_context_process_key_event().  <note><para>Argument @user_data is ignored in this function.</para></note>
+          TRUE for successfully process the key; FALSE otherwise. See also:  ibus_input_context_process_key_event().  <note><para>Argument @user_data is ignored in this function.</para></note>
           
         
         
           
-            Key symbol of the key press.
+            Key symbol of the key press.
             
           
           
-            KeyCode of the key press.
+            KeyCode of the key press.
             
           
           
-            Key modifier flags.
+            Key modifier flags.
             
           
         
       
       
-        Emitted when a property is activated or change changed.
+        Emitted when a property is activated or change changed.
 Implement the member function property_activate() in extended class to receive this signal.
 
 <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -5639,17 +5640,17 @@
         
         
           
-            Property name.
+            Property name.
             
           
           
-            Property state.
+            Property state.
             
           
         
       
       
-        Emitted when a property is hidden.
+        Emitted when a property is hidden.
 Implement the member function property_hide() in extended class to receive this signal.
 
 <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -5658,13 +5659,13 @@
         
         
           
-            Property name.
+            Property name.
             
           
         
       
       
-        Emitted when a property is shown.
+        Emitted when a property is shown.
 Implement the member function property_side() in extended class to receive this signal.
 
 <note><para>Argument @user_data is ignored in this function.</para></note>
@@ -5673,13 +5674,13 @@
         
         
           
-            Property name.
+            Property name.
             
           
         
       
       
-        Emitted when the IME is reset.
+        Emitted when the IME is reset.
 Implement the member function reset() in extended class to receive this signal.
 
 See also:  ibus_input_context_reset().
@@ -5689,7 +5690,7 @@
         
       
       
-        Emitted when the client application capabilities is set.
+        Emitted when the client application capabilities is set.
 Implement the member function set_capabilities() in extended class to receive this signal.
 
 See also:  ibus_input_context_set_capabilities().
@@ -5699,13 +5700,13 @@
         
         
           
-            Capabilities flags of IBusEngine, see #IBusCapabilite
+            Capabilities flags of IBusEngine, see #IBusCapabilite
             
           
         
       
       
-        Emitted when the client application content-type (primary
+        Emitted when the client application content-type (primary
 purpose and hints) is set.  The engine could change the
 behavior according to the content-type.  Implement the member
 function set_content_type() in extended class to receive this
@@ -5723,17 +5724,17 @@
         
         
           
-            Primary purpose of the input context, as an #IBusInputPurpose.
+            Primary purpose of the input context, as an #IBusInputPurpose.
             
           
           
-            Hints that augment @purpose, as an #IBusInputHints.
+            Hints that augment @purpose, as an #IBusInputHints.
             
           
         
       
       
-        Emitted when the location of IME is set.
+        Emitted when the location of IME is set.
 Implement the member function set_cursor_location() in extended class to receive this signal.
 
 See also:  ibus_input_context_set_cursor_location().
@@ -5743,25 +5744,25 @@
         
         
           
-            X coordinate of the cursor.
+            X coordinate of the cursor.
             
           
           
-            Y coordinate of the cursor.
+            Y coordinate of the cursor.
             
           
           
-            Width of the cursor.
+            Width of the cursor.
             
           
           
-            Height of the cursor.
+            Height of the cursor.
             
           
         
       
       
-        Emitted when a surrounding text is set.
+        Emitted when a surrounding text is set.
 Implement the member function set_surrounding_text() in extended class to receive this signal.
 If anchor_pos equals to cursor_pos, it means "there are no selection" or "does not support
 selection retrival".
@@ -5772,15 +5773,15 @@
         
         
           
-            The surrounding text.
+            The surrounding text.
             
           
           
-            The cursor position on surrounding text.
+            The cursor position on surrounding text.
             
           
           
-            The anchor position on selection area.
+            The anchor position on selection area.
             
           
         
@@ -6114,51 +6115,53 @@
            glib:type-name="IBusEngineDesc"
            glib:get-type="ibus_engine_desc_get_type"
            glib:type-struct="EngineDescClass">
-      An IBusEngineDesc stores description data of IBusEngine.
+      An IBusEngineDesc stores description data of IBusEngine.
 The description data can either be passed to ibus_engine_desc_new(),
 or loaded from an XML node through ibus_engine_desc_new_from_xml_node()
 to construct IBusEngineDesc.
 
 However, the recommended way to load engine description data is
 using ibus_component_new_from_file() to load a component file,
-which also includes engine description data.
+which also includes engine description data.
+
+see_also: #IBusComponent, #IBusEngine
       
-        New a IBusEngineDesc.
+        New a IBusEngineDesc.
         
-          A newly allocated IBusEngineDesc.
+          A newly allocated IBusEngineDesc.
           
         
         
           
-            Name of the engine.
+            Name of the engine.
             
           
           
-            Long name of the input method engine.
+            Long name of the input method engine.
             
           
           
-            Input method engine description.
+            Input method engine description.
             
           
           
-            Language (e.g. zh, jp) supported by this input method engine.
+            Language (e.g. zh, jp) supported by this input method engine.
             
           
           
-            License of the input method engine.
+            License of the input method engine.
             
           
           
-            Author of the input method engine.
+            Author of the input method engine.
             
           
           
-            Icon file of this engine.
+            Icon file of this engine.
             
           
           
-            Keyboard layout
+            Keyboard layout
             
           
         
@@ -6166,17 +6169,17 @@
       
-        New a IBusEngineDesc from an XML node.
+        New a IBusEngineDesc from an XML node.
 <note><para>This function is called by ibus_component_new_from_file(),
  so developers normally do not need to call it directly.
 </para></note>
         
-          A newly allocated IBusEngineDesc that contains description from @node.
+          A newly allocated IBusEngineDesc that contains description from @node.
           
         
         
           
-            An XML node
+            An XML node
             
           
         
@@ -6184,7 +6187,7 @@
       
-        New a IBusEngineDesc.
+        New a IBusEngineDesc.
 ibus_engine_desc_new_varargs() supports the va_list format.
 name property is required. e.g.
 ibus_engine_desc_new_varargs("name", "ibus-foo", "language", "us", NULL)
@@ -6193,7 +6196,7 @@
         
         
           
-            Name of the first property.
+            Name of the first property.
             
           
           
@@ -6203,234 +6206,234 @@
         
       
       
-        Return the author property in IBusEngineDesc. It should not be freed.
+        Return the author property in IBusEngineDesc. It should not be freed.
         
-          author property in IBusEngineDesc
+          author property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the description property in IBusEngineDesc. It should not be freed.
+        Return the description property in IBusEngineDesc. It should not be freed.
         
-          description property in IBusEngineDesc
+          description property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the hotkeys property in IBusEngineDesc. It should not be freed.
+        Return the hotkeys property in IBusEngineDesc. It should not be freed.
         
-          hotkeys property in IBusEngineDesc
+          hotkeys property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the icon property in IBusEngineDesc. It should not be freed.
+        Return the icon property in IBusEngineDesc. It should not be freed.
         
-          icon property in IBusEngineDesc
+          icon property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the language property in IBusEngineDesc. It should not be freed.
+        Return the language property in IBusEngineDesc. It should not be freed.
         
-          language property in IBusEngineDesc
+          language property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the layout property in IBusEngineDesc. It should not be freed.
+        Return the layout property in IBusEngineDesc. It should not be freed.
         
-          layout property in IBusEngineDesc
+          layout property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the keyboard option property in IBusEngineDesc. It should not be freed.
+        Return the keyboard option property in IBusEngineDesc. It should not be freed.
         
-          keyboard option property in IBusEngineDesc
+          keyboard option property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the keyboard variant property in IBusEngineDesc. It should not be freed.
+        Return the keyboard variant property in IBusEngineDesc. It should not be freed.
         
-          keyboard variant property in IBusEngineDesc
+          keyboard variant property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the license property in IBusEngineDesc. It should not be freed.
+        Return the license property in IBusEngineDesc. It should not be freed.
         
-          license property in IBusEngineDesc
+          license property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the longname property in IBusEngineDesc. It should not be freed.
+        Return the longname property in IBusEngineDesc. It should not be freed.
         
-          longname property in IBusEngineDesc
+          longname property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the name property in IBusEngineDesc. It should not be freed.
+        Return the name property in IBusEngineDesc. It should not be freed.
         
-          name property in IBusEngineDesc
+          name property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the rank property in IBusEngineDesc.
+        Return the rank property in IBusEngineDesc.
         
-          rank property in IBusEngineDesc
+          rank property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the setup property in IBusEngineDesc. It should not be freed.
+        Return the setup property in IBusEngineDesc. It should not be freed.
         
-          setup property in IBusEngineDesc
+          setup property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the symbol property in IBusEngineDesc. It should not be freed.
+        Return the symbol property in IBusEngineDesc. It should not be freed.
         
-          symbol property in IBusEngineDesc
+          symbol property in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the textdomain property in IBusEngineDesc. It should not be freed.
+        Return the textdomain property in IBusEngineDesc. It should not be freed.
         
-          textdomain in IBusEngineDesc
+          textdomain in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Return the version property in IBusEngineDesc. It should not be freed.
+        Return the version property in IBusEngineDesc. It should not be freed.
         
-          version in IBusEngineDesc
+          version in IBusEngineDesc
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
         
       
       
-        Output XML-formatted input method engine description.
+        Output XML-formatted input method engine description.
 The result will be append to GString specified in @output.
         
           
         
         
           
-            An IBusEngineDesc
+            An IBusEngineDesc
             
           
           
-            XML-formatted Input method engine description.
+            XML-formatted Input method engine description.
             
           
           
-            Number of indent (showed as 4 spaces).
+            Number of indent (showed as 4 spaces).
             
           
         
@@ -6439,112 +6442,112 @@
                 writable="1"
                 construct-only="1"
                 transfer-ownership="none">
-        The author of engine description
+        The author of engine description
         
       
       
-        The description of engine description
+        The description of engine description
         
       
       
-        The hotkeys of engine description
+        The hotkeys of engine description
         
       
       
-        The icon of engine description
+        The icon of engine description
         
       
       
-        The language of engine description
+        The language of engine description
         
       
       
-        The layout of engine description
+        The layout of engine description
         
       
       
-        The keyboard option of engine description
+        The keyboard option of engine description
         
       
       
-        The keyboard variant of engine description
+        The keyboard variant of engine description
         
       
       
-        The license of engine description
+        The license of engine description
         
       
       
-        The longname of engine description
+        The longname of engine description
         
       
       
-        The name of engine description
+        The name of engine description
         
       
       
-        The rank of engine description
+        The rank of engine description
         
       
       
-        The exec lists of the engine setup command
+        The exec lists of the engine setup command
         
       
       
-        The symbol chars of engine description instead of icon image
+        The symbol chars of engine description instead of icon image
         
       
       
-        The textdomain of engine description
+        The textdomain of engine description
         
       
       
-        The version number of engine description
+        The version number of engine description
         
       
       
@@ -6574,9 +6577,9 @@
            glib:type-name="IBusEngineSimple"
            glib:get-type="ibus_engine_simple_get_type"
            glib:type-struct="EngineSimpleClass">
-      IBusEngineSimple properties.
+      IBusEngineSimple properties.
       
-        Adds an additional table to search to the engine. Each row of the table
+        Adds an additional table to search to the engine. Each row of the table
 consists of max_seq_len key symbols followed by two guint16 interpreted as
 the high and low words of a gunicode value. Tables are searched starting from
 the last added.
@@ -6588,17 +6591,17 @@
         
         
           
-            An IBusEngineSimple.
+            An IBusEngineSimple.
             
           
           
-            The table which must be available during the whole life of the simple engine.
+            The table which must be available during the whole life of the simple engine.
             
               
             
           
           
-            Maximum length of a swquence in the table (cannot be greater than %IBUS_MAX_COMPOSE_LEN)
+            Maximum length of a swquence in the table (cannot be greater than %IBUS_MAX_COMPOSE_LEN)
             
           
           
@@ -6606,6 +6609,24 @@
           
         
       
+      
+        Call ibus_engine_simple_add_table() internally by locale.
+        
+          %TRUE if the @locale is matched to the table.
+          
+        
+        
+          
+            An IBusEngineSimple.
+            
+          
+          
+            The locale name. If the locale is %NULL, the current locale is used.
+            
+          
+        
+      
       
         
       
@@ -6641,19 +6662,19 @@
               value="0"
               c:identifier="IBUS_ERROR_NO_ENGINE"
               glib:nick="no-engine">
-        There is no engine associated with input context.
+        There is no engine associated with input context.
       
       
-        There is no config module running.
+        There is no config module running.
       
       
-        General failure.
+        General failure.
       
       
         
@@ -6797,26 +6818,28 @@
            glib:type-name="IBusFactory"
            glib:get-type="ibus_factory_get_type"
            glib:type-struct="FactoryClass">
-      An IBusFactory is an #IBusService that creates input method engine (IME) instance.
+      An IBusFactory is an #IBusService that creates input method engine (IME) instance.
 It provides CreateEngine remote method, which creates an IME instance by name,
-and returns the D-Bus object path to IBus daemon.
+and returns the D-Bus object path to IBus daemon.
+
+see_also: #IBusEngine
       
-        New an IBusFactory.
+        New an IBusFactory.
         
-          A newly allocated IBusFactory.
+          A newly allocated IBusFactory.
           
         
         
           
-            An GDBusConnection.
+            An GDBusConnection.
             
           
         
       
       
-        Create an #IBusEngine with @engine_name.
+        Create an #IBusEngine with @engine_name.
         
-          #IBusEngine with @engine_name.
+          #IBusEngine with @engine_name.
           
         
         
@@ -6824,44 +6847,44 @@
             
           
           
-            Name of an engine.
+            Name of an engine.
             
           
         
       
       
-        Add an engine to the factory.
+        Add an engine to the factory.
         
           
         
         
           
-            An IBusFactory.
+            An IBusFactory.
             
           
           
-            Name of an engine.
+            Name of an engine.
             
           
           
-            GType of an engine.
+            GType of an engine.
             
           
         
       
       
-        Create an #IBusEngine with @engine_name.
+        Create an #IBusEngine with @engine_name.
         
-          #IBusEngine with @engine_name.
+          #IBusEngine with @engine_name.
           
         
         
           
-            An #IBusFactory.
+            An #IBusFactory.
             
           
           
-            Name of an engine.
+            Name of an engine.
             
           
         
@@ -6873,18 +6896,18 @@
         
       
       
-        The ::create-engine signal is a signal to create IBusEngine
+        The ::create-engine signal is a signal to create IBusEngine
 with @engine_name, which gets emitted when IBusFactory
 received CreateEngine dbus method. The callback functions
 will be called until a callback returns a non-null object
 of IBusEngine.
         
-          An IBusEngine
+          An IBusEngine
           
         
         
           
-            the engine_name which received the signal
+            the engine_name which received the signal
             
           
         
@@ -6899,7 +6922,7 @@
       
         
           
-            #IBusEngine with @engine_name.
+            #IBusEngine with @engine_name.
             
           
           
@@ -6907,7 +6930,7 @@
               
             
             
-              Name of an engine.
+              Name of an engine.
               
             
           
@@ -6963,13 +6986,13 @@
       
     
     
-      Free function prototype.
+      Free function prototype.
       
         
       
       
         
-          object to be freed.
+          object to be freed.
           
         
       
@@ -7826,21 +7849,21 @@
       
     
     
-      Japanese keyboard support.
+      Japanese keyboard support.
       
     
     
-      Japanese keyboard support.
+      Japanese keyboard support.
       
     
     
-      Japanese keyboard support.
+      Japanese keyboard support.
       
     
     
-      Japanese keyboard support.
+      Japanese keyboard support.
       
     
     
@@ -7853,11 +7876,11 @@
            glib:type-name="IBusHotkeyProfile"
            glib:get-type="ibus_hotkey_profile_get_type"
            glib:type-struct="HotkeyProfileClass">
-      An opaque data type representing an IBusHotkeyProfile.
+      An opaque data type representing an IBusHotkeyProfile.
       
-        New an IBusHotkeyProfile.
+        New an IBusHotkeyProfile.
         
-          A newly allocated IBusHotkeyProfile.
+          A newly allocated IBusHotkeyProfile.
           
         
       
@@ -7878,85 +7901,85 @@
         
       
       
-        Add a hotkey and its associated event to an IBusHotkeyProfile.
+        Add a hotkey and its associated event to an IBusHotkeyProfile.
         
-          Always TRUE.
+          Always TRUE.
           
         
         
           
-            An IBusHotkeyProfile.
+            An IBusHotkeyProfile.
             
           
           
-            Keycode of the hotkey.
+            Keycode of the hotkey.
             
           
           
-            Modifiers of the hotkey.
+            Modifiers of the hotkey.
             
           
           
-            The event to be associated.
+            The event to be associated.
             
           
         
       
       
-        Add a hotkey and its associated event to an IBusHotkeyProfile.
+        Add a hotkey and its associated event to an IBusHotkeyProfile.
 The hotkey is in string format, such like <constant>Control+Shift+A</constant>.
         
-          FALSE if @str contains invalid symbol; TRUE otherwise.
+          FALSE if @str contains invalid symbol; TRUE otherwise.
           
         
         
           
-            An IBusHotkeyProfile.
+            An IBusHotkeyProfile.
             
           
           
-            Key in string representation.  '+' is the separator.
+            Key in string representation.  '+' is the separator.
             
           
           
-            The event to be associated.
+            The event to be associated.
             
           
         
       
       
-        Emit a <constant>::trigger</constant> signal when a hotkey is in a profile.
+        Emit a <constant>::trigger</constant> signal when a hotkey is in a profile.
 
 See also: ::trigger
         
-          0 if releasing a hotkey and the hotkey is not in the profile ; an associated event otherwise.
+          0 if releasing a hotkey and the hotkey is not in the profile ; an associated event otherwise.
           
         
         
           
-            An IBusHotkeyProfile.
+            An IBusHotkeyProfile.
             
           
           
-            Keycode of the hotkey.
+            Keycode of the hotkey.
             
           
           
-            Modifiers of the hotkey.
+            Modifiers of the hotkey.
             
           
           
-            Keycode of the hotkey.
+            Keycode of the hotkey.
             
           
           
-            Modifiers of the hotkey.
+            Modifiers of the hotkey.
             
           
           
-            user data for signal "trigger".
+            user data for signal "trigger".
             
           
         
@@ -7964,60 +7987,60 @@
       
         
-          The event associated to the hotkey or 0 if the hotkey is not in the profile.
+          The event associated to the hotkey or 0 if the hotkey is not in the profile.
           
         
         
           
-            An IBusHotkeyProfile.
+            An IBusHotkeyProfile.
             
           
           
-            Keycode of the hotkey.
+            Keycode of the hotkey.
             
           
           
-            Modifiers of the hotkey.
+            Modifiers of the hotkey.
             
           
         
       
       
-        Remove the hotkey for an IBusHotkeyProfile.
+        Remove the hotkey for an IBusHotkeyProfile.
         
-          FALSE if the key is not in @profile, TRUE otherwise.
+          FALSE if the key is not in @profile, TRUE otherwise.
           
         
         
           
-            An IBusHotkeyProfile.
+            An IBusHotkeyProfile.
             
           
           
-            Keycode of the hotkey.
+            Keycode of the hotkey.
             
           
           
-            Modifiers of the hotkey.
+            Modifiers of the hotkey.
             
           
         
       
       
-        Remove the hotkey for an IBusHotkeyProfile by event.
+        Remove the hotkey for an IBusHotkeyProfile by event.
         
-          FALSE if no such event in @profile, TRUE otherwise.
+          FALSE if no such event in @profile, TRUE otherwise.
           
         
         
           
-            An IBusHotkeyProfile.
+            An IBusHotkeyProfile.
             
           
           
-            The associated event.
+            The associated event.
             
           
         
@@ -8026,7 +8049,7 @@
         
       
       
-        Emitted when a hotkey is pressed and the hotkey is in profile.
+        Emitted when a hotkey is pressed and the hotkey is in profile.
 Implement the member function trigger() in extended class to receive this signal.
 
 <note><para>The last parameter, user_data is not actually a valid parameter. It is displayed because of GtkDoc bug.</para></note>
@@ -8035,11 +8058,11 @@
         
         
           
-            An event in GQuark.
+            An event in GQuark.
             
           
           
-            User data for callback.
+            User data for callback.
             
           
         
@@ -8085,43 +8108,43 @@
     
-      D-Bus interface for IBus config.
+      D-Bus interface for IBus config.
       
     
     
-      D-Bus interface for IBus engine.
+      D-Bus interface for IBus engine.
       
     
     
-      D-Bus interface for IBus factory.
+      D-Bus interface for IBus factory.
       
     
     
-      D-Bus interface for IBus.
+      D-Bus interface for IBus.
       
     
     
-      D-Bus interface for IBus input context.
+      D-Bus interface for IBus input context.
       
     
     
-      D-Bus interface for IBus notifications.
+      D-Bus interface for IBus notifications.
       
     
     
-      D-Bus interface for IBus panel.
+      D-Bus interface for IBus panel.
       
     
     
-      An IBusInputContext is a proxy object of BusInputContext,
+      An IBusInputContext is a proxy object of BusInputContext,
 which manages the context for input methods that supports
 text input in various natural languages.
 
@@ -8352,24 +8375,24 @@
       
       
       
-        New an IBusInputContext.
+        New an IBusInputContext.
         
-          A newly allocated IBusInputContext.
+          A newly allocated IBusInputContext.
           
         
         
           
-            The path to the object that emitting the signal.
+            The path to the object that emitting the signal.
             
           
           
-            An #GDBusConnection.
+            An #GDBusConnection.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
         
@@ -8377,55 +8400,55 @@
       
-        Finishes an operation started with ibus_input_context_new_async().
+        Finishes an operation started with ibus_input_context_new_async().
         
-          A newly allocated #IBusInputContext.
+          A newly allocated #IBusInputContext.
           
         
         
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback pass to ibus_input_context_new_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback pass to ibus_input_context_new_async().
             
           
         
       
       
-        Gets an existing IBusInputContext.
+        Gets an existing IBusInputContext.
         
-          An existing #IBusInputContext.
+          An existing #IBusInputContext.
           
         
         
           
-            The path to the object that emitting the signal.
+            The path to the object that emitting the signal.
             
           
           
-            An #GDBusConnection.
+            An #GDBusConnection.
             
           
         
       
       
-        Get an existing #IBusInputContext asynchronously.
+        Get an existing #IBusInputContext asynchronously.
         
           
         
         
           
-            The path to the object that emitting the signal.
+            The path to the object that emitting the signal.
             
           
           
-            An #GDBusConnection.
+            An #GDBusConnection.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied. The callback should not be %NULL.
+            A #GAsyncReadyCallback to call when the request is satisfied. The callback should not be %NULL.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -8445,36 +8468,36 @@
       
-        Finishes an operation started with ibus_input_contex_get_input_context_async().
+        Finishes an operation started with ibus_input_contex_get_input_context_async().
         
-          An existing #IBusInputContext.
+          An existing #IBusInputContext.
           
         
         
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback pass to ibus_input_context_get_input_context_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback pass to ibus_input_context_get_input_context_async().
             
           
         
       
       
-        New an #IBusInputContext asynchronously.
+        New an #IBusInputContext asynchronously.
         
           
         
         
           
-            The path to the object that emitting the signal.
+            The path to the object that emitting the signal.
             
           
           
-            An #GDBusConnection.
+            An #GDBusConnection.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied. The callback should not be %NULL.
+            A #GAsyncReadyCallback to call when the request is satisfied. The callback should not be %NULL.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
       
       
-        Clear handwriting stroke(s) in the current input method engine.
+        Clear handwriting stroke(s) in the current input method engine.
 
 see_also: #IBusEngine::cancel-hand-writing
         
@@ -8501,17 +8524,17 @@
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
           
-            The number of strokes to be removed. Pass 0 to remove all.
+            The number of strokes to be removed. Pass 0 to remove all.
             
           
         
       
       
-        Invoked when the client application get focus. An asynchronous IPC will be performed.
+        Invoked when the client application get focus. An asynchronous IPC will be performed.
 
 see_also: #IBusEngine::focus_in.
         
@@ -8519,13 +8542,13 @@
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
         
       
       
-        Invoked when the client application get focus. An asynchronous IPC will be performed.
+        Invoked when the client application get focus. An asynchronous IPC will be performed.
 
 see_also: #IBusEngine::focus_out.
         
@@ -8533,44 +8556,44 @@
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
         
       
       
-        Returns an IME engine description for the context.
+        Returns an IME engine description for the context.
 A synchronous IPC will be performed.
         
-          An IME engine description for the context, or NULL.
+          An IME engine description for the context, or NULL.
           
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
         
       
       
-        An asynchronous IPC will be performed.
+        An asynchronous IPC will be performed.
         
           
         
         
           
-            An #IBusInputContext.
+            An #IBusInputContext.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A #GCancellable or %NULL.
+            A #GCancellable or %NULL.
             
           
           
-            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
+            A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -8590,39 +8613,39 @@
       
-        Finishes an operation started with ibus_input_context_get_engine_async().
+        Finishes an operation started with ibus_input_context_get_engine_async().
         
-          An IME engine description for the context, or %NULL.
+          An IME engine description for the context, or %NULL.
           
         
         
           
-            An #IBusInputContext.
+            An #IBusInputContext.
             
           
           
-            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_input_context_get_engine_async().
+            A #GAsyncResult obtained from the #GAsyncReadyCallback passed to ibus_input_context_get_engine_async().
             
           
         
       
       
-        Check whether the current engine requires surrounding-text.
+        Check whether the current engine requires surrounding-text.
         
-          %TRUE if surrounding-text is needed by the current engine; %FALSE otherwise.
+          %TRUE if surrounding-text is needed by the current engine; %FALSE otherwise.
           
         
         
           
-            An #IBusInputContext.
+            An #IBusInputContext.
             
           
         
       
       
-        Pass a handwriting stroke to an input method engine.
+        Pass a handwriting stroke to an input method engine.
 
 In this API, a coordinate (0.0, 0.0) represents the top-left corner of an area for
 handwriting, and (1.0, 1.0) does the bottom-right. Therefore, for example, if
@@ -8638,50 +8661,50 @@
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
           
-            An array of gdouble (0.0 to 1.0) which represents a stroke (i.e. [x1, y1, x2, y2, x3, y3, ...]).
+            An array of gdouble (0.0 to 1.0) which represents a stroke (i.e. [x1, y1, x2, y2, x3, y3, ...]).
             
           
           
-            The number of elements in the array. The number should be even and >= 4.
+            The number of elements in the array. The number should be even and >= 4.
             
           
         
       
       
-        Pass the key event to input method engine and wait for the reply from ibus (i.e. synchronous IPC).
+        Pass the key event to input method engine and wait for the reply from ibus (i.e. synchronous IPC).
 
 See also: ibus_input_context_process_key_event_async()
         
-          TRUE for successfully process the key; FALSE otherwise.
+          TRUE for successfully process the key; FALSE otherwise.
           
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
           
-            Key symbol of a key event.
+            Key symbol of a key event.
             
           
           
-            Keycode of a key event.
+            Keycode of a key event.
             
           
           
-            Key modifier flags.
+            Key modifier flags.
             
           
         
       
       
-        Pass the key event to input method engine.
+        Pass the key event to input method engine.
 
 Key symbols are characters/symbols produced by key press, for example,
 pressing "s" generates key symbol "s"; pressing shift-"s" generates key symbol "S".
@@ -8705,29 +8728,29 @@
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
           
-            Key symbol of a key event.
+            Key symbol of a key event.
             
           
           
-            Keycode of a key event.
+            Keycode of a key event.
             
           
           
-            Key modifier flags.
+            Key modifier flags.
             
           
           
-            The timeout in milliseconds or -1 to use the default timeout.
+            The timeout in milliseconds or -1 to use the default timeout.
             
           
           
-            A GCancellable or NULL.
+            A GCancellable or NULL.
             
           
           
-            A GAsyncReadyCallback to call when the request is satisfied or NULL if you don't care about the result of the method invocation.
+            A GAsyncReadyCallback to call when the request is satisfied or NULL if you don't care about the result of the method invocation.
             
           
           
-            The data to pass to callback.
+            The data to pass to callback.
             
           
         
@@ -8747,25 +8770,25 @@
       
-        Finishes an operation started with ibus_input_context_process_key_event_async().
+        Finishes an operation started with ibus_input_context_process_key_event_async().
         
-          %TRUE if the key event is processed; %FALSE otherwise or some errors happen and the @error will be set.
+          %TRUE if the key event is processed; %FALSE otherwise or some errors happen and the @error will be set.
           
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
           
-            A GAsyncResult obtained from the GAsyncReadyCallback passed to ibus_input_context_process_key_event_async().
+            A GAsyncResult obtained from the GAsyncReadyCallback passed to ibus_input_context_process_key_event_async().
             
           
         
       
       
-        Activate the property asynchronously.
+        Activate the property asynchronously.
 
 See also: #IBusEngine::property_activate
         
@@ -8773,21 +8796,21 @@
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
           
-            A property name (e.g. "InputMode.WideLatin")
+            A property name (e.g. "InputMode.WideLatin")
             
           
           
-            A status of the property (e.g. PROP_STATE_CHECKED)
+            A status of the property (e.g. PROP_STATE_CHECKED)
             
           
         
       
       
-        Invoked when the IME is reset. An asynchronous IPC will be performed.
+        Invoked when the IME is reset. An asynchronous IPC will be performed.
 
 see_also: #IBusEngine::reset
         
@@ -8795,14 +8818,14 @@
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
         
       
       
-        Set the capabilities flags of client application asynchronously.
+        Set the capabilities flags of client application asynchronously.
 When IBUS_CAP_FOCUS is not set, IBUS_CAP_PREEDIT_TEXT, IBUS_CAP_AUXILIARY_TEXT, IBUS_CAP_LOOKUP_TABLE, and IBUS_CAP_PROPERTY have to be all set.
 The panel component does nothing for an application that doesn't support focus.
 
@@ -8812,18 +8835,18 @@
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
           
-            Capabilities flags of IBusEngine, see #IBusCapabilite
+            Capabilities flags of IBusEngine, see #IBusCapabilite
             
           
         
       
       
-        Set content-type (primary purpose and hints) of the context.  This
+        Set content-type (primary purpose and hints) of the context.  This
 information is particularly useful to implement intelligent
 behavior in engines, such as automatic input-mode switch and text
 prediction.  For example, to restrict input to numbers, the client
@@ -8836,22 +8859,22 @@
         
         
           
-            An #IBusInputContext.
+            An #IBusInputContext.
             
           
           
-            Primary purpose of the input context, as an #IBusInputPurpose.
+            Primary purpose of the input context, as an #IBusInputPurpose.
             
           
           
-            Hints that augment @purpose, as an #IBusInputHints.
+            Hints that augment @purpose, as an #IBusInputHints.
             
           
         
       
       
-        Set the cursor location of IBus input context asynchronously.
+        Set the cursor location of IBus input context asynchronously.
 
 see_also: #IBusEngine::set-cursor-location
         
@@ -8859,40 +8882,40 @@
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
           
-            X coordinate of the cursor.
+            X coordinate of the cursor.
             
           
           
-            Y coordinate of the cursor.
+            Y coordinate of the cursor.
             
           
           
-            Width of the cursor.
+            Width of the cursor.
             
           
           
-            Height of the cursor.
+            Height of the cursor.
             
           
         
       
       
-        Invoked when the IME engine is changed.
+        Invoked when the IME engine is changed.
 An asynchronous IPC will be performed.
         
           
         
         
           
-            An IBusInputContext.
+            An IBusInputContext.
             
           
           
-            A name of the engine.
+            A name of the engine.
             
           
         
@@ -8904,19 +8927,19 @@
         
         
           
-            An #IBusInputContext.
+            An #IBusInputContext.
             
           
           
-            An #IBusText surrounding the current cursor on the application.
+            An #IBusText surrounding the current cursor on the application.
             
           
           
-            Current cursor position in characters in @text.
+            Current cursor position in characters in @text.
             
           
           
-            Anchor position of selection in @text.
+            Anchor position of selection in @text.
             
           
         
@@ -8925,7 +8948,7 @@
         
       
       
-        Emitted when the text is going to be committed.
+        Emitted when the text is going to be committed.
 
 (Note: The text object is floating, and it will be released after the signal.
  If singal handler want to keep the object, the handler should use g_object_ref_sink()
@@ -8935,103 +8958,103 @@
         
         
           
-            Text to be committed.
+            Text to be committed.
             
           
         
       
       
-        Emitted to select next candidate of lookup table.
+        Emitted to select next candidate of lookup table.
         
           
         
       
       
-        Emitted to select previous candidate of lookup table.
+        Emitted to select previous candidate of lookup table.
         
           
         
       
       
-        Emitted to delete surrounding text event from IME to client of IME.
+        Emitted to delete surrounding text event from IME to client of IME.
         
           
         
         
           
-            the character offset from the cursor position of the text to be deleted. A negative value indicates a position before the cursor.
+            the character offset from the cursor position of the text to be deleted. A negative value indicates a position before the cursor.
             
           
           
-            the number of characters to be deleted.
+            the number of characters to be deleted.
             
           
         
       
       
-        Emitted when an IME is disabled.
+        Emitted when an IME is disabled.
         
           
         
       
       
-        Emitted when an IME is enabled.
+        Emitted when an IME is enabled.
         
           
         
       
       
-        Emitted to forward key event from IME to client of IME.
+        Emitted to forward key event from IME to client of IME.
         
           
         
         
           
-            Key symbol of the keyboard event.
+            Key symbol of the keyboard event.
             
           
           
-            Key symbol of the keyboard event.
+            Key symbol of the keyboard event.
             
           
           
-            Key modifier flags.
+            Key modifier flags.
             
           
         
       
       
-        Emitted to hide auxiliary text.
+        Emitted to hide auxiliary text.
         
           
         
       
       
-        Emitted to hide lookup table.
+        Emitted to hide lookup table.
         
           
         
       
       
-        Emitted to hide preedit text.
+        Emitted to hide preedit text.
         
           
         
       
       
-        Emitted to view the next page of lookup table.
+        Emitted to view the next page of lookup table.
         
           
         
       
       
-        Emitted to view the previous page of lookup table.
+        Emitted to view the previous page of lookup table.
         
           
         
       
       
-        Emitted to register the properties in @props.
+        Emitted to register the properties in @props.
 
 (Note: The props object is floating, and it will be released after the signal.
  If singal handler want to keep the object, the handler should use g_object_ref_sink()
@@ -9041,31 +9064,31 @@
         
         
           
-            An IBusPropList that contains properties.
+            An IBusPropList that contains properties.
             
           
         
       
       
-        Emitted to show auxiliary text.
+        Emitted to show auxiliary text.
         
           
         
       
       
-        Emitted to show lookup table.
+        Emitted to show lookup table.
         
           
         
       
       
-        Emitted to show preedit text.
+        Emitted to show preedit text.
         
           
         
       
       
-        Emitted to hide auxilary text.
+        Emitted to hide auxilary text.
 
 (Note: The text object is floating, and it will be released after the signal.
  If singal handler want to keep the object, the handler should use g_object_ref_sink()
@@ -9074,16 +9097,18 @@
           
         
         
-          
+          
+            An auxiliary text
             
           
-          
+          
+            The visibility of @text
             
           
         
       
       
-        Emitted to update lookup table.
+        Emitted to update lookup table.
 
 (Note: The table object is floating, and it will be released after the signal.
  If singal handler want to keep the object, the handler should use g_object_ref_sink()
@@ -9093,17 +9118,17 @@
         
         
           
-            An IBusLookupTable to be updated.
+            An IBusLookupTable to be updated.
             
           
           
-            Whether the table should be visible.
+            Whether the table should be visible.
             
           
         
       
       
-        Emitted to update preedit text.
+        Emitted to update preedit text.
 
 (Note: The text object is floating, and it will be released after the signal.
  If singal handler want to keep the object, the handler should use g_object_ref_sink()
@@ -9113,21 +9138,21 @@
         
         
           
-            Text to be updated.
+            Text to be updated.
             
           
           
-            Cursor position.
+            Cursor position.
             
           
           
-            Whether the update is visible.
+            Whether the update is visible.
             
           
         
       
       
-        Emitted to update the property @prop.
+        Emitted to update the property @prop.
 
 (Note: The prop object is floating, and it will be released after the signal.
  If singal handler want to keep the object, the handler should use g_object_ref_sink()
@@ -9137,7 +9162,7 @@
         
         
           
-            The IBusProperty to be updated.
+            The IBusProperty to be updated.
             
           
         
@@ -9159,69 +9184,69 @@
               glib:type-name="IBusInputHints"
               glib:get-type="ibus_input_hints_get_type"
               c:type="IBusInputHints">
-      Describes hints that might be taken into account by engines.  Note
+      Describes hints that might be taken into account by engines.  Note
 that engines may already tailor their behaviour according to the
 #IBusInputPurpose of the entry.
       
-        No special behaviour suggested
+        No special behaviour suggested
       
       
-        Suggest checking for typos
+        Suggest checking for typos
       
       
-        Suggest not checking for typos
+        Suggest not checking for typos
       
       
-        Suggest word completion
+        Suggest word completion
       
       
-        Suggest to convert all text to lowercase
+        Suggest to convert all text to lowercase
       
       
-        Suggest to capitalize all text
+        Suggest to capitalize all text
       
       
-        Suggest to capitalize the first character of each word
+        Suggest to capitalize the first character of each word
       
       
-        Suggest to capitalize the first word of each sentence
+        Suggest to capitalize the first word of each sentence
       
       
-        Suggest to not show an onscreen keyboard (e.g for a calculator that already has all the keys).
+        Suggest to not show an onscreen keyboard (e.g for a calculator that already has all the keys).
       
     
     
-      Describes primary purpose of the input context.  This information
+      Describes primary purpose of the input context.  This information
 is particularly useful to implement intelligent behavior in
 engines, such as automatic input-mode switch and text prediction.
 
@@ -9231,61 +9256,61 @@
               value="0"
               c:identifier="IBUS_INPUT_PURPOSE_FREE_FORM"
               glib:nick="free-form">
-        Allow any character
+        Allow any character
       
       
-        Allow only alphabetic characters
+        Allow only alphabetic characters
       
       
-        Allow only digits
+        Allow only digits
       
       
-        Edited field expects numbers
+        Edited field expects numbers
       
       
-        Edited field expects phone number
+        Edited field expects phone number
       
       
-        Edited field expects URL
+        Edited field expects URL
       
       
-        Edited field expects email address
+        Edited field expects email address
       
       
-        Edited field expects the name of a person
+        Edited field expects the name of a person
       
       
-        Like @IBUS_INPUT_PURPOSE_FREE_FORM, but characters are hidden
+        Like @IBUS_INPUT_PURPOSE_FREE_FORM, but characters are hidden
       
       
-        Like @IBUS_INPUT_PURPOSE_DIGITS, but characters are hidden
+        Like @IBUS_INPUT_PURPOSE_DIGITS, but characters are hidden
       
     
     
@@ -10984,6 +11009,9 @@
     
       
     
+    
+      
+    
     
       
     
@@ -16037,6 +16065,9 @@
     
       
     
+    
+      
+    
     
       
     
@@ -16322,6 +16353,9 @@
     
       
     
+    
+      
+    
     
       
     
@@ -18059,14 +18093,14 @@
       
     
     
-      Japanese keyboard support.
+      Japanese keyboard support.
       
     
     
       
     
     
-      Japanese keyboard support.
+      Japanese keyboard support.
       
     
     
@@ -18079,7 +18113,7 @@
            glib:type-name="IBusKeymap"
            glib:get-type="ibus_keymap_get_type"
            glib:type-struct="KeymapClass">
-      An IBusKeymap defines the mapping between keyboard scancodes and
+      An IBusKeymap defines the mapping between keyboard scancodes and
 keyboard symbols such as numbers, alphabets, and punctuation marks.
 
 Some input methods assume certain keyboard layout
@@ -18088,58 +18122,60 @@
 These input methods should new an IBusKeymap
 instance and define the keyboard layout.
 Then ibus_keymap_lookup_keysym() can
-convert scancodes back to the key symbols.
+convert scancodes back to the key symbols.
+
+see_also: #IBusComponent, #IBusEngineDesc
       
-        Get an IBusKeymap associated with the giving name.
+        Get an IBusKeymap associated with the giving name.
 
 This function loads the keymap file specified in @name
 in the IBUS_DATA_DIR/keymaps directory.
         
-          An IBusKeymap associated with the giving name; or NULL if failed.
+          An IBusKeymap associated with the giving name; or NULL if failed.
           
         
         
           
-            The keymap file to be loaded, such as 'us', 'jp'.
+            The keymap file to be loaded, such as 'us', 'jp'.
             
           
         
       
-      
-        Get an IBusKeymap associated with the giving name.
+      
+        Get an IBusKeymap associated with the giving name.
 
 This function loads the keymap file specified in @name
 in the IBUS_DATA_DIR/keymaps directory.
-        
-          An IBusKeymap associated with the giving name; or NULL if failed.
+        
+          An IBusKeymap associated with the giving name; or %NULL if failed.
           
         
         
           
-            The keymap file to be loaded, such as 'us', 'jp'.
+            The keymap file to be loaded, such as 'us', 'jp'.
             
           
         
       
       
-        Convert the scancode to keysym, given the keymap.
+        Convert the scancode to keysym, given the keymap.
         
-          Corresponding keysym.
+          Corresponding keysym.
           
         
         
           
-            An IBusKeymap.
+            An IBusKeymap.
             
           
           
-            A scancode to be converted.
+            A scancode to be converted.
             
           
           
-            Modifier flags(such as Ctrl, Shift).
+            Modifier flags(such as Ctrl, Shift).
             
           
         
@@ -18232,56 +18268,59 @@
            glib:type-name="IBusLookupTable"
            glib:get-type="ibus_lookup_table_get_type"
            glib:type-struct="LookupTableClass">
-      An IBusLookuptable stores the candidate words or phrases for users to choose from.
+      An IBusLookuptable stores the candidate words or phrases for users to
+choose from.
 
 Use ibus_engine_update_lookup_table(), ibus_engine_show_lookup_table(),
 and ibus_engine_hide_lookup_table() to update, show and hide the lookup
-table.
+table.
+
+see_also: #IBusEngine
       
-        New a IBusLookupTable.
+        New a IBusLookupTable.
         
-          A newly allocated IBusLookupTable.
+          A newly allocated IBusLookupTable.
           
         
         
           
-            number of candidate shown per page, the max value is 16.
+            number of candidate shown per page, the max value is 16.
             
           
           
-            position index of cursor.
+            position index of cursor.
             
           
           
-            whether the cursor is visible.
+            whether the cursor is visible.
             
           
           
-            TRUE for lookup table wrap around.
+            TRUE for lookup table wrap around.
             
           
         
       
       
-        Append a candidate word/phrase to IBusLookupTable, and increase reference.
+        Append a candidate word/phrase to IBusLookupTable, and increase reference.
         
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
           
-            candidate word/phrase to be appended (in IBusText format).
+            candidate word/phrase to be appended (in IBusText format).
             
           
         
       
       
-        Append a candidate word/phrase to IBusLookupTable, and increase reference.
+        Append a candidate word/phrase to IBusLookupTable, and increase reference.
 This function is needed if the input method select candidate with
 non-numeric keys such as "asdfghjkl;".
         
@@ -18289,263 +18328,263 @@
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
           
-            A candidate label to be appended (in IBusText format).
+            A candidate label to be appended (in IBusText format).
             
           
         
       
       
-        Clear and remove all candidate from an IBusLookupTable.
+        Clear and remove all candidate from an IBusLookupTable.
         
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Go to next candidate of an IBusLookupTable.
+        Go to next candidate of an IBusLookupTable.
 
 It returns FALSE if it is already at the last candidate,
 unless  <code>table&gt;-round==TRUE</code>, where it will go
 to the first candidate.
         
-          TRUE if succeed.
+          TRUE if succeed.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Go to previous candidate of an IBusLookupTable.
+        Go to previous candidate of an IBusLookupTable.
 
 It returns FALSE if it is already at the first candidate,
 unless  <code>table&gt;-round==TRUE</code>, where it will go
 to the last candidate.
         
-          TRUE if succeed.
+          TRUE if succeed.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Return IBusText at the given index. Borrowed reference.
+        Return IBusText at the given index. Borrowed reference.
         
-          IBusText at the given index; NULL if no such IBusText.
+          IBusText at the given index; NULL if no such IBusText.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
           
-            Index in the Lookup table.
+            Index in the Lookup table.
             
           
         
       
       
-        Get the cursor position in current page of IBusLookupTable.
+        Get the cursor position in current page of IBusLookupTable.
         
-          The position of cursor in current page.
+          The position of cursor in current page.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Get the cursor position of IBusLookupTable.
+        Get the cursor position of IBusLookupTable.
         
-          The position of cursor.
+          The position of cursor.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Return IBusText at the given index. Borrowed reference.
+        Return IBusText at the given index. Borrowed reference.
         
-          IBusText at the given index; NULL if no such IBusText.
+          IBusText at the given index; NULL if no such IBusText.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
           
-            Index in the Lookup table.
+            Index in the Lookup table.
             
           
         
       
       
-        Return the number of candidate in the table.
+        Return the number of candidate in the table.
         
-          The number of candidates in the table
+          The number of candidates in the table
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Returns the orientation of the IBusLookupTable.
+        Returns the orientation of the IBusLookupTable.
         
-          The orientation of the @table.
+          The orientation of the @table.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Get the number of candidate shown per page.
+        Get the number of candidate shown per page.
         
-          Page size, i.e., number of candidate shown per page.
+          Page size, i.e., number of candidate shown per page.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Returns whether the cursor of an IBusLookupTable is visible.
+        Returns whether the cursor of an IBusLookupTable is visible.
         
-          Whether the cursor of @table is visible.
+          Whether the cursor of @table is visible.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Returns whether the IBusLookupTable is round.
+        Returns whether the IBusLookupTable is round.
         
-          Whether the @table is round.
+          Whether the @table is round.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Go to next page of an IBusLookupTable.
+        Go to next page of an IBusLookupTable.
 
 It returns FALSE if it is already at the last page,
 unless  <code>table&gt;-round==TRUE</code>, where it will go
 to the first page.
         
-          TRUE if succeed.
+          TRUE if succeed.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Go to previous page of an IBusLookupTable.
+        Go to previous page of an IBusLookupTable.
 
 It returns FALSE if it is already at the first page,
 unless  <code>table&gt;-round==TRUE</code>, where it will go
 to the last page.
         
-          TRUE if succeed.
+          TRUE if succeed.
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
         
       
       
-        Set the cursor position of IBusLookupTable.
+        Set the cursor position of IBusLookupTable.
         
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
           
-            The position of cursor.
+            The position of cursor.
             
           
         
       
       
-        Set whether to make the cursor of an IBusLookupTable visible or not.
+        Set whether to make the cursor of an IBusLookupTable visible or not.
         
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
           
-            Whether to make the cursor of @table visible.
+            Whether to make the cursor of @table visible.
             
           
         
       
       
-        Append a candidate word/phrase to IBusLookupTable, and increase reference.
+        Append a candidate word/phrase to IBusLookupTable, and increase reference.
 This function is needed if the input method select candidate with
 non-numeric keys such as "asdfghjkl;".
         
@@ -18553,65 +18592,65 @@
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
           
-            Intex in the Lookup table.
+            Intex in the Lookup table.
             
           
           
-            A candidate label to be appended (in IBusText format).
+            A candidate label to be appended (in IBusText format).
             
           
         
       
       
-        Set the orientation.
+        Set the orientation.
         
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
           
-            .
+            .
             
           
         
       
       
-        Set the number of candidate shown per page.
+        Set the number of candidate shown per page.
         
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
           
-            number of candidate shown per page.
+            number of candidate shown per page.
             
           
         
       
       
-        Set whether to make the IBusLookupTable round or not.
+        Set whether to make the IBusLookupTable round or not.
         
           
         
         
           
-            An IBusLookupTable.
+            An IBusLookupTable.
             
           
           
-            Whether to make @table round.
+            Whether to make @table round.
             
           
         
@@ -18659,18 +18698,18 @@
       
     
     
-      IBus major version.
+      IBus major version.
       
     
     
       
     
-    
-      IBus micro version.
+    
+      IBus micro version.
       
     
     
-      IBus minor version.
+      IBus minor version.
       
     
     
@@ -18719,133 +18758,133 @@
               glib:type-name="IBusModifierType"
               glib:get-type="ibus_modifier_type_get_type"
               c:type="IBusModifierType">
-      Handles key modifier such as control, shift and alt and release event.
+      Handles key modifier such as control, shift and alt and release event.
 Note that nits 15 - 25 are currently unused, while bit 29 is used internally.
       
-        Shift  is activated.
+        Shift  is activated.
       
       
-        Cap Lock is locked.
+        Cap Lock is locked.
       
       
-        Control key is activated.
+        Control key is activated.
       
       
-        Modifier 1 (Usually Alt_L (0x40),  Alt_R (0x6c),  Meta_L (0xcd)) activated.
+        Modifier 1 (Usually Alt_L (0x40),  Alt_R (0x6c),  Meta_L (0xcd)) activated.
       
       
-        Modifier 2 (Usually Num_Lock (0x4d)) activated.
+        Modifier 2 (Usually Num_Lock (0x4d)) activated.
       
       
-        Modifier 3 activated.
+        Modifier 3 activated.
       
       
-        Modifier 4 (Usually Super_L (0xce),  Hyper_L (0xcf)) activated.
+        Modifier 4 (Usually Super_L (0xce),  Hyper_L (0xcf)) activated.
       
       
-        Modifier 5 (ISO_Level3_Shift (0x5c),  Mode_switch (0xcb)) activated.
+        Modifier 5 (ISO_Level3_Shift (0x5c),  Mode_switch (0xcb)) activated.
       
       
-        Mouse button 1 (left) is activated.
+        Mouse button 1 (left) is activated.
       
       
-        Mouse button 2 (middle) is activated.
+        Mouse button 2 (middle) is activated.
       
       
-        Mouse button 3 (right) is activated.
+        Mouse button 3 (right) is activated.
       
       
-        Mouse button 4 (scroll up) is activated.
+        Mouse button 4 (scroll up) is activated.
       
       
-        Mouse button 5 (scroll down) is activated.
+        Mouse button 5 (scroll down) is activated.
       
       
-        Handled mask indicates the event has been handled by ibus.
+        Handled mask indicates the event has been handled by ibus.
       
       
-        Forward mask indicates the event has been forward from ibus.
+        Forward mask indicates the event has been forward from ibus.
       
       
-        It is an alias of IBUS_FORWARD_MASK.
+        It is an alias of IBUS_FORWARD_MASK.
       
       
-        Super (Usually Win) key is activated.
+        Super (Usually Win) key is activated.
       
       
-        Hyper key is activated.
+        Hyper key is activated.
       
       
-        Meta key is activated.
+        Meta key is activated.
       
       
-        Key is released.
+        Key is released.
       
       
-        Modifier mask for the all the masks above.
+        Modifier mask for the all the masks above.
       
     
     
     
     
-      Japanese keyboard support.
+      Japanese keyboard support.
       
     
     
-      Key for composing characters.
+      Key for composing characters.
 A.k.a. Compose Key.
       
     
@@ -18928,16 +18967,16 @@
            glib:type-name="IBusObject"
            glib:get-type="ibus_object_get_type"
            glib:type-struct="ObjectClass">
-      IBusObject is the base object for all objects in IBus.
+      IBusObject is the base object for all objects in IBus.
       
-        New an IBusObject.
+        New an IBusObject.
         
-          A newly allocated IBusObject
+          A newly allocated IBusObject
           
         
       
       
-        Emit the "destory" signal notifying all reference holders that they should
+        Emit the "destory" signal notifying all reference holders that they should
 release the #IBusObject.
 
 The memory for the object itself won't be deleted until its reference count
@@ -18953,7 +18992,7 @@
         
       
       
-        Emit the "destory" signal notifying all reference holders that they should
+        Emit the "destory" signal notifying all reference holders that they should
 release the #IBusObject.
 
 The memory for the object itself won't be deleted until its reference count
@@ -18964,7 +19003,7 @@
         
         
           
-            an #IBusObject to destroy.
+            an #IBusObject to destroy.
             
           
         
@@ -18979,7 +19018,7 @@
         
       
       
-        Destroy and free an IBusObject
+        Destroy and free an IBusObject
 
 See also:  ibus_object_destroy().
 
@@ -19019,7 +19058,7 @@
         
       
       
-        
+        
           
         
       
@@ -19058,21 +19097,21 @@
            glib:type-name="IBusObservedPath"
            glib:get-type="ibus_observed_path_get_type"
            glib:type-struct="ObservedPathClass">
-      IBusObservedPath provides methods for file path manipulation,
+      IBusObservedPath provides methods for file path manipulation,
 such as monitor modification, directory tree traversal.
       
-        New an IBusObservedPath from an XML node.
+        New an IBusObservedPath from an XML node.
         
-          A newly allocated IBusObservedPath.
+          A newly allocated IBusObservedPath.
           
         
         
           
-            The path string.
+            The path string.
             
           
           
-            Auto-fill the path status.
+            Auto-fill the path status.
             
           
         
@@ -19080,76 +19119,75 @@
       
-        New an IBusObservedPath from an XML node.
+        New an IBusObservedPath from an XML node.
         
-          A newly allocated IBusObservedPath.
+          A newly allocated IBusObservedPath.
           
         
         
           
-            An XML node that contain path.
+            An XML node that contain path.
             
           
           
-            Auto-fill the path status.
+            Auto-fill the path status.
             
           
         
       
       
-        Checks whether the path is modified by comparing the mtime in object and mtime in file system.
+        Checks whether the path is modified by comparing the mtime in object and mtime in file system.
 Returns TRUE if imtime is changed, otherwise FALSE.
         
-          TRUE if mtime is changed; FALSE otherwise.
+          TRUE if mtime is changed; FALSE otherwise.
           
         
         
           
-            An IBusObservedPath.
+            An IBusObservedPath.
             
           
         
       
       
-        Append the observed path to a string with following format:
+        Append the observed path to a string with following format:
 &lt;path mtime="&lt;i&gt;modified time&lt;/i&gt;" &gt;&lt;i&gt;path&lt;/i&gt;&lt;/path&gt;
         
           
         
         
           
-            An IBusObservedPath.
+            An IBusObservedPath.
             
           
           
-            Path is appended to.
+            Path is appended to.
             
           
           
-            number of indent.
+            number of indent.
             
           
         
       
-      
-        Recursively traverse the path and put the files and subdirectory in to a newly allocated
+      
+        Recursively traverse the path and put the files and subdirectory in to
+a newly allocated
 GLists, if the @path is a directory. Otherwise returns NULL.
-        
-          A newly allocate GList which holds content in path; NULL if @path is not directory.
+        
+          A newly allocate GList which holds content in path; NULL if @path is not directory.
           
             
           
         
         
           
-            An IBusObservedPath.
+            An IBusObservedPath.
             
           
           
-            Only looks for subdirs, not files
+            Only looks for subdirs, not files
             
           
         
@@ -19250,24 +19288,24 @@
                  glib:type-name="IBusOrientation"
                  glib:get-type="ibus_orientation_get_type"
                  c:type="IBusOrientation">
-      Orientation of UI.
+      Orientation of UI.
       
-        Horizontal orientation.
+        Horizontal orientation.
       
       
-        Vertival orientation.
+        Vertival orientation.
       
       
-        Use ibus global orientation setup.
+        Use ibus global orientation setup.
       
     
     
@@ -19292,37 +19330,37 @@
     
-      D-Bus path for IBus config.
+      D-Bus path for IBus config.
       
     
     
-      D-Bus path for IBus factory.
+      D-Bus path for IBus factory.
       
     
     
-      D-Bus path for IBus
+      D-Bus path for IBus
       
     
     
-      Template of D-Bus path for IBus input context.
+      Template of D-Bus path for IBus input context.
       
     
     
-      D-Bus path for IBus notifications.
+      D-Bus path for IBus notifications.
       
     
     
-      D-Bus path for IBus panel.
+      D-Bus path for IBus panel.
       
     
     
@@ -19341,17 +19379,17 @@
            glib:type-name="IBusPanelService"
            glib:get-type="ibus_panel_service_get_type"
            glib:type-struct="PanelServiceClass">
-      An IBusPanelService is a base class for UI services.
+      An IBusPanelService is a base class for UI services.
 Developers can "extend" this class for panel UI development.
       
-        New an IBusPanelService from an GDBusConnection.
+        New an IBusPanelService from an GDBusConnection.
         
-          A newly allocated IBusPanelService.
+          A newly allocated IBusPanelService.
           
         
         
           
-            An GDBusConnection.
+            An GDBusConnection.
             
           
         
@@ -19646,136 +19684,136 @@
       
       
-        Notify that a candidate is clicked
+        Notify that a candidate is clicked
 by sending a "CandidateClicked" to IBus service.
         
           
         
         
           
-            An IBusPanelService
+            An IBusPanelService
             
           
           
-            Index in the Lookup table
+            Index in the Lookup table
             
           
           
-            GdkEventButton::button (1: left button, etc.)
+            GdkEventButton::button (1: left button, etc.)
             
           
           
-            GdkEventButton::state (key modifier flags)
+            GdkEventButton::state (key modifier flags)
             
           
         
       
       
-        Notify that the cursor is down
+        Notify that the cursor is down
 by sending a "CursorDown" to IBus service.
         
           
         
         
           
-            An IBusPanelService
+            An IBusPanelService
             
           
         
       
       
-        Notify that the cursor is up
+        Notify that the cursor is up
 by sending a "CursorUp" to IBus service.
         
           
         
         
           
-            An IBusPanelService
+            An IBusPanelService
             
           
         
       
       
-        Notify that the page is down
+        Notify that the page is down
 by sending a "PageDown" to IBus service.
         
           
         
         
           
-            An IBusPanelService
+            An IBusPanelService
             
           
         
       
       
-        Notify that the page is up
+        Notify that the page is up
 by sending a "PageUp" to IBus service.
         
           
         
         
           
-            An IBusPanelService
+            An IBusPanelService
             
           
         
       
       
-        Notify that a property is active
+        Notify that a property is active
 by sending a "PropertyActivate" message to IBus service.
         
           
         
         
           
-            An IBusPanelService
+            An IBusPanelService
             
           
           
-            A property name
+            A property name
             
           
           
-            State of the property
+            State of the property
             
           
         
       
       
-        Notify that a property is hidden
+        Notify that a property is hidden
 by sending a "ValueChanged" message to IBus service.
         
           
         
         
           
-            An IBusPanelService
+            An IBusPanelService
             
           
           
-            A property name
+            A property name
             
           
         
       
       
-        Notify that a property is shown
+        Notify that a property is shown
 by sending a "ValueChanged" message to IBus service.
         
           
         
         
           
-            An IBusPanelService
+            An IBusPanelService
             
           
           
-            A property name
+            A property name
             
           
         
@@ -19784,7 +19822,7 @@
         
       
       
-        Emitted when the client application get the cursor-down-lookup-table.
+        Emitted when the client application get the cursor-down-lookup-table.
 Implement the member function cursor_down_lookup_table() in extended
 class to receive this signal.
 
@@ -19795,7 +19833,7 @@
         
       
       
-        Emitted when the client application get the cursor-up-lookup-table.
+        Emitted when the client application get the cursor-up-lookup-table.
 Implement the member function cursor_up_lookup_table() in extended
 class to receive this signal.
 
@@ -19806,7 +19844,7 @@
         
       
       
-        Emitted when the client application destroys.
+        Emitted when the client application destroys.
 Implement the member function destroy_context() in extended class to
 receive this signal.
 
@@ -19816,13 +19854,14 @@
           
         
         
-          
+          
+            Object path of InputContext.
             
           
         
       
       
-        Emitted when the client application get the focus-in.
+        Emitted when the client application get the focus-in.
 Implement the member function focus_in() in extended class to receive
 this signal.
 
@@ -19832,13 +19871,14 @@
           
         
         
-          
+          
+            Object path of InputContext.
             
           
         
       
       
-        Emitted when the client application get the focus-out.
+        Emitted when the client application get the focus-out.
 Implement the member function focus_out() in extended class to receive
 this signal.
 
@@ -19848,13 +19888,14 @@
           
         
         
-          
+          
+            Object path of InputContext.
             
           
         
       
       
-        Emitted when the client application get the hide-auxiliary-text.
+        Emitted when the client application get the hide-auxiliary-text.
 Implement the member function hide_auxiliary_text() in extended class
 to receive this signal.
 
@@ -19865,7 +19906,7 @@
         
       
       
-        Emitted when the client application get the hide-language-bar.
+        Emitted when the client application get the hide-language-bar.
 Implement the member function hide_language_bar() in extended class to
 receive this signal.
 
@@ -19876,7 +19917,7 @@
         
       
       
-        Emitted when the client application get the hide-lookup-table.
+        Emitted when the client application get the hide-lookup-table.
 Implement the member function hide_lookup_table() in extended class to
 receive this signal.
 
@@ -19887,7 +19928,7 @@
         
       
       
-        Emitted when the client application get the hide-preedit-text.
+        Emitted when the client application get the hide-preedit-text.
 Implement the member function hide_preedit_text() in extended class to
 receive this signal.
 
@@ -19898,7 +19939,7 @@
         
       
       
-        Emitted when the client application get the page-down-lookup-table.
+        Emitted when the client application get the page-down-lookup-table.
 Implement the member function page_down_lookup_table() in extended
 class to receive this signal.
 
@@ -19909,7 +19950,7 @@
         
       
       
-        Emitted when the client application get the page-up-lookup-table.
+        Emitted when the client application get the page-up-lookup-table.
 Implement the member function page_up_lookup_table() in extended class
 to receive this signal.
 
@@ -19920,7 +19961,7 @@
         
       
       
-        Emitted when the client application get the register-properties.
+        Emitted when the client application get the register-properties.
 Implement the member function register_properties() in extended class
 to receive this signal.
 
@@ -19930,13 +19971,14 @@
           
         
         
-          
+          
+            An IBusPropList that contains properties.
             
           
         
       
       
-        Emitted when the client application get the reset.
+        Emitted when the client application get the reset.
 Implement the member function reset() in extended class to receive this
 signal.
 
@@ -19947,7 +19989,7 @@
         
       
       
-        Emitted when the client application get the set-cursor-location.
+        Emitted when the client application get the set-cursor-location.
 Implement the member function set_cursor_location() in extended class
 to receive this signal.
 
@@ -19957,22 +19999,26 @@
           
         
         
-          
+          
+            X coordinate of the cursor.
             
           
-          
+          
+            Y coordinate of the cursor.
             
           
-          
+          
+            Width of the cursor.
             
           
-          
+          
+            Height of the cursor.
             
           
         
       
       
-        Emitted when the client application get the show-auxiliary-text.
+        Emitted when the client application get the show-auxiliary-text.
 Implement the member function show_auxiliary_text() in extended class
 to receive this signal.
 
@@ -19983,7 +20029,7 @@
         
       
       
-        Emitted when the client application get the show-language-bar.
+        Emitted when the client application get the show-language-bar.
 Implement the member function show_language_bar() in extended class to
 receive this signal.
 
@@ -19994,7 +20040,7 @@
         
       
       
-        Emitted when the client application get the show-lookup-table.
+        Emitted when the client application get the show-lookup-table.
 Implement the member function show_lookup_table() in extended class to
 receive this signal.
 
@@ -20005,7 +20051,7 @@
         
       
       
-        Emitted when the client application get the show-preedit-text.
+        Emitted when the client application get the show-preedit-text.
 Implement the member function show_preedit_text() in extended class to
 receive this signal.
 
@@ -20016,7 +20062,7 @@
         
       
       
-        Emitted when the client application get the start-setup.
+        Emitted when the client application get the start-setup.
 Implement the member function start_setup() in extended class to
 receive this signal.
 
@@ -20027,7 +20073,7 @@
         
       
       
-        Emitted when the client application get the state-changed.
+        Emitted when the client application get the state-changed.
 Implement the member function state_changed() in extended class to
 receive this signal.
 
@@ -20038,7 +20084,7 @@
         
       
       
-        Emitted when the client application get the update-auxiliary-text.
+        Emitted when the client application get the update-auxiliary-text.
 Implement the member function update_auxiliary_text() in extended class
 to receive this signal.
 
@@ -20048,16 +20094,18 @@
           
         
         
-          
+          
+            A preedit text to be updated.
             
           
-          
+          
+            Whether the update is visible.
             
           
         
       
       
-        Emitted when the client application get the update-lookup-table.
+        Emitted when the client application get the update-lookup-table.
 Implement the member function update_lookup_table() in extended class
 to receive this signal.
 
@@ -20067,16 +20115,18 @@
           
         
         
-          
+          
+            A lookup table to be updated.
             
           
-          
+          
+            Whether the update is visible.
             
           
         
       
       
-        Emitted when the client application get the update-preedit-text.
+        Emitted when the client application get the update-preedit-text.
 Implement the member function update_preedit_text() in extended class
 to receive this signal.
 
@@ -20086,19 +20136,22 @@
           
         
         
-          
+          
+            A preedit text to be updated.
             
           
-          
+          
+            The cursor position of the text.
             
           
-          
+          
+            Whether the update is visible.
             
           
         
       
       
-        Emitted when the client application get the update-property.
+        Emitted when the client application get the update-property.
 Implement the member function update_property() in extended class to
 receive this signal.
 
@@ -20108,7 +20161,8 @@
           
         
         
-          
+          
+            The IBusProperty to be updated.
             
           
         
@@ -20602,18 +20656,18 @@
                  glib:type-name="IBusPreeditFocusMode"
                  glib:get-type="ibus_preedit_focus_mode_get_type"
                  c:type="IBusPreeditFocusMode">
-      Pre-edit commit mode when the focus is lost.
+      Pre-edit commit mode when the focus is lost.
       
-        pre-edit text is cleared.
+        pre-edit text is cleared.
       
       
-        pre-edit text is committed.
+        pre-edit text is committed.
       
     
     
+      See_also: #IBusProperty, #IBusEngine
       
-        New a IBusPropList.
+        New a IBusPropList.
         
-          A newly allocated IBusPropList.
+          A newly allocated IBusPropList.
           
         
       
       
-        Append an IBusProperty to an IBusPropList, and increase reference.
+        Append an IBusProperty to an IBusPropList, and increase reference.
         
           
         
         
           
-            An IBusPropList.
+            An IBusPropList.
             
           
           
-            IBusProperty to be append to @prop_list.
+            IBusProperty to be append to @prop_list.
             
           
         
       
       
-        Returns IBusProperty at given index. Borrowed reference.
+        Returns IBusProperty at given index. Borrowed reference.
         
-          IBusProperty at given index, NULL if no such IBusProperty.
+          IBusProperty at given index, NULL if no such IBusProperty.
           
         
         
           
-            An IBusPropList.
+            An IBusPropList.
             
           
           
-            Index of an IBusPropList.
+            Index of an IBusPropList.
             
           
         
       
       
-        Update an IBusProperty in IBusPropList.
+        Update an IBusProperty in IBusPropList.
         
-          TRUE if succeeded, FALSE otherwise.
+          TRUE if succeeded, FALSE otherwise.
           
         
         
           
-            An IBusPropList.
+            An IBusPropList.
             
           
           
-            IBusProperty to be update.
+            IBusProperty to be update.
             
           
         
@@ -20717,7 +20772,7 @@
                  glib:type-name="IBusPropState"
                  glib:get-type="ibus_prop_state_get_type"
                  c:type="IBusPropState">
-      State of #IBusProperty. The actual effect depends on #IBusPropType of the
+      State of #IBusProperty. The actual effect depends on #IBusPropType of the
 IBusProperty.
 
 <variablelist>
@@ -20735,55 +20790,55 @@
               value="0"
               c:identifier="PROP_STATE_UNCHECKED"
               glib:nick="unchecked">
-        Property option is unchecked.
+        Property option is unchecked.
       
       
-        Property option is checked.
+        Property option is checked.
       
       
-        The state is inconsistent with the associated IME property.
+        The state is inconsistent with the associated IME property.
       
     
     
-      Type enumeration of IBusProperty.
+      Type enumeration of IBusProperty.
       
-        Property is shown as normal text.
+        Property is shown as normal text.
       
       
-        Property is shown as a toggle button.
+        Property is shown as a toggle button.
       
       
-        Property is shown as a radio selection option.
+        Property is shown as a radio selection option.
       
       
-        Property is shown as a menu, usually imply it has sub menu items.
+        Property is shown as a menu, usually imply it has sub menu items.
       
       
-        A separator for menu.
+        A separator for menu.
       
     
     
-      An IBusProperty is an UI component like a button or a menu item
+      An IBusProperty is an UI component like a button or a menu item
 which shows the status of corresponding input method engine property.
 End user can operate and see the current status of IME through these components.
 For example, ibus-chewing users change the English/Chinese input mode by
@@ -20802,46 +20857,46 @@
 
 see_also: #IBusPropList, #IBusEngine
       
-        New a #IBusProperty.
+        New a #IBusProperty.
         
-          A newly allocated #IBusProperty.
+          A newly allocated #IBusProperty.
           
         
         
           
-            Unique Identity for the #IBusProperty.
+            Unique Identity for the #IBusProperty.
             
           
           
-            #IBusPropType of #IBusProperty.
+            #IBusPropType of #IBusProperty.
             
           
           
-            Text shown in UI.
+            Text shown in UI.
             
           
           
-            Icon file for the #IBusProperty.
+            Icon file for the #IBusProperty.
             
           
           
-            Message shown if mouse hovered the  #IBusProperty.
+            Message shown if mouse hovered the  #IBusProperty.
             
           
           
-            Whether the #IBusProperty is sensitive to keyboard and mouse event.
+            Whether the #IBusProperty is sensitive to keyboard and mouse event.
             
           
           
-            Whether the #IBusProperty is visible.
+            Whether the #IBusProperty is visible.
             
           
           
-            IBusPropState of #IBusProperty.
+            IBusPropState of #IBusProperty.
             
           
           
-            #IBusPropList that contains sub IBusProperties.
+            #IBusPropList that contains sub IBusProperties.
             
           
         
@@ -20849,7 +20904,7 @@
       
-        New a #IBusProperty.
+        New a #IBusProperty.
 ibus_property_new_varargs() supports the va_list format.
 name property is required. e.g.
 ibus_property_new_varargs("key", "TypingMode", "type", PROP_TYPE_MENU, NULL)
@@ -20858,7 +20913,7 @@
         
         
           
-            Name of the first property.
+            Name of the first property.
             
           
           
@@ -20868,40 +20923,40 @@
         
       
       
-        Get the icon of #IBusProperty.
+        Get the icon of #IBusProperty.
         
-          the icon of #IBusProperty. Should not be freed.
+          the icon of #IBusProperty. Should not be freed.
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
         
       
       
-        Get the key of #IBusProperty.
+        Get the key of #IBusProperty.
         
-          the key of #IBusProperty. Should not be freed.
+          the key of #IBusProperty. Should not be freed.
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
         
       
       
-        Get the label of #IBusProperty.
+        Get the label of #IBusProperty.
         
-          the label of #IBusProperty. Should not be freed.
+          the label of #IBusProperty. Should not be freed.
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
         
@@ -20917,226 +20972,226 @@
         
       
       
-        Get the sensitive of #IBusProperty.
+        Get the sensitive of #IBusProperty.
         
-          the sensitive of #IBusProperty.
+          the sensitive of #IBusProperty.
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
         
       
       
-        Get the state of #IBusProperty.
+        Get the state of #IBusProperty.
         
-          the state of #IBusProperty.
+          the state of #IBusProperty.
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
         
       
       
-        Get the IBusPropList of #IBusProperty.
+        Get the IBusPropList of #IBusProperty.
         
-          the IBusPropList of #IBusProperty. Should not be freed.
+          the IBusPropList of #IBusProperty. Should not be freed.
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
         
       
       
-        Get the symbol of #IBusProperty.
+        Get the symbol of #IBusProperty.
         
-          the symbol of #IBusProperty. Should not be freed.
+          the symbol of #IBusProperty. Should not be freed.
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
         
       
       
-        Get the tooltip of #IBusProperty.
+        Get the tooltip of #IBusProperty.
         
-          the tooltip of #IBusProperty. Should not be freed.
+          the tooltip of #IBusProperty. Should not be freed.
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
         
       
       
-        Get the visible of #IBusProperty.
+        Get the visible of #IBusProperty.
         
-          the visible of #IBusProperty.
+          the visible of #IBusProperty.
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
         
       
       
-        Set the icon of #IBusProperty.
+        Set the icon of #IBusProperty.
         
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
           
-            Icon shown in UI. It could be a full path of an icon file or an icon name.
+            Icon shown in UI. It could be a full path of an icon file or an icon name.
             
           
         
       
       
-        Set the label of #IBusProperty.
+        Set the label of #IBusProperty.
         
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
           
-            Text shown in UI.
+            Text shown in UI.
             
           
         
       
       
-        Set whether the #IBusProperty is sensitive.
+        Set whether the #IBusProperty is sensitive.
         
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
           
-            Whether the #IBusProperty is sensitive.
+            Whether the #IBusProperty is sensitive.
             
           
         
       
       
-        Set the state of the #IBusProperty.
+        Set the state of the #IBusProperty.
         
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
           
-            The state of the #IBusProperty.
+            The state of the #IBusProperty.
             
           
         
       
       
-        Set the sub IBusProperties.
+        Set the sub IBusProperties.
         
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
           
-            #IBusPropList that contains sub IBusProperties.
+            #IBusPropList that contains sub IBusProperties.
             
           
         
       
       
-        Set the symbol of #IBusProperty.
+        Set the symbol of #IBusProperty.
         
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
           
-            Text shown in UI.
+            Text shown in UI.
             
           
         
       
       
-        Set the tooltip of #IBusProperty.
+        Set the tooltip of #IBusProperty.
         
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
           
-            Text of the tooltip.
+            Text of the tooltip.
             
           
         
       
       
-        Set whether the #IBusProperty is visible.
+        Set whether the #IBusProperty is visible.
         
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
           
-            Whether the #IBusProperty is visible.
+            Whether the #IBusProperty is visible.
             
           
         
       
       
-        Update the content of an #IBusProperty.
+        Update the content of an #IBusProperty.
 #IBusProperty @prop_update can either be sub-property of @prop,
 or holds new values for @prop.
         
-          TRUE for update suceeded; FALSE otherwise.
+          TRUE for update suceeded; FALSE otherwise.
           
         
         
           
-            An #IBusProperty.
+            An #IBusProperty.
             
           
           
-            #IBusPropList that contains sub IBusProperties.
+            #IBusPropList that contains sub IBusProperties.
             
           
         
@@ -21211,17 +21266,20 @@
            glib:type-name="IBusProxy"
            glib:get-type="ibus_proxy_get_type"
            glib:type-struct="ProxyClass">
-      An IBusProxy is the base of all proxy objects,
-which communicate the corresponding #IBusServices on the other end of IBusConnection.
-For example, IBus clients (such as editors, web browsers) invoke the proxy object,
-IBusInputContext to communicate with the InputContext service of the ibus-daemon.
+      An IBusProxy is the base of all proxy objects,
+which communicate the corresponding #IBusServices on the other end of
+IBusConnection.
+For example, IBus clients (such as editors, web browsers) invoke the proxy
+object,
+IBusInputContext to communicate with the InputContext service of the
+ibus-daemon.
 
 Almost all services have corresponding proxies, except very simple services.
       
       
       
       
-        Dispose the proxy object. If the dbus connection is alive and the own variable above
+        Dispose the proxy object. If the dbus connection is alive and the own variable above
 is TRUE (which is the default), org.freedesktop.IBus.Service.Destroy method will be
 called. Note that "destroy" signal might be emitted when ibus_proxy_destroy is called
 or the underlying dbus connection for the proxy is terminated. In the callback of the
@@ -21236,7 +21294,7 @@
         
       
       
-        Dispose the proxy object. If the dbus connection is alive and the own variable above
+        Dispose the proxy object. If the dbus connection is alive and the own variable above
 is TRUE (which is the default), org.freedesktop.IBus.Service.Destroy method will be
 called. Note that "destroy" signal might be emitted when ibus_proxy_destroy is called
 or the underlying dbus connection for the proxy is terminated. In the callback of the
@@ -21260,7 +21318,7 @@
         
       
       
-        Destroy and free an IBusProxy
+        Destroy and free an IBusProxy
 
 See also:  ibus_proxy_destroy().
 
@@ -21355,7 +21413,7 @@
       
     
     
-      Rectangle definition.
+      Rectangle definition.
       
         
       
@@ -21379,64 +21437,64 @@
            glib:type-name="IBusRegistry"
            glib:get-type="ibus_registry_get_type"
            glib:type-struct="RegistryClass">
-      An #IBusRegistry loads IBus component files and generates the cache files.
+      An #IBusRegistry loads IBus component files and generates the cache files.
 
 see_also: #IBusComponent
       
-        New a #IBusRegistry
+        New a #IBusRegistry
         
-          A newly allocated #IBusRegistry.
+          A newly allocated #IBusRegistry.
           
         
       
       
-        Check if the registry is updated.
+        Check if the registry is updated.
         
-          %TRUE if mtime is changed; %FALSE otherwise.
+          %TRUE if mtime is changed; %FALSE otherwise.
           
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
         
       
       
-        List components.
+        List components.
         
-          a list of #IBusComponent objects. The caller has to call g_list_free() for the returned list.
+          a list of #IBusComponent objects. The caller has to call g_list_free() for the returned list.
           
             
           
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
         
       
       
-        List observed paths.
+        List observed paths.
         
-          a list of #IBusObservedPath objects. The caller has to call g_list_free() for the returned list.
+          a list of #IBusObservedPath objects. The caller has to call g_list_free() for the returned list.
           
             
           
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
         
       
       
-        Read all XML files in a IBus component directory (typically
+        Read all XML files in a IBus component directory (typically
 /usr/share/ibus/component/ *.xml) and update the registry object.
 IBUS_COMPONENT_PATH environment valuable is also available for
 the custom component directories, whose delimiter is ':'.
@@ -21445,48 +21503,48 @@
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
         
       
       
-        Load the user or system registry cache.
+        Load the user or system registry cache.
         
-          %TRUE if the cache exists and is loaded successfully, %FALSE otherwise.
+          %TRUE if the cache exists and is loaded successfully, %FALSE otherwise.
           
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
           
-            %TRUE if the registry cache is loaded in the user directory.
+            %TRUE if the registry cache is loaded in the user directory.
             
           
         
       
       
-        Load the registry cache @filename.
+        Load the registry cache @filename.
         
-          %TRUE if the cache exists and is loaded successfully, %FALSE otherwise.
+          %TRUE if the cache exists and is loaded successfully, %FALSE otherwise.
           
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
           
-            The file path of the registry cache
+            The file path of the registry cache
             
           
         
       
       
-        Read all XML files in @dirname, create a #IBusComponent object for each file,
+        Read all XML files in @dirname, create a #IBusComponent object for each file,
 and add the component objects to the registry.
 If @dirname is "/usr/share/ibus/component", this API and
 ibus_registry_load() are same.
@@ -21495,80 +21553,80 @@
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
           
-            IBus component directory which includes XML files.
+            IBus component directory which includes XML files.
             
           
         
       
       
-        Output #IBusRegistry as an XML-formatted string.
+        Output #IBusRegistry as an XML-formatted string.
 The output string can be then shown on the screen or written to file.
         
           
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
           
-            GString that holds the result.
+            GString that holds the result.
             
           
           
-            level of indent.
+            level of indent.
             
           
         
       
       
-        Save the registry in a user directory or system directory.
+        Save the registry in a user directory or system directory.
         
-          %TRUE if the cache is saved successfully, %FALSE otherwise.
+          %TRUE if the cache is saved successfully, %FALSE otherwise.
           
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
           
-            %TRUE if the registry cache is saved in the user directory.
+            %TRUE if the registry cache is saved in the user directory.
             
           
         
       
       
-        Save the registry cache @filename.
+        Save the registry cache @filename.
         
-          %TRUE if the cache is saved successfully, %FALSE otherwise.
+          %TRUE if the cache is saved successfully, %FALSE otherwise.
           
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
           
-            The file path of the registry cache
+            The file path of the registry cache
             
           
         
       
       
-        Start to monitor observed paths.
+        Start to monitor observed paths.
         
           
         
         
           
-            An #IBusRegistry.
+            An #IBusRegistry.
             
           
         
@@ -21580,7 +21638,7 @@
         
       
       
-        Emitted when any observed paths are changed.
+        Emitted when any observed paths are changed.
 A method is not associated in this class. the "changed"
 signal would be handled in other classes.
 
@@ -21611,7 +21669,7 @@
       
     
     
-      Japanese keyboard support.
+      Japanese keyboard support.
       
     
     
@@ -21626,25 +21684,25 @@
     
-      Address of IBus config service.
+      Address of IBus config service.
       
     
     
-      Address of IBus service.
+      Address of IBus service.
       
     
     
-      Address of IBus notification service.
+      Address of IBus notification service.
       
     
     
-      Address of IBus panel service.
+      Address of IBus panel service.
       
     
     
@@ -21711,7 +21769,7 @@
            glib:type-name="IBusSerializable"
            glib:get-type="ibus_serializable_get_type"
            glib:type-struct="SerializableClass">
-      An #IBusSerializable is an IBus object which can be serialized, that is,
+      An #IBusSerializable is an IBus object which can be serialized, that is,
 to be to and from a #GVariant.
 
 This class is to be extended by other class that requires serialization.
@@ -21730,25 +21788,25 @@
 See IBusSerializableSerializeFunc(), IBusSerializableDeserializeFunc(), IBusSerializableCopyFunc()
 for function prototype.
       
-        Creates a new instance of an #IBusSerializable.
+        Creates a new instance of an #IBusSerializable.
         
-          a new instance of #IBusSerializable.
+          a new instance of #IBusSerializable.
           
         
       
       
-        Deserialize a #GVariant to an #IBusSerializable/
+        Deserialize a #GVariant to an #IBusSerializable/
 The deserialize method should be implemented in extended class.
 
 See also: IBusSerializableCopyFunc().
         
-          The deserialized #IBusSerializable.
+          The deserialized #IBusSerializable.
           
         
         
           
-            A #GVariant.
+            A #GVariant.
             
           
         
@@ -21793,77 +21851,77 @@
         
       
       
-        Clone an #IBusSerializable.
+        Clone an #IBusSerializable.
 The copy method should be implemented in extended class.
 
 See also: IBusSerializableCopyFunc().
         
-          A newly allocated clone object; or %NULL if @object is not serializable.
+          A newly allocated clone object; or %NULL if @object is not serializable.
           
         
         
           
-            An #IBusSerializable.
+            An #IBusSerializable.
             
           
         
       
       
-        Get a value from attachment of an #IBusSerializable.
+        Get a value from attachment of an #IBusSerializable.
 See also: ibus_serializable_set_attachment().
         
-          The attached value; or %NULL if fail to retrieve the value.
+          The attached value; or %NULL if fail to retrieve the value.
           
         
         
           
-            An #IBusSerializable.
+            An #IBusSerializable.
             
           
           
-            String formatted key for indexing value.
+            String formatted key for indexing value.
             
           
         
       
       
-        Remove a value from attachment of an #IBusSerializable.
+        Remove a value from attachment of an #IBusSerializable.
 See also: ibus_serializable_remove_attachment().
         
           
         
         
           
-            An #IBusSerializable.
+            An #IBusSerializable.
             
           
           
-            String formatted key for indexing value.
+            String formatted key for indexing value.
             
           
         
       
       
-        Serialize an #IBusSerializable to a #GVariant.
+        Serialize an #IBusSerializable to a #GVariant.
 The serialize method should be implemented in extended class.
 
 See also: IBusSerializableCopyFunc().
         
-          A #GVariant.
+          A #GVariant.
           
         
         
           
-            An #IBusSerializable.
+            An #IBusSerializable.
             
           
         
       
       
-        Attach a value to an #IBusSerializable. If the value is floating,
+        Attach a value to an #IBusSerializable. If the value is floating,
 the serializable will take the ownership.
 
 See also: ibus_serializable_set_attachment().
@@ -21872,15 +21930,15 @@
         
         
           
-            An #IBusSerializable.
+            An #IBusSerializable.
             
           
           
-            String formatted key for indexing value.
+            String formatted key for indexing value.
             
           
           
-            Value to be attached or %NULL to remove any prevoius value.
+            Value to be attached or %NULL to remove any prevoius value.
             
           
         
@@ -21950,41 +22008,41 @@
       
     
     
-      Prototype of copy function.
+      Prototype of copy function.
 Copy function copy from source #IBusSerializable to the destination one.
 Returns a gboolean value which indicates whether the copying is success.
       
-        %TRUE if succeed; %FALSE otherwise.
+        %TRUE if succeed; %FALSE otherwise.
         
       
       
         
-          The destination #IBusSerializable.
+          The destination #IBusSerializable.
           
         
         
-          A source #IBusSerializable.
+          A source #IBusSerializable.
           
         
       
     
     
-      Prototype of deserialize function.
+      Prototype of deserialize function.
 Deserialize function convert a #GVariant to #IBusSerializable.
 Returns an integer value which indicates how many values in
 the variant(tuple) are consumed.
       
-        The number of values in the variant(tuple) are consumed.
+        The number of values in the variant(tuple) are consumed.
         
       
       
         
-          An #IBusSerializable.
+          An #IBusSerializable.
           
         
         
-          A #GVariant contains a tuple.
+          A #GVariant contains a tuple.
           
         
       
@@ -21995,21 +22053,21 @@
     
     
-      Prototype of serialize function.
+      Prototype of serialize function.
 Serialize function convert an #IBusSerializable to #GVariantBuilder.
 Returns a gboolean value which indicates whether the conversion is success.
 Return %TRUE if succeed.
       
-        %TRUE if succeed; %FALSE otherwise.
+        %TRUE if succeed; %FALSE otherwise.
         
       
       
         
-          An #IBusSerializable.
+          An #IBusSerializable.
           
         
         
-          A #GVariantBuilder.
+          A #GVariantBuilder.
           
         
       
@@ -22021,11 +22079,11 @@
            glib:type-name="IBusService"
            glib:get-type="ibus_service_get_type"
            glib:type-struct="ServiceClass">
-      An IBusService is a base class for services.
+      An IBusService is a base class for services.
       
-        New an IBusService.
+        New an IBusService.
         
-          A newly allocated IBusService
+          A newly allocated IBusService
           
         
         
@@ -22033,7 +22091,7 @@
             
           
           
-            Object path.
+            Object path.
             
           
         
@@ -22148,61 +22206,61 @@
         
       
       
-        Returns a connections.
+        Returns a connections.
         
-          A #GDBusConnection of an #IBusService instance.
+          A #GDBusConnection of an #IBusService instance.
           
         
         
           
-            An IBusService.
+            An IBusService.
             
           
         
       
       
-        Returns the object path of an IBusService.
+        Returns the object path of an IBusService.
         
-          The object path of @service
+          The object path of @service
           
         
         
           
-            An IBusService.
+            An IBusService.
             
           
         
       
       
-        Registers service to a connection.
+        Registers service to a connection.
         
-          TRUE if the service was registered, FALSE otherwise.
+          TRUE if the service was registered, FALSE otherwise.
           
         
         
           
-            An IBusService.
+            An IBusService.
             
           
           
-            A GDBusConnection the service will be registered to.
+            A GDBusConnection the service will be registered to.
             
           
         
       
       
-        Unregisters service from a connection.
+        Unregisters service from a connection.
         
           
         
         
           
-            An IBusService.
+            An IBusService.
             
           
           
-            A GDBusConnection the service was registered with.
+            A GDBusConnection the service was registered with.
             
           
         
@@ -22211,14 +22269,14 @@
                 writable="1"
                 construct-only="1"
                 transfer-ownership="none">
-        The connection of service object.
+        The connection of service object.
         
       
       
-        The path of service object.
+        The path of service object.
         
       
       
@@ -22337,17 +22395,17 @@
       
       
-        Set the interface introspection information with the service class.
+        Set the interface introspection information with the service class.
         
           
         
         
           
-            An IBusServiceClass.
+            An IBusServiceClass.
             
           
           
-            The introspection xml data.
+            The introspection xml data.
             
           
         
@@ -22418,23 +22476,25 @@
            glib:type-name="IBusText"
            glib:get-type="ibus_text_get_type"
            glib:type-struct="TextClass">
-      An IBusText is the main text object in IBus.
+      An IBusText is the main text object in IBus.
 The text is decorated according to associated IBusAttribute,
 e.g. the foreground/background color, underline, and
-applied scope.
+applied scope.
+
+see_also: #IBusAttribute
       
-        New an IBusText from a printf expression.
+        New an IBusText from a printf expression.
 
 The result of printf expression is stored in the new IBusText instance.
         
-          A newly allocated IBusText.
+          A newly allocated IBusText.
           
         
         
           
-            printf format string.
+            printf format string.
             
           
           
@@ -22446,104 +22506,104 @@
       
-        New an IBusText from a static string.
+        New an IBusText from a static string.
 
 Since @str is a static string which won't be freed.
 This function will NOT duplicate @str.
         
-          A newly allocated IBusText.
+          A newly allocated IBusText.
           
         
         
           
-            An text string to be set.
+            An text string to be set.
             
           
         
       
       
-        New an IBusText from a string.
+        New an IBusText from a string.
 
 @str will be duplicated in IBusText, so feel free to free @str after this function.
         
-          A newly allocated IBusText.
+          A newly allocated IBusText.
           
         
         
           
-            An text string to be set.
+            An text string to be set.
             
           
         
       
       
-        New an IBusText from an UCS-4 encoded string.
+        New an IBusText from an UCS-4 encoded string.
 
 @str will be duplicated in IBusText, so feel free to free @str after this function.
         
-          A newly allocated IBusText.
+          A newly allocated IBusText.
           
         
         
           
-            An text string to be set.
+            An text string to be set.
             
           
         
       
       
-        New an IBusText from a single UCS4-encoded character.
+        New an IBusText from a single UCS4-encoded character.
         
-          A newly allocated IBusText.
+          A newly allocated IBusText.
           
         
         
           
-            A single UCS4-encoded character.
+            A single UCS4-encoded character.
             
           
         
       
       
-        Append an IBusAttribute for IBusText.
+        Append an IBusAttribute for IBusText.
         
           
         
         
           
-            an IBusText
+            an IBusText
             
           
           
-            IBusAttributeType for @text.
+            IBusAttributeType for @text.
             
           
           
-            Value for the type.
+            Value for the type.
             
           
           
-            The starting index, inclusive.
+            The starting index, inclusive.
             
           
           
-            The ending index, exclusive.
+            The ending index, exclusive.
             
           
         
       
       
-        Return the attributes in an IBusText. Should not be freed.
+        Return the attributes in an IBusText. Should not be freed.
         
-          the attrs in @text.
+          the attrs in @text.
           
         
         
           
-            An IBusText.
+            An IBusText.
             
           
         
@@ -22551,42 +22611,42 @@
       
-        Return the is_static in an IBusText.
+        Return the is_static in an IBusText.
         
-          the is_static in @text.
+          the is_static in @text.
           
         
         
           
-            An IBusText.
+            An IBusText.
             
           
         
       
       
-        Return number of characters in an IBusText.
+        Return number of characters in an IBusText.
 This function is based on g_utf8_strlen(), so unlike strlen(),
 it does not count by bytes but characters instead.
         
-          Number of character in @text, not counted by bytes.
+          Number of character in @text, not counted by bytes.
           
         
         
           
-            An IBusText.
+            An IBusText.
             
           
         
       
       
-        Return the text in an IBusText. Should not be freed.
+        Return the text in an IBusText. Should not be freed.
         
-          the text in @text.
+          the text in @text.
           
         
         
           
-            An IBusText.
+            An IBusText.
             
           
         
@@ -22597,11 +22657,11 @@
         
         
           
-            An IBusText.
+            An IBusText.
             
           
           
-            An IBusAttrList
+            An IBusAttrList
             
           
         
@@ -23213,44 +23273,44 @@
     
     
-      New an background #IBusAttribute.
+      New an background #IBusAttribute.
       
-        A newly allocated #IBusAttribute.
+        A newly allocated #IBusAttribute.
         
       
       
         
-          Color in RGB.
+          Color in RGB.
           
         
         
-          Where attribute starts.
+          Where attribute starts.
           
         
         
-          Where attribute ends.
+          Where attribute ends.
           
         
       
     
     
-      New an foreground #IBusAttribute.
+      New an foreground #IBusAttribute.
       
-        A newly allocated #IBusAttribute.
+        A newly allocated #IBusAttribute.
         
       
       
         
-          Color in RGB.
+          Color in RGB.
           
         
         
-          Where attribute starts.
+          Where attribute starts.
           
         
         
-          Where attribute ends.
+          Where attribute ends.
           
         
       
@@ -23258,22 +23318,22 @@
     
-      New an underline #IBusAttribute.
+      New an underline #IBusAttribute.
       
-        A newly allocated #IBusAttribute.
+        A newly allocated #IBusAttribute.
         
       
       
         
-          Type of underline.
+          Type of underline.
           
         
         
-          Where attribute starts.
+          Where attribute starts.
           
         
         
-          Where attribute ends.
+          Where attribute ends.
           
         
       
@@ -25148,13 +25208,13 @@
     
-      Free a list of strings.
+      Free a list of strings.
       
         
       
       
         
-          List of strings.
+          List of strings.
           
         
       
@@ -25181,7 +25241,7 @@
       
     
     
-      Return the D-Bus address of IBus.
+      Return the D-Bus address of IBus.
 It will find the address from following source:
 <orderedlist>
    <listitem><para>Environment variable IBUS_ADDRESS</para></listitem>
@@ -25190,56 +25250,56 @@
 
 See also: ibus_write_address().
       
-        D-Bus address of IBus. %NULL for not found.
+        D-Bus address of IBus. %NULL for not found.
         
       
     
     
-      Get UID of ibus-daemon.
+      Get UID of ibus-daemon.
       
-        UID of ibus-daemon; or 0 if UID is not available.
+        UID of ibus-daemon; or 0 if UID is not available.
         
       
     
     
       
-        language name
+        language name
         
       
       
         
-          A const locale name.
+          A const locale name.
           
         
       
     
     
-      Obtains the machine UUID of the machine this process is running on.
+      Obtains the machine UUID of the machine this process is running on.
       
-        A newly allocated string that shows the UUID of the machine.
+        A newly allocated string that shows the UUID of the machine.
         
       
     
     
-      Get the path of socket file.
+      Get the path of socket file.
       
-        A newly allocated string that stores the path of socket file.
+        A newly allocated string that stores the path of socket file.
         
       
     
     
-      Get the GDBus timeout in milliseconds. The timeout is for clients (e.g. im-ibus.so), not for ibus-daemon.
+      Get the GDBus timeout in milliseconds. The timeout is for clients (e.g. im-ibus.so), not for ibus-daemon.
 Note that the timeout for ibus-daemon could be set by --timeout command line option of the daemon.
       
-        A GDBus timeout in milliseconds. -1 when default timeout for GDBus should be used.
+        A GDBus timeout in milliseconds. -1 when default timeout for GDBus should be used.
         
       
     
     
-      Get the current user name.
+      Get the current user name.
 It is determined by:
 <orderedlist>
    <listitem><para>getlogin()</para></listitem>
@@ -25251,7 +25311,7 @@
    <listitem><para>Environment variable LNAME</para></listitem>
 </orderedlist>
       
-        A newly allocated string that stores current user name.
+        A newly allocated string that stores current user name.
         
       
     
@@ -25492,7 +25552,7 @@
       
     
     
-      Initialize the ibus types.
+      Initialize the ibus types.
       
         
       
@@ -25733,85 +25793,85 @@
     
     
-      Parse key event string and return key symbol and modifiers.
+      Parse key event string and return key symbol and modifiers.
       
-        TRUE for succeed; FALSE if failed.
+        TRUE for succeed; FALSE if failed.
         
       
       
         
-          Key event string.
+          Key event string.
           
         
         
-          Variable that hold key symbol result.
+          Variable that hold key symbol result.
           
         
         
-          Variable that hold modifiers result.
+          Variable that hold modifiers result.
           
         
       
     
     
-      Return the name of a key symbol and modifiers.
+      Return the name of a key symbol and modifiers.
 
 For example, if press ctrl, shift, and enter, then this function returns:
 Shift+Control+enter.
       
-        The name of a key symbol and modifier.
+        The name of a key symbol and modifier.
         
       
       
         
-          Key symbol.
+          Key symbol.
           
         
         
-          Modifiers such as Ctrl or Shift.
+          Modifiers such as Ctrl or Shift.
           
         
       
     
     
-      Return the key symbol that associate with the key name.
+      Return the key symbol that associate with the key name.
       
-        Corresponding key symbol.
+        Corresponding key symbol.
         
       
       
         
-          Key name in #gdk_keys_by_name.
+          Key name in #gdk_keys_by_name.
           
         
       
     
     
-      Return the name of a key symbol.
+      Return the name of a key symbol.
 
 Note that the returned string is used internally, so don't free it.
       
-        Corresponding key name. %NULL if no such key symbol.
+        Corresponding key name. %NULL if no such key symbol.
         
       
       
         
-          Key symbol.
+          Key symbol.
           
         
       
     
     
-      Convert from an IBus key symbol to the corresponding ISO10646 (Unicode)
+      Convert from an IBus key symbol to the corresponding ISO10646 (Unicode)
 character.
       
-        the corresponding unicode character, or 0 if there is no corresponding character.
+        the corresponding unicode character, or 0 if there is no corresponding character.
         
       
       
         
-          an IBus key symbol
+          an IBus key symbol
           
         
       
@@ -25917,7 +25977,7 @@
       
     
     
-      Runs an IBus main loop until ibus_quit() is called in the loop.
+      Runs an IBus main loop until ibus_quit() is called in the loop.
 
 See also: ibus_quit().
       
@@ -26216,7 +26276,7 @@
       
     
     
-      Stops an IBus from running.
+      Stops an IBus from running.
 
 Any calls to ibus_quit() for the loop will return.
 See also: ibus_main().
@@ -26338,19 +26398,19 @@
       
     
     
-      Set the display address.
+      Set the display address.
       
         
       
       
         
-          Display address, as in DISPLAY environment for X.
+          Display address, as in DISPLAY environment for X.
           
         
       
     
     
-      Sets GLIB's log handler to ours. Our log handler adds time info
+      Sets GLIB's log handler to ours. Our log handler adds time info
 including hour, minute, second, and microsecond, like:
 
 (ibus-daemon:7088): IBUS-DEBUG: 18:06:45.822819: ibus-daemon started
@@ -26366,7 +26426,7 @@
       
       
         
-          TRUE for verbose logging.
+          TRUE for verbose logging.
           
         
       
@@ -26594,14 +26654,14 @@
       
     
     
-      Convert from a ISO10646 character to a key symbol.
+      Convert from a ISO10646 character to a key symbol.
       
-        the corresponding IBus key symbol, if one exists. or, if there is no corresponding symbol, wc | 0x01000000
+        the corresponding IBus key symbol, if one exists. or, if there is no corresponding symbol, wc | 0x01000000
         
       
       
         
-          a ISO10646 encoded character
+          a ISO10646 encoded character
           
         
       
@@ -26610,7 +26670,7 @@
       
     
     
-      Remove the log handler which is set by ibus_set_log_handler.
+      Remove the log handler which is set by ibus_set_log_handler.
       
         
       
@@ -26679,7 +26739,7 @@
       
     
     
-      Write D-Bus address to socket file.
+      Write D-Bus address to socket file.
 
 See also: ibus_get_address().
       
@@ -26687,7 +26747,7 @@
       
       
         
-          D-Bus address of IBus.
+          D-Bus address of IBus.
           
         
       
@@ -26699,13 +26759,13 @@
       
     
     
-      Free an XML tree.
+      Free an XML tree.
       
         
       
       
         
-          Root node of an XML tree.
+          Root node of an XML tree.
           
         
       
@@ -26713,17 +26773,17 @@
     
-      Output an XML tree to a GString.
+      Output an XML tree to a GString.
       
         
       
       
         
-          Root node of an XML tree.
+          Root node of an XML tree.
           
         
         
-          GString which stores the output.
+          GString which stores the output.
           
         
       
@@ -26731,15 +26791,15 @@
     
-      Parse a string buffer which contains an XML-formatted string,
+      Parse a string buffer which contains an XML-formatted string,
 and return a corresponding XML tree.
       
-        Root node of parsed XML tree.
+        Root node of parsed XML tree.
         
       
       
         
-          Buffer to be parsed.
+          Buffer to be parsed.
           
         
       
@@ -26747,14 +26807,14 @@
     
-      Parse an XML file and return a corresponding XML tree.
+      Parse an XML file and return a corresponding XML tree.
       
-        Root node of parsed XML tree.
+        Root node of parsed XML tree.
         
       
       
         
-          File name to be parsed.
+          File name to be parsed.
           
         
       
diff -Nru ibus-1.5.4/src/Makefile.am ibus-1.5.5/src/Makefile.am
--- ibus-1.5.4/src/Makefile.am	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/Makefile.am	2014-01-14 12:59:14.000000000 +0900
@@ -159,6 +159,7 @@
     $(ibus_public_headers)  \
     $(NULL)
 ibus_privite_headers =       \
+    ibuscomposetable.h       \
     ibusinternal.h           \
     keyname-table.h          \
     gtkimcontextsimpleseqs.h \
@@ -226,6 +227,24 @@
 	$(GLIB_GENMARSHAL) --prefix=_ibus_marshal $(srcdir)/ibusmarshalers.list --body --internal) > $@.tmp && \
 	mv $@.tmp $@
 
+ibuscomposetable.h:
+	$(AM_V_GEN) $(builddir)/gencomposetable > $@.tmp && \
+	mv $@.tmp $@
+	$(NULL)
+
+noinst_PROGRAMS = gencomposetable
+
+gencomposetable_SOURCES = \
+    gencomposetable.c \
+    $(NULL)
+gencomposetable_CFLAGS = \
+    @GLIB_CFLAGS@ \
+    $(NULL)
+gencomposetable_LDADD = \
+    $(libibus) \
+    @GLIB_LIBS@ \
+    $(NULL)
+
 EXTRA_DIST =                    \
     ibusversion.h.in            \
     ibusmarshalers.list         \
diff -Nru ibus-1.5.4/src/Makefile.in ibus-1.5.5/src/Makefile.in
--- ibus-1.5.4/src/Makefile.in	2013-09-20 12:17:27.000000000 +0900
+++ ibus-1.5.5/src/Makefile.in	2014-01-14 13:00:23.000000000 +0900
@@ -38,6 +38,7 @@
 
 
 
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -104,6 +105,7 @@
 host_triplet = @host@
 @HAVE_INTROSPECTION_TRUE@am__append_1 = IBus-1.0.gir
 @HAVE_INTROSPECTION_TRUE@am__append_2 = $(dist_gir_DATA) $(typelibs_DATA)
+noinst_PROGRAMS = gencomposetable$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/ibusversion.h.in $(top_srcdir)/depcomp \
@@ -176,6 +178,15 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libibus_1_0_la_LDFLAGS) $(LDFLAGS) -o \
 	$@
+PROGRAMS = $(noinst_PROGRAMS)
+am_gencomposetable_OBJECTS =  \
+	gencomposetable-gencomposetable.$(OBJEXT) $(am__objects_1)
+gencomposetable_OBJECTS = $(am_gencomposetable_OBJECTS)
+gencomposetable_DEPENDENCIES = $(libibus) $(am__DEPENDENCIES_1)
+gencomposetable_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(gencomposetable_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -210,8 +221,8 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libibus_1_0_la_SOURCES)
-DIST_SOURCES = $(libibus_1_0_la_SOURCES)
+SOURCES = $(libibus_1_0_la_SOURCES) $(gencomposetable_SOURCES)
+DIST_SOURCES = $(libibus_1_0_la_SOURCES) $(gencomposetable_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -668,6 +679,7 @@
     $(NULL)
 
 ibus_privite_headers = \
+    ibuscomposetable.h       \
     ibusinternal.h           \
     keyname-table.h          \
     gtkimcontextsimpleseqs.h \
@@ -705,6 +717,19 @@
 @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS)
 @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
 @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+gencomposetable_SOURCES = \
+    gencomposetable.c \
+    $(NULL)
+
+gencomposetable_CFLAGS = \
+    @GLIB_CFLAGS@ \
+    $(NULL)
+
+gencomposetable_LDADD = \
+    $(libibus) \
+    @GLIB_LIBS@ \
+    $(NULL)
+
 EXTRA_DIST = \
     ibusversion.h.in            \
     ibusmarshalers.list         \
@@ -792,12 +817,26 @@
 libibus-1.0.la: $(libibus_1_0_la_OBJECTS) $(libibus_1_0_la_DEPENDENCIES) $(EXTRA_libibus_1_0_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libibus_1_0_la_LINK) -rpath $(libdir) $(libibus_1_0_la_OBJECTS) $(libibus_1_0_la_LIBADD) $(LIBS)
 
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+gencomposetable$(EXEEXT): $(gencomposetable_OBJECTS) $(gencomposetable_DEPENDENCIES) $(EXTRA_gencomposetable_DEPENDENCIES) 
+	@rm -f gencomposetable$(EXEEXT)
+	$(AM_V_CCLD)$(gencomposetable_LINK) $(gencomposetable_OBJECTS) $(gencomposetable_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gencomposetable-gencomposetable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ibusattribute.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ibusattrlist.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ibusbus.Plo@am__quote@
@@ -852,6 +891,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+gencomposetable-gencomposetable.o: gencomposetable.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gencomposetable_CFLAGS) $(CFLAGS) -MT gencomposetable-gencomposetable.o -MD -MP -MF $(DEPDIR)/gencomposetable-gencomposetable.Tpo -c -o gencomposetable-gencomposetable.o `test -f 'gencomposetable.c' || echo '$(srcdir)/'`gencomposetable.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gencomposetable-gencomposetable.Tpo $(DEPDIR)/gencomposetable-gencomposetable.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gencomposetable.c' object='gencomposetable-gencomposetable.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gencomposetable_CFLAGS) $(CFLAGS) -c -o gencomposetable-gencomposetable.o `test -f 'gencomposetable.c' || echo '$(srcdir)/'`gencomposetable.c
+
+gencomposetable-gencomposetable.obj: gencomposetable.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gencomposetable_CFLAGS) $(CFLAGS) -MT gencomposetable-gencomposetable.obj -MD -MP -MF $(DEPDIR)/gencomposetable-gencomposetable.Tpo -c -o gencomposetable-gencomposetable.obj `if test -f 'gencomposetable.c'; then $(CYGPATH_W) 'gencomposetable.c'; else $(CYGPATH_W) '$(srcdir)/gencomposetable.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gencomposetable-gencomposetable.Tpo $(DEPDIR)/gencomposetable-gencomposetable.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gencomposetable.c' object='gencomposetable-gencomposetable.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gencomposetable_CFLAGS) $(CFLAGS) -c -o gencomposetable-gencomposetable.obj `if test -f 'gencomposetable.c'; then $(CYGPATH_W) 'gencomposetable.c'; else $(CYGPATH_W) '$(srcdir)/gencomposetable.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1078,7 +1131,7 @@
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(ibusincludedir)"; do \
@@ -1121,7 +1174,7 @@
 clean: clean-recursive
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
+	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
@@ -1196,21 +1249,22 @@
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am clean clean-generic clean-libLTLIBRARIES \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-dist_girDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am \
-	install-ibusincludeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip install-typelibsDATA \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-dist_girDATA uninstall-ibusincludeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-typelibsDATA
+	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dist_girDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-ibusincludeHEADERS install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	install-typelibsDATA installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-dist_girDATA \
+	uninstall-ibusincludeHEADERS uninstall-libLTLIBRARIES \
+	uninstall-typelibsDATA
 
 
 # gobject introspection
@@ -1242,6 +1296,11 @@
 	$(GLIB_GENMARSHAL) --prefix=_ibus_marshal $(srcdir)/ibusmarshalers.list --body --internal) > $@.tmp && \
 	mv $@.tmp $@
 
+ibuscomposetable.h:
+	$(AM_V_GEN) $(builddir)/gencomposetable > $@.tmp && \
+	mv $@.tmp $@
+	$(NULL)
+
 -include $(top_srcdir)/git.mk
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru ibus-1.5.4/src/gencomposetable.c ibus-1.5.5/src/gencomposetable.c
--- ibus-1.5.4/src/gencomposetable.c	1970-01-01 09:00:00.000000000 +0900
+++ ibus-1.5.5/src/gencomposetable.c	2014-01-14 12:59:14.000000000 +0900
@@ -0,0 +1,957 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* ibus - The Input Bus
+ * Copyright (C) 2013 Peng Huang 
+ * Copyright (C) 2013 Takao Fujiwara 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "ibuserror.h"
+#include "ibuskeys.h"
+#include "ibuskeysyms.h"
+#include "ibustypes.h"
+#include "gtkimcontextsimpleseqs.h"
+
+#define HEADER \
+"/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */\n"          \
+"/* vim:set et sts=4: */\n"                                                   \
+"/* ibus - The Input Bus\n"                                                   \
+" * Copyright (C) 2013 Peng Huang \n"                \
+" * Copyright (C) 2013 Takao Fujiwara \n"          \
+" *\n"                                                                        \
+" * This library is free software; you can redistribute it and/or\n"          \
+" * modify it under the terms of the GNU Lesser General Public\n"             \
+" * License as published by the Free Software Foundation; either\n"           \
+" * version 2.1 of the License, or (at your option) any later version.\n"     \
+" *\n"                                                                        \
+" * This library is distributed in the hope that it will be useful,\n"        \
+" * but WITHOUT ANY WARRANTY; without even the implied warranty of\n"         \
+" * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"      \
+" * Lesser General Public License for more details.\n"                        \
+" *\n"                                                                        \
+" * You should have received a copy of the GNU Lesser General Public\n"       \
+" * License along with this library; if not, write to the Free Software\n"    \
+" * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301\n" \
+" * USA\n"                                                                    \
+" */\n"                                                                       \
+"\n"                                                                          \
+"#ifndef __IBUS_COMPOSETABLE_H_\n"                                            \
+"#define __IBUS_COMPOSETABLE_H_\n"                                            \
+"\n"                                                                          \
+"/* The table is generated by ibus/src/gencomposetable\n"                     \
+" *\n"                                                                        \
+" * if ibus_compose_seqs_a[N - 1] is an outputed compose character,\n"        \
+" * ibus_compose_seqs_a[N * 2 - 1] is also an outputed compose character.\n"  \
+" * and ibus_compose_seqs_a[0] to ibus_compose_seqs_a[0 + N - 3] are the\n"   \
+" * sequences and call ibus_engine_simple_add_table:\n"                       \
+" * ibus_engine_simple_add_table(engine, ibus_compose_seqs_a,\n"              \
+" *                              N - 2, G_N_ELEMENTS(ibus_compose_seqs_a) / N)\n" \
+" * The compose sequences are allowed within G_MAXUINT16 */\n"                \
+"\n"                                                                          \
+"typedef struct _IBusComposeTable IBusComposeTable;\n"                        \
+"struct _IBusComposeTable\n"                                                  \
+"{\n"                                                                         \
+"    const guint16 *data;\n"                                                  \
+"    gint max_seq_len;\n"                                                     \
+"    gint n_seqs;\n"                                                          \
+"};\n"                                                                        \
+"\n"                                                                          \
+"typedef struct _IBusComposeTableLocaleList IBusComposeTableLocaleList;\n"    \
+"struct _IBusComposeTableLocaleList\n"                                        \
+"{\n"                                                                         \
+"    const gchar *locale;\n"                                                  \
+"    const IBusComposeTable *table;\n"                                        \
+"};\n"                                                                        \
+""
+
+#define FOOTER \
+"#endif"
+
+#define AM_ET_ARRAY \
+"static const guint16 ibus_compose_seqs_am_et[] = {\n"                        \
+"  /* Not sure if am_ET compose file is useful. It uses ASCII key\n"          \
+"   * at first but not compose keys.\n"                                       \
+"   * Comment out am_compose_seqs until get the request. */\n"                \
+"  0\n"                                                                       \
+"};\n"                                                                        \
+"\n"                                                                          \
+"static const IBusComposeTable ibus_compose_table_am_et = {\n"                \
+"    ibus_compose_seqs_am_et,\n"                                              \
+"    0,\n"                                                                    \
+"    0\n"                                                                     \
+"};\n"                                                                        \
+""
+
+#define PRINT_IBUS_COMPOSE_TABLE_LOCALE(locale, len) \
+    g_printf (                                                                \
+"static const IBusComposeTable ibus_compose_table_" #locale " = {\n"          \
+"    ibus_compose_seqs_" #locale ",\n"                                        \
+"    %d,\n"                                                                   \
+"    G_N_ELEMENTS (ibus_compose_seqs_" #locale ") / (%d + 2)\n"               \
+"};\n"                                                                        \
+"\n"                                                                          \
+"", len, len)
+
+#define PRINT_LOCALE_AND_IBUS_COMPOSE_TABLE(locale) \
+    g_printf (                                                                \
+"    { \"" #locale "\", &ibus_compose_table_" #locale " },\n")                \
+
+#define IS_DEAD_KEY(k) \
+    ((k) >= IBUS_KEY_dead_grave && (k) <= (IBUS_KEY_dead_dasia + 1))
+
+#define GTK_MAX_COMPOSE_LEN 7
+
+int MAX_COMPOSE_LEN = 0;
+int N_INDEX_STRIDE = 0;
+
+const gchar *COMPOSE_FILES[] = {
+    "/usr/share/X11/locale/am_ET.UTF-8/Compose",
+    "/usr/share/X11/locale/el_GR.UTF-8/Compose",
+    "/usr/share/X11/locale/fi_FI.UTF-8/Compose",
+    "/usr/share/X11/locale/pt_BR.UTF-8/Compose",
+    NULL
+};
+
+typedef struct _IBusComposeTableCompact IBusComposeTableCompact;
+struct _IBusComposeTableCompact
+{
+    const guint16 *data;
+    gint max_seq_len;
+    gint n_index_size;
+    gint n_index_stride;
+};
+
+static const IBusComposeTableCompact ibus_compose_table_compact = {
+    gtk_compose_seqs_compact,
+    5,
+    25,
+    6
+};
+
+GHashTable *en_keysym_table = NULL;
+
+static gboolean
+is_codepoint (const gchar *str)
+{
+    gboolean retval = (strlen (str) > 1 && *str == 'U');
+    int i;
+
+    if (!retval)
+        return FALSE;
+
+    for (i = 1; str[i] != '\0'; i++) {
+        if (g_ascii_isxdigit (str[i]))
+            continue;
+        else
+            return FALSE;
+    }
+
+    return TRUE;
+}
+
+static gint
+get_codepoint (const gchar *str)
+{
+    if (g_str_has_prefix (str, "IBUS_KEY_"))
+        return GPOINTER_TO_INT (g_hash_table_lookup (en_keysym_table, str));
+    if (*str == '0' && *(str + 1) == '\0')
+        return 0;
+    if (*str == '0' && *(str + 1) == 'x')
+        return (gint) g_ascii_strtoll (str, NULL, 16);
+
+    g_assert_not_reached ();
+    return 0;
+}
+
+static GHashTable *
+parse_keysym_file (const gchar *keysym_file)
+{
+    gchar *contents = NULL;
+    gchar **lines = NULL;
+    gsize length = 0;
+    GError *error = NULL;
+    GHashTable *table = NULL;
+    int i;
+
+    if (!g_file_get_contents (keysym_file, &contents, &length, &error)) {
+        g_error ("Specify $IBUS_KEYSYMS for the path of ibuskeysyms.h: %s",
+                 error->message);
+        g_error_free (error);
+    }
+
+    table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+    lines = g_strsplit (contents, "\n", -1);
+    g_free (contents);
+
+    for (i = 0; lines[i] != NULL; i++) {
+        const gchar *line = lines[i];
+        gchar **words;
+        gint length;
+        const gchar *key;
+        gint64 code;
+
+        if (!g_str_has_prefix (line, "#define"))
+            continue;
+
+        words = g_strsplit (line , " ", -1);
+        length = g_strv_length (words);
+
+        g_assert (length >= 2);
+
+        key = words[1];
+
+        /* In case of #define __IBUS_KEYSYMS_H__ */
+        if (length == 2) {
+            g_assert (!g_str_has_prefix (key, "IBUS_KEY"));
+            continue;
+        }
+
+        code = g_ascii_strtoll (words[2], NULL, 16);
+        g_hash_table_insert (table, g_strdup (key), GINT_TO_POINTER (code));
+        g_strfreev (words);
+    }
+
+    g_strfreev (lines);
+    return table;
+}
+
+static gboolean
+parse_compose_value (GArray *array, const gchar *val, GError **error)
+{
+    gchar **words = g_strsplit (val, "\"", 3);
+    gchar *result;
+    gunichar uch;
+
+    g_assert (g_strv_length (words) >= 3);
+
+    uch = g_utf8_get_char (words[1]);
+
+    if (uch == 0) {
+         g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "Invalid value: %s", val);
+        g_strfreev (words);
+        return FALSE;
+    }
+    else if (uch == '\\') {
+        uch = words[1][1];
+
+        /* The escaped string "\"" is separated with '\\' and '"'. */
+        if (uch == '\0' && words[2][0] == '"')
+            uch = '"';
+        /* The escaped octal */
+        else if (uch >= '0' && uch <= '8')
+            uch = g_ascii_strtoll(words[1] + 1, 0, 8);
+        /* If we need to handle other escape sequences. */
+        else if (uch != '\\')
+            g_assert_not_reached ();
+    }
+    else if (g_utf8_get_char (g_utf8_next_char (words[1])) > 0) {
+         g_set_error (error,
+                     IBUS_ERROR,
+                     IBUS_ERROR_FAILED,
+                     "GTK+ supports to output one char only: %s", val);
+        g_strfreev (words);
+        return FALSE;
+    }
+
+
+    result = g_strdup_printf ("0x%04X", uch);
+    g_array_append_val (array, result);
+
+    if (uch == '"')
+        result = g_strdup (g_strstrip (words[2] + 1));
+    else
+        result = g_strdup (g_strstrip (words[2]));
+
+    g_array_append_val (array, result);
+    g_strfreev (words);
+
+    return TRUE;
+}
+
+static void
+parse_compose_sequence (GArray *array, const gchar *seq)
+{
+    gchar **words = g_strsplit (seq, "<", -1);
+    gchar *result;
+    int i;
+    int n = 0;
+
+    g_assert (g_strv_length (words) >= 2);
+
+    for (i = 1; words[i] != NULL; i++) {
+        gchar *start = words[i];
+        gchar *end = index (words[i], '>');
+        gchar *match;
+
+        if (words[i][0] == '\0')
+             continue;
+
+        g_assert (start != NULL && end != NULL && end > start);
+
+        match = g_strndup (start, end - start);
+
+        if (is_codepoint (match)) {
+            gint64 code = g_ascii_strtoll (match + 1, NULL, 16);
+            result = g_strdup_printf ("0x%04X", (unsigned int) code);
+        } else
+            result = g_strdup_printf ("IBUS_KEY_%s", match);
+
+        g_free (match);
+        g_array_append_val (array, result);
+        n++;
+    }
+
+    g_strfreev (words);
+    g_assert (0 < n && n < GTK_MAX_COMPOSE_LEN);
+
+    result = g_strdup ("0");
+    g_array_append_val (array, result);
+}
+
+static void
+clear_char_array (gpointer data)
+{
+    gchar **array = data;
+    g_free (*array);
+}
+
+static void
+parse_compose_line (GList **compose_table, const gchar *line)
+{
+    gchar **components = NULL;
+    GArray *array;
+    GError *error = NULL;
+
+    if (line[0] == '\0' || line[0] == '#')
+        return;
+
+    if (g_str_has_prefix (line, "include "))
+        return;
+
+    components = g_strsplit (line, ":", 2);
+
+    if (components[1] == NULL) {
+        g_warning ("No delimiter ':': %s", line);
+        g_strfreev (components);
+        return;
+    }
+
+    array = g_array_new (TRUE, TRUE, sizeof (gchar *));
+    g_array_set_clear_func (array, clear_char_array);
+
+    parse_compose_sequence (array, g_strstrip (components[0]));
+
+    if (!parse_compose_value (array, g_strstrip (components[1]), &error)) {
+        g_warning ("%s: %s", error->message, line);
+        g_clear_error (&error);
+        g_strfreev (components);
+        g_array_unref (array);
+        return;
+    }
+
+    g_strfreev (components);
+
+    *compose_table = g_list_append (*compose_table, array);
+}
+
+static GList *
+parse_compose_file (const gchar *compose_file)
+{
+    gchar *contents = NULL;
+    gchar **lines = NULL;
+    gsize length = 0;
+    GError *error = NULL;
+    GList *compose_table = NULL;
+    int i;
+
+    if (!g_file_get_contents (compose_file, &contents, &length, &error)) {
+        g_error ("%s", error->message);
+        g_error_free (error);
+    }
+
+    lines = g_strsplit (contents, "\n", -1);
+    g_free (contents);
+    for (i = 0; lines[i] != NULL; i++)
+        parse_compose_line (&compose_table, lines[i]);
+    g_strfreev (lines);
+
+    return compose_table;
+}
+
+static int
+compare_seq_index (const void *key, const void *value)
+{
+    const guint *keysyms = key;
+    const guint16 *seq = value;
+
+    if (keysyms[0] < seq[0])
+        return -1;
+    else if (keysyms[0] > seq[0])
+        return 1;
+    return 0;
+}
+
+static int
+compare_seq (const void *key, const void *value)
+{
+    int i = 0;
+    const guint *keysyms = key;
+    const guint16 *seq = value;
+
+    while (keysyms[i]) {
+        if (keysyms[i] < seq[i])
+            return -1;
+        else if (keysyms[i] > seq[i])
+            return 1;
+
+        i++;
+    }
+
+    return 0;
+}
+
+/* Implement check_compact_table() in ibus/src/ibusenginesimple.c
+ */
+static gboolean
+check_compact_table (const guint                   *compose_buffer,
+                     const IBusComposeTableCompact *table,
+                     gint                           n_compose)
+{
+    gint row_stride;
+    guint16 *seq_index;
+    guint16 *seq;
+    gint i;
+
+    seq_index = bsearch (compose_buffer,
+                         table->data,
+                         table->n_index_size,
+                         sizeof (guint16) *  table->n_index_stride,
+                         compare_seq_index);
+
+    if (seq_index == NULL) {
+        // g_debug ("compact: no\n");
+        return FALSE;
+    }
+
+    seq = NULL;
+    i = n_compose - 1;
+
+    if (i >= table->max_seq_len) {
+        return FALSE;
+    }
+
+    row_stride = i + 1;
+
+    if (seq_index[i + 1] <= seq_index[i]) {
+        return FALSE;
+    }
+
+    seq = bsearch (compose_buffer + 1,
+                   table->data + seq_index[i],
+                   (seq_index[i + 1] - seq_index[i]) / row_stride,
+                   sizeof (guint16) * row_stride,
+                   compare_seq);
+    // g_debug ("seq = %p", seq);
+
+    if (!seq) {
+        // g_debug ("no\n");
+        return FALSE;
+    }
+    else {
+        gunichar value = seq[row_stride - 1];
+        // g_debug ("U+%04X\n", value);
+        if (compose_buffer[n_compose + 1] == value)
+            return TRUE;
+        else
+            return FALSE;
+    }
+}
+
+static gboolean
+check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
+{
+    gunichar combination_buffer_temp[GTK_MAX_COMPOSE_LEN];
+    gchar *combination_utf8_temp = NULL;
+    gchar *nfc_temp = NULL;
+    gint n_combinations;
+    gunichar temp_swap;
+    gint i;
+
+    n_combinations = 1;
+
+    for (i = 1; i < n_compose; i++ )
+        n_combinations *= i;
+
+    if (combination_buffer[0] >= 0x390 && combination_buffer[0] <= 0x3FF) {
+        for (i = 1; i < n_compose; i++ )
+            if (combination_buffer[i] == 0x303)
+                combination_buffer[i] = 0x342;
+    }
+
+    memcpy (combination_buffer_temp, combination_buffer,
+            GTK_MAX_COMPOSE_LEN * sizeof (gunichar) );
+
+    for (i = 0; i < n_combinations; i++ ) {
+        g_unicode_canonical_ordering (combination_buffer_temp, n_compose);
+        combination_utf8_temp = g_ucs4_to_utf8 (combination_buffer_temp,
+                                                -1, NULL, NULL, NULL);
+        nfc_temp = g_utf8_normalize (combination_utf8_temp, -1,
+                                     G_NORMALIZE_NFC);
+
+        if (g_utf8_strlen (nfc_temp, -1) == 1) {
+            memcpy (combination_buffer,
+                    combination_buffer_temp,
+                    GTK_MAX_COMPOSE_LEN * sizeof (gunichar) );
+
+            g_free (combination_utf8_temp);
+            g_free (nfc_temp);
+
+            return TRUE;
+        }
+
+        g_free (combination_utf8_temp);
+        g_free (nfc_temp);
+
+        if (n_compose > 2) {
+            temp_swap = combination_buffer_temp[i % (n_compose - 1) + 1];
+            combination_buffer_temp[i % (n_compose - 1) + 1] =
+             combination_buffer_temp[(i+1) % (n_compose - 1) + 1];
+            combination_buffer_temp[(i+1) % (n_compose - 1) + 1] = temp_swap;
+        }
+        else
+            break;
+    }
+
+  return FALSE;
+}
+
+/* Implement check_algorithmically() in ibus/src/ibusenginesimple.c
+ */
+static gboolean
+check_algorithmically (const guint *compose_buffer,
+                       gint         n_compose)
+{
+    int i = 0;
+    gunichar combination_buffer[GTK_MAX_COMPOSE_LEN];
+    gchar *combination_utf8, *nfc;
+
+    if (n_compose >= GTK_MAX_COMPOSE_LEN)
+        return FALSE;
+
+    for (i = 0; i < n_compose && IS_DEAD_KEY (compose_buffer[i]); i++)
+        ;
+    if (i == n_compose)
+        return FALSE;
+
+    if (i > 0 && i == n_compose - 1) {
+        combination_buffer[0] = ibus_keyval_to_unicode (compose_buffer[i]);
+        combination_buffer[n_compose] = 0;
+        i--;
+
+        while (i >= 0) {
+            switch (compose_buffer[i]) {
+#define CASE(keysym, unicode) \
+            case IBUS_KEY_dead_##keysym: combination_buffer[i+1] = unicode; \
+            break
+
+            CASE (grave, 0x0300);
+            CASE (acute, 0x0301);
+            CASE (circumflex, 0x0302);
+            CASE (tilde, 0x0303);
+            CASE (macron, 0x0304);
+            CASE (breve, 0x0306);
+            CASE (abovedot, 0x0307);
+            CASE (diaeresis, 0x0308);
+            CASE (hook, 0x0309);
+            CASE (abovering, 0x030A);
+            CASE (doubleacute, 0x030B);
+            CASE (caron, 0x030C);
+            CASE (abovecomma, 0x0313);
+            CASE (abovereversedcomma, 0x0314);
+            CASE (horn, 0x031B);
+            CASE (belowdot, 0x0323);
+            CASE (cedilla, 0x0327);
+            CASE (ogonek, 0x0328);
+            CASE (iota, 0x0345);
+            CASE (voiced_sound, 0x3099);
+            CASE (semivoiced_sound, 0x309A);
+
+            /* The following cases are to be removed once xkeyboard-config,
+             * xorg are fully updated.
+             */
+            /* Workaround for typo in 1.4.x xserver-xorg */
+            case 0xfe66: combination_buffer[i+1] = 0x314; break;
+            /* CASE (dasia, 0x314); */
+            /* CASE (perispomeni, 0x342); */
+            /* CASE (psili, 0x343); */
+#undef CASE
+            default:
+                combination_buffer[i+1] =
+                        ibus_keyval_to_unicode (compose_buffer[i]);
+            }
+            i--;
+        }
+
+        if (check_normalize_nfc (combination_buffer, n_compose)) {
+            gunichar value;
+
+            combination_utf8 = g_ucs4_to_utf8 (combination_buffer,
+                                               -1, NULL, NULL, NULL);
+            nfc = g_utf8_normalize (combination_utf8, -1, G_NORMALIZE_NFC);
+
+            value = g_utf8_get_char (nfc);
+            g_free (combination_utf8);
+            g_free (nfc);
+
+            if (compose_buffer[n_compose + 1] == value)
+                return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+static GList *
+check_duplicated_compose (GList *compose_table)
+{
+    GList *table;
+    GList *removed_table = NULL;
+
+    for (table = compose_table; table != NULL; table = table->next) {
+        GArray *array = (GArray *) table->data;
+        static guint keysyms[GTK_MAX_COMPOSE_LEN + 2];
+        int i;
+        int n_compose = 0;
+
+        for (i = 0; i <= GTK_MAX_COMPOSE_LEN + 2; i++) {
+            keysyms[i] = 0;
+        }
+
+        for (i = 0; i < array->len; i++) {
+            const gchar *data = g_array_index (array, const gchar *, i);
+            guint codepoint = (guint) get_codepoint (data);
+
+            keysyms[i] = codepoint;
+
+            if (codepoint == 0) {
+                data = g_array_index (array, const gchar *, i + 1);
+                codepoint = (guint) get_codepoint (data);
+                keysyms[i + 1] = codepoint;
+                break;
+            }
+
+            n_compose++;
+        }
+
+        if (check_compact_table (keysyms,
+                                 &ibus_compose_table_compact,
+                                 n_compose))
+            removed_table = g_list_append (removed_table, array);
+
+        else if (check_algorithmically (keysyms, n_compose))
+            removed_table = g_list_append (removed_table, array);
+    }
+
+    for (table = removed_table; table != NULL; table = table->next) {
+        GArray *array = (GArray *) table->data;
+        compose_table = g_list_remove (compose_table, array);
+        g_array_unref (array);
+    }
+
+    g_list_free (removed_table);
+
+    return compose_table;
+}
+
+static GList *
+check_uint16 (GList *compose_table)
+{
+    GList *table;
+    GList *removed_table = NULL;
+
+    for (table = compose_table; table != NULL; table = table->next) {
+        GArray *array = (GArray *) table->data;
+        int i;
+
+        for (i = 0; i < array->len; i++) {
+            const gchar *data = g_array_index (array, const gchar *, i);
+            guint codepoint = (guint) get_codepoint (data);
+
+            if (codepoint == 0)
+                break;
+
+            if (codepoint > 0xffff) {
+                removed_table = g_list_append (removed_table, array);
+                break;
+            }
+        }
+    }
+
+    for (table = removed_table; table != NULL; table = table->next) {
+        GArray *array = (GArray *) table->data;
+        compose_table = g_list_remove (compose_table, array);
+        g_array_unref (array);
+    }
+
+    g_list_free (removed_table);
+
+    return compose_table;
+}
+
+static GList *
+format_for_gtk (GList *compose_table)
+{
+    GList *table;
+    GList *new_table = NULL;
+    int i;
+    int j;
+
+    for (table = compose_table; table != NULL; table = table->next) {
+        GArray *array = (GArray *) table->data;
+
+        for (i = 0; i < array->len; i++) {
+            const gchar *data = g_array_index (array, const gchar *, i);
+            guint codepoint = (guint) get_codepoint (data);
+
+            if (codepoint == 0) {
+                if (MAX_COMPOSE_LEN < i)
+                    MAX_COMPOSE_LEN = i;
+                break;
+            }
+        }
+    }
+
+    N_INDEX_STRIDE = MAX_COMPOSE_LEN + 2;
+
+    for (table = compose_table; table != NULL; table = table->next) {
+        GArray *array = (GArray *) table->data;
+        for (i = 0; i < array->len; i++) {
+            const gchar *data = g_array_index (array, const gchar *, i);
+            guint codepoint = (guint) get_codepoint (data);
+
+            if (codepoint == 0) {
+                gchar *value = g_strdup (g_array_index (array, const gchar *,
+                                                        i + 1));
+                gchar *comment = g_strdup (g_array_index (array, const gchar *,
+                                                          i + 2));
+                gchar *result;
+
+                g_array_remove_range (array, i, array->len - i);
+
+                for (j = i; j < MAX_COMPOSE_LEN; j++) {
+                    result = g_strdup ("0");
+                    g_array_append_val (array, result);
+                }
+
+                codepoint = (guint) get_codepoint (value);
+                g_free (value);
+
+                if (codepoint > 0xffff) {
+                    result = g_strdup_printf ("0x%04X", codepoint / 0x10000);
+                    g_array_append_val (array, result);
+                    result = g_strdup_printf ("0x%04X",
+                            codepoint - codepoint / 0x10000 * 0x10000);
+                    g_array_append_val (array, result);
+                } else {
+                    result = g_strdup ("0");
+                    g_array_append_val (array, result);
+                    result = g_strdup_printf ("0x%04X", codepoint);
+                    g_array_append_val (array, result);
+                }
+
+                g_array_append_val (array, comment);
+                new_table = g_list_append (new_table, array);
+                break;
+            }
+        }
+    }
+
+    return new_table;
+}
+
+static gint
+compare_array (gpointer a, gpointer b)
+{
+    GArray *array_a = (GArray *) a;
+    GArray *array_b = (GArray *) b;
+    int i;
+    for (i = 0; i < MAX_COMPOSE_LEN; i++) {
+        const gchar *data_a = g_array_index (array_a, const gchar *, i);
+        const gchar *data_b = g_array_index (array_b, const gchar *, i);
+        gint code_a = get_codepoint (data_a);
+        gint code_b = get_codepoint (data_b);
+
+        if (code_a != code_b)
+            return code_a - code_b;
+    }
+    return 0;
+}
+
+static void
+print_compose_table (GList *compose_table)
+{
+    GList *table;
+    int i;
+    int TOTAL_SIZE = 0;
+
+    for (table = compose_table; table != NULL; table = table->next) {
+        GArray *array = (GArray *) table->data;
+        const gchar *data;
+        const gchar *upper;
+        const gchar *lower;
+        const gchar *comment;
+
+        g_assert (array->len >= MAX_COMPOSE_LEN + 2);
+
+        g_printf ("  ");
+        for (i = 0; i < MAX_COMPOSE_LEN; i++) {
+            data = g_array_index (array, const gchar *, i);
+
+            if (i == MAX_COMPOSE_LEN -1)
+                g_printf ("%s,\n", data);
+            else
+                g_printf ("%s, ", data);
+        }
+        upper = g_array_index (array, const gchar *, i);
+        lower = g_array_index (array, const gchar *, i + 1);
+        comment = g_array_index (array, const gchar *, i + 2);
+
+        if (table == g_list_last (compose_table))
+            g_printf ("    %s, %s  /* %s */\n", upper, lower, comment);
+        else
+            g_printf ("    %s, %s, /* %s */\n", upper, lower, comment);
+
+        TOTAL_SIZE += N_INDEX_STRIDE;
+    }
+
+    g_printerr ("TOTAL_SIZE: %d\nMAX_COMPOSE_LEN: %d\nN_INDEX_STRIDE: %d\n",
+                TOTAL_SIZE, MAX_COMPOSE_LEN, N_INDEX_STRIDE);
+}
+
+static void
+print_compose_table_locale_list (void) {
+    int i;
+
+#define HEADER_IBUS_COMPOSE_TABLE_LOCLE_LIST \
+  "static const IBusComposeTableLocaleList ibus_compose_table_locale_list[] = {"
+
+    g_printf ("%s\n", HEADER_IBUS_COMPOSE_TABLE_LOCLE_LIST);
+
+    for (i = 0; COMPOSE_FILES[i] != NULL; i++) {
+        const gchar *compose_file = COMPOSE_FILES[i];
+
+        if (g_strstr_len (compose_file, -1, "am_ET") != NULL)
+            continue;
+        else if (g_strstr_len (compose_file, -1, "el_GR") != NULL)
+            PRINT_LOCALE_AND_IBUS_COMPOSE_TABLE (el_gr);
+        else if (g_strstr_len (compose_file, -1, "fi_FI") != NULL)
+            PRINT_LOCALE_AND_IBUS_COMPOSE_TABLE (fi_fi);
+        else if (g_strstr_len (compose_file, -1, "pt_BR") != NULL)
+            PRINT_LOCALE_AND_IBUS_COMPOSE_TABLE (pt_br);
+        else
+            g_assert_not_reached ();
+    }
+
+    g_printf ("    { NULL, NULL }\n};\n\n");
+};
+
+int
+main (int argc, char *argv[])
+{
+    int i;
+    const gchar *en_keysym_file;
+    const gchar *compose_file;
+    GList *compose_table = NULL;
+
+    setlocale (LC_ALL, "");
+
+    en_keysym_file = g_getenv ("IBUS_KEYSYMS");
+
+    if (en_keysym_file == NULL) {
+        en_keysym_file = "ibuskeysyms.h";
+    }
+
+    en_keysym_table = parse_keysym_file (en_keysym_file);
+
+    g_printf ("%s\n", HEADER);
+
+    for (i = 0; COMPOSE_FILES[i] != NULL; i++) {
+        compose_file = COMPOSE_FILES[i];
+
+        MAX_COMPOSE_LEN = 0;
+        N_INDEX_STRIDE = 0;
+
+        if (g_strstr_len (compose_file, -1, "am_ET") != NULL) {
+            g_printf ("%s\n", AM_ET_ARRAY);
+            continue;
+        }
+        else if (g_strstr_len (compose_file, -1, "el_GR") != NULL) {
+            g_printerr ("Generating ibus_compose_seqs_el_gr ...\n");
+            g_printf ("static const guint16 ibus_compose_seqs_el_gr[] = {\n");
+        }
+        else if (g_strstr_len (compose_file, -1, "fi_FI") != NULL) {
+            g_printerr ("Generating ibus_compose_seqs_fi_fi ...\n");
+            g_printf ("static const guint16 ibus_compose_seqs_fi_fi[] = {\n");
+        }
+        else if (g_strstr_len (compose_file, -1, "pt_BR") != NULL) {
+            g_printerr ("Generating ibus_compose_seqs_pt_br ...\n");
+            g_printf ("static const guint16 ibus_compose_seqs_pt_br[] = {\n");
+        }
+        else
+            g_assert_not_reached ();
+
+        compose_table = parse_compose_file (compose_file);
+        compose_table = check_duplicated_compose (compose_table);
+        compose_table = check_uint16 (compose_table);
+        compose_table = format_for_gtk (compose_table);
+        compose_table = g_list_sort (compose_table,
+                                     (GCompareFunc) compare_array);
+
+        print_compose_table (compose_table);
+
+        g_printf ("};\n\n");
+
+        if (g_strstr_len (compose_file, -1, "el_GR") != NULL)
+            PRINT_IBUS_COMPOSE_TABLE_LOCALE (el_gr, MAX_COMPOSE_LEN);
+        else if (g_strstr_len (compose_file, -1, "fi_FI") != NULL)
+            PRINT_IBUS_COMPOSE_TABLE_LOCALE (fi_fi, MAX_COMPOSE_LEN);
+        else if (g_strstr_len (compose_file, -1, "pt_BR") != NULL)
+            PRINT_IBUS_COMPOSE_TABLE_LOCALE (pt_br, MAX_COMPOSE_LEN);
+        else
+            g_assert_not_reached ();
+
+        g_list_free_full (compose_table, (GDestroyNotify) g_array_unref);
+    }
+
+    print_compose_table_locale_list ();
+
+    g_printf ("%s\n", FOOTER);
+
+    g_hash_table_destroy (en_keysym_table);
+
+    return 0;
+}
diff -Nru ibus-1.5.4/src/gtkimcontextsimpleseqs.h ibus-1.5.5/src/gtkimcontextsimpleseqs.h
--- ibus-1.5.4/src/gtkimcontextsimpleseqs.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/gtkimcontextsimpleseqs.h	2014-01-14 12:59:14.000000000 +0900
@@ -65,30 +65,31 @@
  */
 
 static const guint16 gtk_compose_seqs_compact[] = {
-IBUS_KEY_dead_stroke, 144, 232, 241, 241, 241, 
-IBUS_KEY_Greek_accentdieresis, 241, 245, 245, 245, 245, 
-IBUS_KEY_dead_grave, 245, 307, 394, 606, 606, 
-IBUS_KEY_dead_acute, 606, 670, 766, 1042, 1042, 
-IBUS_KEY_dead_circumflex, 1042, 1166, 1166, 1366, 1366, 
-IBUS_KEY_dead_tilde, 1366, 1450, 1513, 1653, 1653, 
-IBUS_KEY_dead_macron, 1653, 1699, 1699, 1771, 1771, 
-IBUS_KEY_dead_breve, 1771, 1821, 1821, 1845, 1845, 
-IBUS_KEY_dead_abovedot, 1845, 1875, 1878, 1910, 1910, 
-IBUS_KEY_dead_diaeresis, 1910, 1998, 2007, 2031, 2031, 
-IBUS_KEY_dead_abovering, 2031, 2041, 2041, 2041, 2041, 
-IBUS_KEY_dead_doubleacute, 2041, 2051, 2051, 2051, 2051, 
-IBUS_KEY_dead_caron, 2051, 2093, 2093, 2101, 2101, 
-IBUS_KEY_dead_cedilla, 2101, 2113, 2113, 2113, 2113, 
-IBUS_KEY_dead_ogonek, 2113, 2123, 2123, 2123, 2123, 
-IBUS_KEY_dead_iota, 2123, 2145, 2244, 2676, 3336, 
-IBUS_KEY_dead_voiced_sound, 3336, 3382, 3382, 3382, 3382, 
-IBUS_KEY_dead_semivoiced_sound, 3382, 3392, 3392, 3392, 3392, 
-IBUS_KEY_dead_belowdot, 3392, 3408, 3408, 3424, 3424, 
-IBUS_KEY_dead_hook, 3424, 3500, 3500, 3556, 3556, 
-IBUS_KEY_dead_horn, 3556, 3566, 3566, 3566, 3566, 
-IBUS_KEY_dead_psili, 3566, 3594, 3594, 3594, 3594, 
-IBUS_KEY_dead_dasia, 3594, 3626, 3626, 3626, 3626, 
-IBUS_KEY_Multi_key, 3626, 3626, 9566, 13274, 15139, 
+IBUS_KEY_dead_stroke, 150, 238, 250, 250, 250, 
+IBUS_KEY_Greek_accentdieresis, 250, 254, 254, 254, 254, 
+IBUS_KEY_dead_grave, 254, 316, 403, 615, 615, 
+IBUS_KEY_dead_acute, 615, 679, 775, 1051, 1051, 
+IBUS_KEY_dead_circumflex, 1051, 1175, 1175, 1375, 1375, 
+IBUS_KEY_dead_tilde, 1375, 1459, 1522, 1662, 1662, 
+IBUS_KEY_dead_macron, 1662, 1708, 1726, 1798, 1798, 
+IBUS_KEY_dead_breve, 1798, 1848, 1848, 1872, 1872, 
+IBUS_KEY_dead_abovedot, 1872, 1902, 1905, 1941, 1941, 
+IBUS_KEY_dead_diaeresis, 1941, 2029, 2038, 2062, 2062, 
+IBUS_KEY_dead_abovering, 2062, 2072, 2072, 2072, 2072, 
+IBUS_KEY_dead_doubleacute, 2072, 2082, 2082, 2082, 2082, 
+IBUS_KEY_dead_caron, 2082, 2124, 2124, 2132, 2132, 
+IBUS_KEY_dead_cedilla, 2132, 2144, 2144, 2144, 2144, 
+IBUS_KEY_dead_ogonek, 2144, 2154, 2154, 2154, 2154, 
+IBUS_KEY_dead_iota, 2154, 2176, 2275, 2707, 3367, 
+IBUS_KEY_dead_voiced_sound, 3367, 3413, 3413, 3413, 3413, 
+IBUS_KEY_dead_semivoiced_sound, 3413, 3423, 3423, 3423, 3423, 
+IBUS_KEY_dead_belowdot, 3423, 3439, 3439, 3455, 3455, 
+IBUS_KEY_dead_hook, 3455, 3533, 3536, 3592, 3592, 
+IBUS_KEY_dead_horn, 3592, 3602, 3602, 3602, 3602, 
+IBUS_KEY_dead_psili, 3602, 3630, 3630, 3630, 3630, 
+IBUS_KEY_dead_dasia, 3630, 3662, 3662, 3662, 3662, 
+IBUS_KEY_dead_greek, 3662, 3764, 3788, 3788, 3788, 
+IBUS_KEY_Multi_key, 3788, 3788, 10241, 13949, 15824, 
 IBUS_KEY_space, 0x002F, 
 IBUS_KEY_2, 0x01BB, 
 IBUS_KEY_A, 0x023A, 
@@ -136,6 +137,7 @@
 IBUS_KEY_dead_acute, IBUS_KEY_O, 0x01FE, 
 IBUS_KEY_dead_acute, IBUS_KEY_o, 0x01FF, 
 IBUS_KEY_dead_abovedot, IBUS_KEY_j, 0x025F, 
+IBUS_KEY_dead_greek, IBUS_KEY_r, 0x03FC, 
 IBUS_KEY_Greek_iota, 0x0390, 
 IBUS_KEY_Greek_upsilon, 0x03B0, 
 IBUS_KEY_space, 0x0060, 
@@ -617,6 +619,12 @@
 IBUS_KEY_Greek_iota, 0x1FD1, 
 IBUS_KEY_Greek_upsilon, 0x1FE1, 
 IBUS_KEY_dead_macron, 0x00AF, 
+IBUS_KEY_dead_greek, IBUS_KEY_A, 0x1FB9, 
+IBUS_KEY_dead_greek, IBUS_KEY_I, 0x1FD9, 
+IBUS_KEY_dead_greek, IBUS_KEY_U, 0x1FE9, 
+IBUS_KEY_dead_greek, IBUS_KEY_a, 0x1FB1, 
+IBUS_KEY_dead_greek, IBUS_KEY_i, 0x1FD1, 
+IBUS_KEY_dead_greek, IBUS_KEY_u, 0x1FE1, 
 IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_L, 0x1E38, 
 IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_R, 0x1E5C, 
 IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_l, 0x1E39, 
@@ -688,6 +696,7 @@
 IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_s, 0x1E65, 
 IBUS_KEY_Multi_key, IBUS_KEY_c, IBUS_KEY_S, 0x1E66, 
 IBUS_KEY_Multi_key, IBUS_KEY_c, IBUS_KEY_s, 0x1E67, 
+IBUS_KEY_Multi_key, IBUS_KEY_f, IBUS_KEY_s, 0x1E9B, 
 IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_S, 0x1E64, 
 IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_s, 0x1E65, 
 IBUS_KEY_space, 0x0022, 
@@ -1136,6 +1145,7 @@
 IBUS_KEY_n, 0x0272, 
 IBUS_KEY_p, 0x01A5, 
 IBUS_KEY_q, 0x02A0, 
+IBUS_KEY_r, 0x027C, 
 IBUS_KEY_s, 0x0282, 
 IBUS_KEY_t, 0x01AD, 
 IBUS_KEY_v, 0x028B, 
@@ -1149,6 +1159,7 @@
 0x025F, 0x0284, 
 0x0279, 0x027B, 
 IBUS_KEY_dead_hook, 0x0309, 
+IBUS_KEY_dead_greek, IBUS_KEY_U, 0x03D2, 
 IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_O, 0x1EDE, 
 IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_U, 0x1EEC, 
 IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_o, 0x1EDF, 
@@ -1198,6 +1209,65 @@
 IBUS_KEY_Greek_rho, 0x1FE5, 
 IBUS_KEY_Greek_upsilon, 0x1F51, 
 IBUS_KEY_Greek_omega, 0x1F61, 
+IBUS_KEY_space, 0x00B5, 
+IBUS_KEY_A, 0x0391, 
+IBUS_KEY_B, 0x0392, 
+IBUS_KEY_D, 0x0394, 
+IBUS_KEY_E, 0x0395, 
+IBUS_KEY_F, 0x03A6, 
+IBUS_KEY_G, 0x0393, 
+IBUS_KEY_H, 0x0397, 
+IBUS_KEY_I, 0x0399, 
+IBUS_KEY_J, 0x0398, 
+IBUS_KEY_K, 0x039A, 
+IBUS_KEY_L, 0x039B, 
+IBUS_KEY_M, 0x039C, 
+IBUS_KEY_N, 0x039D, 
+IBUS_KEY_O, 0x039F, 
+IBUS_KEY_P, 0x03A0, 
+IBUS_KEY_Q, 0x03A7, 
+IBUS_KEY_R, 0x03A1, 
+IBUS_KEY_S, 0x03A3, 
+IBUS_KEY_T, 0x03A4, 
+IBUS_KEY_U, 0x03A5, 
+IBUS_KEY_W, 0x03A9, 
+IBUS_KEY_X, 0x039E, 
+IBUS_KEY_Y, 0x03A8, 
+IBUS_KEY_Z, 0x0396, 
+IBUS_KEY_a, 0x03B1, 
+IBUS_KEY_b, 0x03B2, 
+IBUS_KEY_d, 0x03B4, 
+IBUS_KEY_e, 0x03B5, 
+IBUS_KEY_f, 0x03C6, 
+IBUS_KEY_g, 0x03B3, 
+IBUS_KEY_h, 0x03B7, 
+IBUS_KEY_i, 0x03B9, 
+IBUS_KEY_j, 0x03B8, 
+IBUS_KEY_k, 0x03BA, 
+IBUS_KEY_l, 0x03BB, 
+IBUS_KEY_m, 0x03BC, 
+IBUS_KEY_n, 0x03BD, 
+IBUS_KEY_o, 0x03BF, 
+IBUS_KEY_p, 0x03C0, 
+IBUS_KEY_q, 0x03C7, 
+IBUS_KEY_r, 0x03C1, 
+IBUS_KEY_s, 0x03C3, 
+IBUS_KEY_t, 0x03C4, 
+IBUS_KEY_u, 0x03C5, 
+IBUS_KEY_w, 0x03C9, 
+IBUS_KEY_x, 0x03BE, 
+IBUS_KEY_y, 0x03C8, 
+IBUS_KEY_z, 0x03B6, 
+IBUS_KEY_nobreakspace, 0x00B5, 
+IBUS_KEY_dead_greek, 0x00B5, 
+IBUS_KEY_dead_stroke, IBUS_KEY_r, 0x03FC, 
+IBUS_KEY_dead_macron, IBUS_KEY_A, 0x1FB9, 
+IBUS_KEY_dead_macron, IBUS_KEY_I, 0x1FD9, 
+IBUS_KEY_dead_macron, IBUS_KEY_U, 0x1FE9, 
+IBUS_KEY_dead_macron, IBUS_KEY_a, 0x1FB1, 
+IBUS_KEY_dead_macron, IBUS_KEY_i, 0x1FD1, 
+IBUS_KEY_dead_macron, IBUS_KEY_u, 0x1FE1, 
+IBUS_KEY_dead_hook, IBUS_KEY_U, 0x03D2, 
 IBUS_KEY_space, IBUS_KEY_space, 0x00A0, 
 IBUS_KEY_space, IBUS_KEY_apostrophe, 0x0027, 
 IBUS_KEY_space, IBUS_KEY_parenleft, 0x02D8, 
@@ -1255,7 +1325,6 @@
 IBUS_KEY_quotedbl, IBUS_KEY_quotedbl, 0x00A8, 
 IBUS_KEY_quotedbl, IBUS_KEY_apostrophe, 0x0344, 
 IBUS_KEY_quotedbl, IBUS_KEY_comma, 0x201E, 
-IBUS_KEY_quotedbl, IBUS_KEY_slash, 0x301E, 
 IBUS_KEY_quotedbl, IBUS_KEY_less, 0x201C, 
 IBUS_KEY_quotedbl, IBUS_KEY_greater, 0x201D, 
 IBUS_KEY_quotedbl, IBUS_KEY_A, 0x00C4, 
@@ -1267,7 +1336,6 @@
 IBUS_KEY_quotedbl, IBUS_KEY_W, 0x1E84, 
 IBUS_KEY_quotedbl, IBUS_KEY_X, 0x1E8C, 
 IBUS_KEY_quotedbl, IBUS_KEY_Y, 0x0178, 
-IBUS_KEY_quotedbl, IBUS_KEY_backslash, 0x301D, 
 IBUS_KEY_quotedbl, IBUS_KEY_a, 0x00E4, 
 IBUS_KEY_quotedbl, IBUS_KEY_e, 0x00EB, 
 IBUS_KEY_quotedbl, IBUS_KEY_h, 0x1E27, 
@@ -1316,8 +1384,12 @@
 IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon, 0x03CB, 
 IBUS_KEY_quotedbl, IBUS_KEY_dead_acute, 0x0344, 
 IBUS_KEY_numbersign, IBUS_KEY_numbersign, 0x266F, 
+IBUS_KEY_numbersign, IBUS_KEY_E, 0x266B, 
+IBUS_KEY_numbersign, IBUS_KEY_S, 0x266C, 
 IBUS_KEY_numbersign, IBUS_KEY_b, 0x266D, 
+IBUS_KEY_numbersign, IBUS_KEY_e, 0x266A, 
 IBUS_KEY_numbersign, IBUS_KEY_f, 0x266E, 
+IBUS_KEY_numbersign, IBUS_KEY_q, 0x2669, 
 IBUS_KEY_percent, IBUS_KEY_o, 0x2030, 
 IBUS_KEY_apostrophe, IBUS_KEY_space, 0x0027, 
 IBUS_KEY_apostrophe, IBUS_KEY_apostrophe, 0x00B4, 
@@ -1433,6 +1505,7 @@
 IBUS_KEY_apostrophe, 0x1F61, 0x1F65, 
 IBUS_KEY_apostrophe, 0x1F68, 0x1F6C, 
 IBUS_KEY_apostrophe, 0x1F69, 0x1F6D, 
+IBUS_KEY_apostrophe, 0x2395, 0x235E, 
 IBUS_KEY_parenleft, IBUS_KEY_space, 0x02D8, 
 IBUS_KEY_parenleft, IBUS_KEY_parenleft, 0x005B, 
 IBUS_KEY_parenleft, IBUS_KEY_minus, 0x007B, 
@@ -1479,6 +1552,8 @@
 IBUS_KEY_asterisk, IBUS_KEY_U, 0x016E, 
 IBUS_KEY_asterisk, IBUS_KEY_a, 0x00E5, 
 IBUS_KEY_asterisk, IBUS_KEY_u, 0x016F, 
+IBUS_KEY_asterisk, IBUS_KEY_diaeresis, 0x2363, 
+IBUS_KEY_asterisk, IBUS_KEY_emopencircle, 0x235F, 
 IBUS_KEY_plus, IBUS_KEY_plus, 0x0023, 
 IBUS_KEY_plus, IBUS_KEY_minus, 0x00B1, 
 IBUS_KEY_plus, IBUS_KEY_O, 0x01A0, 
@@ -1523,6 +1598,7 @@
 IBUS_KEY_minus, IBUS_KEY_parenright, 0x007D, 
 IBUS_KEY_minus, IBUS_KEY_plus, 0x00B1, 
 IBUS_KEY_minus, IBUS_KEY_comma, 0x00AC, 
+IBUS_KEY_minus, IBUS_KEY_slash, 0x233F, 
 IBUS_KEY_minus, IBUS_KEY_colon, 0x00F7, 
 IBUS_KEY_minus, IBUS_KEY_greater, 0x2192, 
 IBUS_KEY_minus, IBUS_KEY_A, 0x00C3, 
@@ -1534,6 +1610,7 @@
 IBUS_KEY_minus, IBUS_KEY_O, 0x00D5, 
 IBUS_KEY_minus, IBUS_KEY_U, 0x016A, 
 IBUS_KEY_minus, IBUS_KEY_Y, 0x00A5, 
+IBUS_KEY_minus, IBUS_KEY_backslash, 0x2340, 
 IBUS_KEY_minus, IBUS_KEY_asciicircum, 0x00AF, 
 IBUS_KEY_minus, IBUS_KEY_a, 0x0101, 
 IBUS_KEY_minus, IBUS_KEY_d, 0x0111, 
@@ -1544,8 +1621,12 @@
 IBUS_KEY_minus, IBUS_KEY_o, 0x014D, 
 IBUS_KEY_minus, IBUS_KEY_u, 0x016B, 
 IBUS_KEY_minus, IBUS_KEY_y, 0x00A5, 
+IBUS_KEY_minus, 0x2191, 0x234F, 
+IBUS_KEY_minus, 0x2193, 0x2356, 
+IBUS_KEY_minus, IBUS_KEY_emopencircle, 0x2296, 
 IBUS_KEY_period, IBUS_KEY_minus, 0x00B7, 
 IBUS_KEY_period, IBUS_KEY_period, 0x2026, 
+IBUS_KEY_period, IBUS_KEY_colon, 0x2235, 
 IBUS_KEY_period, IBUS_KEY_less, 0x2039, 
 IBUS_KEY_period, IBUS_KEY_equal, 0x2022, 
 IBUS_KEY_period, IBUS_KEY_greater, 0x203A, 
@@ -1597,6 +1678,8 @@
 IBUS_KEY_period, IBUS_KEY_scaron, 0x1E67, 
 IBUS_KEY_period, 0x1E62, 0x1E68, 
 IBUS_KEY_period, 0x1E63, 0x1E69, 
+IBUS_KEY_period, IBUS_KEY_emopencircle, 0x2299, 
+IBUS_KEY_slash, IBUS_KEY_minus, 0x233F, 
 IBUS_KEY_slash, IBUS_KEY_slash, 0x005C, 
 IBUS_KEY_slash, IBUS_KEY_less, 0x005C, 
 IBUS_KEY_slash, IBUS_KEY_equal, 0x2260, 
@@ -1622,6 +1705,7 @@
 IBUS_KEY_slash, IBUS_KEY_o, 0x00F8, 
 IBUS_KEY_slash, IBUS_KEY_t, 0x0167, 
 IBUS_KEY_slash, IBUS_KEY_u, 0x00B5, 
+IBUS_KEY_slash, IBUS_KEY_v, 0x221A, 
 IBUS_KEY_slash, IBUS_KEY_z, 0x01B6, 
 IBUS_KEY_slash, 0x0294, 0x02A1, 
 IBUS_KEY_slash, 0x04AE, 0x04B0, 
@@ -1633,7 +1717,9 @@
 IBUS_KEY_slash, IBUS_KEY_leftarrow, 0x219A, 
 IBUS_KEY_slash, IBUS_KEY_rightarrow, 0x219B, 
 IBUS_KEY_slash, 0x2194, 0x21AE, 
+IBUS_KEY_slash, 0x2395, 0x2341, 
 IBUS_KEY_0, IBUS_KEY_asterisk, 0x00B0, 
+IBUS_KEY_0, IBUS_KEY_3, 0x2189, 
 IBUS_KEY_0, IBUS_KEY_C, 0x00A9, 
 IBUS_KEY_0, IBUS_KEY_S, 0x00A7, 
 IBUS_KEY_0, IBUS_KEY_X, 0x00A4, 
@@ -1641,12 +1727,15 @@
 IBUS_KEY_0, IBUS_KEY_c, 0x00A9, 
 IBUS_KEY_0, IBUS_KEY_s, 0x00A7, 
 IBUS_KEY_0, IBUS_KEY_x, 0x00A4, 
+IBUS_KEY_0, IBUS_KEY_asciitilde, 0x236C, 
 IBUS_KEY_1, IBUS_KEY_2, 0x00BD, 
 IBUS_KEY_1, IBUS_KEY_3, 0x2153, 
 IBUS_KEY_1, IBUS_KEY_4, 0x00BC, 
 IBUS_KEY_1, IBUS_KEY_5, 0x2155, 
 IBUS_KEY_1, IBUS_KEY_6, 0x2159, 
+IBUS_KEY_1, IBUS_KEY_7, 0x2150, 
 IBUS_KEY_1, IBUS_KEY_8, 0x215B, 
+IBUS_KEY_1, IBUS_KEY_9, 0x2151, 
 IBUS_KEY_1, IBUS_KEY_S, 0x00B9, 
 IBUS_KEY_1, IBUS_KEY_asciicircum, 0x00B9, 
 IBUS_KEY_1, IBUS_KEY_s, 0x00B9, 
@@ -1665,14 +1754,18 @@
 IBUS_KEY_5, IBUS_KEY_6, 0x215A, 
 IBUS_KEY_5, IBUS_KEY_8, 0x215D, 
 IBUS_KEY_7, IBUS_KEY_8, 0x215E, 
+IBUS_KEY_8, IBUS_KEY_8, 0x221E, 
 IBUS_KEY_colon, IBUS_KEY_parenleft, 0x2639, 
 IBUS_KEY_colon, IBUS_KEY_parenright, 0x263A, 
 IBUS_KEY_colon, IBUS_KEY_minus, 0x00F7, 
+IBUS_KEY_colon, IBUS_KEY_period, 0x2234, 
+IBUS_KEY_colon, 0x2395, 0x2360, 
 IBUS_KEY_semicolon, IBUS_KEY_A, 0x0104, 
 IBUS_KEY_semicolon, IBUS_KEY_E, 0x0118, 
 IBUS_KEY_semicolon, IBUS_KEY_I, 0x012E, 
 IBUS_KEY_semicolon, IBUS_KEY_O, 0x01EA, 
 IBUS_KEY_semicolon, IBUS_KEY_U, 0x0172, 
+IBUS_KEY_semicolon, IBUS_KEY_underscore, 0x236E, 
 IBUS_KEY_semicolon, IBUS_KEY_a, 0x0105, 
 IBUS_KEY_semicolon, IBUS_KEY_e, 0x0119, 
 IBUS_KEY_semicolon, IBUS_KEY_i, 0x012F, 
@@ -1686,6 +1779,7 @@
 IBUS_KEY_less, IBUS_KEY_3, 0x2665, 
 IBUS_KEY_less, IBUS_KEY_less, 0x00AB, 
 IBUS_KEY_less, IBUS_KEY_equal, 0x2264, 
+IBUS_KEY_less, IBUS_KEY_greater, 0x22C4, 
 IBUS_KEY_less, IBUS_KEY_C, 0x010C, 
 IBUS_KEY_less, IBUS_KEY_D, 0x010E, 
 IBUS_KEY_less, IBUS_KEY_E, 0x011A, 
@@ -1695,6 +1789,7 @@
 IBUS_KEY_less, IBUS_KEY_S, 0x0160, 
 IBUS_KEY_less, IBUS_KEY_T, 0x0164, 
 IBUS_KEY_less, IBUS_KEY_Z, 0x017D, 
+IBUS_KEY_less, IBUS_KEY_underscore, 0x2264, 
 IBUS_KEY_less, IBUS_KEY_c, 0x010D, 
 IBUS_KEY_less, IBUS_KEY_d, 0x010F, 
 IBUS_KEY_less, IBUS_KEY_e, 0x011B, 
@@ -1705,6 +1800,7 @@
 IBUS_KEY_less, IBUS_KEY_t, 0x0165, 
 IBUS_KEY_less, IBUS_KEY_z, 0x017E, 
 IBUS_KEY_less, 0x0338, 0x226E, 
+IBUS_KEY_less, 0x2395, 0x2343, 
 IBUS_KEY_equal, IBUS_KEY_slash, 0x2260, 
 IBUS_KEY_equal, IBUS_KEY_C, 0x20AC, 
 IBUS_KEY_equal, IBUS_KEY_E, 0x20AC, 
@@ -1714,7 +1810,9 @@
 IBUS_KEY_equal, IBUS_KEY_U, 0x0170, 
 IBUS_KEY_equal, IBUS_KEY_W, 0x20A9, 
 IBUS_KEY_equal, IBUS_KEY_Y, 0x00A5, 
+IBUS_KEY_equal, IBUS_KEY_underscore, 0x2261, 
 IBUS_KEY_equal, IBUS_KEY_c, 0x20AC, 
+IBUS_KEY_equal, IBUS_KEY_d, 0x20AB, 
 IBUS_KEY_equal, IBUS_KEY_e, 0x20AC, 
 IBUS_KEY_equal, IBUS_KEY_l, 0x00A3, 
 IBUS_KEY_equal, IBUS_KEY_o, 0x0151, 
@@ -1725,9 +1823,11 @@
 IBUS_KEY_equal, IBUS_KEY_Cyrillic_IE, 0x20AC, 
 IBUS_KEY_equal, IBUS_KEY_Cyrillic_ES, 0x20AC, 
 IBUS_KEY_equal, IBUS_KEY_Cyrillic_U, 0x04F2, 
+IBUS_KEY_equal, 0x2395, 0x2338, 
 IBUS_KEY_greater, IBUS_KEY_space, 0x005E, 
 IBUS_KEY_greater, IBUS_KEY_quotedbl, 0x201D, 
 IBUS_KEY_greater, IBUS_KEY_apostrophe, 0x2019, 
+IBUS_KEY_greater, IBUS_KEY_less, 0x22C4, 
 IBUS_KEY_greater, IBUS_KEY_equal, 0x2265, 
 IBUS_KEY_greater, IBUS_KEY_greater, 0x00BB, 
 IBUS_KEY_greater, IBUS_KEY_A, 0x00C2, 
@@ -1735,12 +1835,15 @@
 IBUS_KEY_greater, IBUS_KEY_I, 0x00CE, 
 IBUS_KEY_greater, IBUS_KEY_O, 0x00D4, 
 IBUS_KEY_greater, IBUS_KEY_U, 0x00DB, 
+IBUS_KEY_greater, IBUS_KEY_underscore, 0x2265, 
 IBUS_KEY_greater, IBUS_KEY_a, 0x00E2, 
 IBUS_KEY_greater, IBUS_KEY_e, 0x00EA, 
 IBUS_KEY_greater, IBUS_KEY_i, 0x00EE, 
 IBUS_KEY_greater, IBUS_KEY_o, 0x00F4, 
 IBUS_KEY_greater, IBUS_KEY_u, 0x00FB, 
+IBUS_KEY_greater, IBUS_KEY_diaeresis, 0x2369, 
 IBUS_KEY_greater, 0x0338, 0x226F, 
+IBUS_KEY_greater, 0x2395, 0x2344, 
 IBUS_KEY_question, IBUS_KEY_exclam, 0x2E18, 
 IBUS_KEY_question, IBUS_KEY_question, 0x00BF, 
 IBUS_KEY_question, IBUS_KEY_A, 0x1EA2, 
@@ -1763,6 +1866,7 @@
 IBUS_KEY_question, IBUS_KEY_ocircumflex, 0x1ED5, 
 IBUS_KEY_question, IBUS_KEY_Abreve, 0x1EB2, 
 IBUS_KEY_question, IBUS_KEY_abreve, 0x1EB3, 
+IBUS_KEY_question, 0x2395, 0x2370, 
 IBUS_KEY_A, IBUS_KEY_quotedbl, 0x00C4, 
 IBUS_KEY_A, IBUS_KEY_apostrophe, 0x00C1, 
 IBUS_KEY_A, IBUS_KEY_parenleft, 0x0102, 
@@ -1792,6 +1896,7 @@
 IBUS_KEY_C, IBUS_KEY_o, 0x00A9, 
 IBUS_KEY_C, IBUS_KEY_r, 0x20A2, 
 IBUS_KEY_C, IBUS_KEY_bar, 0x00A2, 
+IBUS_KEY_D, IBUS_KEY_comma, 0x1E10, 
 IBUS_KEY_D, IBUS_KEY_minus, 0x0110, 
 IBUS_KEY_D, IBUS_KEY_period, 0x1E0A, 
 IBUS_KEY_D, IBUS_KEY_less, 0x010E, 
@@ -1810,21 +1915,26 @@
 IBUS_KEY_E, IBUS_KEY_diaeresis, 0x00CB, 
 IBUS_KEY_E, IBUS_KEY_acute, 0x00C9, 
 IBUS_KEY_F, IBUS_KEY_period, 0x1E1E, 
+IBUS_KEY_F, IBUS_KEY_i, 0xFB03, 
+IBUS_KEY_F, IBUS_KEY_l, 0xFB04, 
 IBUS_KEY_F, IBUS_KEY_r, 0x20A3, 
 IBUS_KEY_G, IBUS_KEY_parenleft, 0x011E, 
 IBUS_KEY_G, IBUS_KEY_comma, 0x0122, 
 IBUS_KEY_G, IBUS_KEY_period, 0x0120, 
 IBUS_KEY_G, IBUS_KEY_U, 0x011E, 
 IBUS_KEY_G, IBUS_KEY_breve, 0x011E, 
+IBUS_KEY_H, IBUS_KEY_comma, 0x1E28, 
 IBUS_KEY_I, IBUS_KEY_quotedbl, 0x00CF, 
 IBUS_KEY_I, IBUS_KEY_apostrophe, 0x00CD, 
 IBUS_KEY_I, IBUS_KEY_comma, 0x012E, 
 IBUS_KEY_I, IBUS_KEY_minus, 0x012A, 
 IBUS_KEY_I, IBUS_KEY_period, 0x0130, 
 IBUS_KEY_I, IBUS_KEY_greater, 0x00CE, 
+IBUS_KEY_I, IBUS_KEY_J, 0x0132, 
 IBUS_KEY_I, IBUS_KEY_asciicircum, 0x00CE, 
 IBUS_KEY_I, IBUS_KEY_underscore, 0x012A, 
 IBUS_KEY_I, IBUS_KEY_grave, 0x00CC, 
+IBUS_KEY_I, IBUS_KEY_j, 0x0132, 
 IBUS_KEY_I, IBUS_KEY_asciitilde, 0x0128, 
 IBUS_KEY_I, IBUS_KEY_diaeresis, 0x00CF, 
 IBUS_KEY_I, IBUS_KEY_acute, 0x00CD, 
@@ -1889,6 +1999,7 @@
 IBUS_KEY_S, IBUS_KEY_S, 0x1E9E, 
 IBUS_KEY_S, IBUS_KEY_m, 0x2120, 
 IBUS_KEY_S, IBUS_KEY_cedilla, 0x015E, 
+IBUS_KEY_T, IBUS_KEY_comma, 0x0162, 
 IBUS_KEY_T, IBUS_KEY_minus, 0x0166, 
 IBUS_KEY_T, IBUS_KEY_period, 0x1E6A, 
 IBUS_KEY_T, IBUS_KEY_slash, 0x0166, 
@@ -1957,6 +2068,11 @@
 IBUS_KEY_Z, IBUS_KEY_apostrophe, 0x0179, 
 IBUS_KEY_Z, IBUS_KEY_period, 0x017B, 
 IBUS_KEY_Z, IBUS_KEY_less, 0x017D, 
+IBUS_KEY_bracketleft, IBUS_KEY_bracketright, 0x2337, 
+IBUS_KEY_backslash, IBUS_KEY_minus, 0x2340, 
+IBUS_KEY_backslash, 0x2395, 0x2342, 
+IBUS_KEY_backslash, IBUS_KEY_emopencircle, 0x2349, 
+IBUS_KEY_bracketright, IBUS_KEY_bracketleft, 0x2337, 
 IBUS_KEY_asciicircum, IBUS_KEY_space, 0x005E, 
 IBUS_KEY_asciicircum, IBUS_KEY_parenleft, 0x207D, 
 IBUS_KEY_asciicircum, IBUS_KEY_parenright, 0x207E, 
@@ -2036,6 +2152,7 @@
 IBUS_KEY_asciicircum, IBUS_KEY_KP_8, 0x2078, 
 IBUS_KEY_asciicircum, IBUS_KEY_KP_9, 0x2079, 
 IBUS_KEY_asciicircum, IBUS_KEY_KP_Equal, 0x207C, 
+IBUS_KEY_underscore, IBUS_KEY_apostrophe, 0x2358, 
 IBUS_KEY_underscore, IBUS_KEY_parenleft, 0x208D, 
 IBUS_KEY_underscore, IBUS_KEY_parenright, 0x208E, 
 IBUS_KEY_underscore, IBUS_KEY_plus, 0x208A, 
@@ -2049,7 +2166,9 @@
 IBUS_KEY_underscore, IBUS_KEY_7, 0x2087, 
 IBUS_KEY_underscore, IBUS_KEY_8, 0x2088, 
 IBUS_KEY_underscore, IBUS_KEY_9, 0x2089, 
+IBUS_KEY_underscore, IBUS_KEY_less, 0x2264, 
 IBUS_KEY_underscore, IBUS_KEY_equal, 0x208C, 
+IBUS_KEY_underscore, IBUS_KEY_greater, 0x2265, 
 IBUS_KEY_underscore, IBUS_KEY_A, 0x0100, 
 IBUS_KEY_underscore, IBUS_KEY_E, 0x0112, 
 IBUS_KEY_underscore, IBUS_KEY_G, 0x1E20, 
@@ -2096,7 +2215,19 @@
 IBUS_KEY_underscore, 0x1E37, 0x1E39, 
 IBUS_KEY_underscore, 0x1E5A, 0x1E5C, 
 IBUS_KEY_underscore, 0x1E5B, 0x1E5D, 
+IBUS_KEY_underscore, 0x2206, 0x2359, 
+IBUS_KEY_underscore, 0x220A, 0x2377, 
 IBUS_KEY_underscore, 0x2212, 0x208B, 
+IBUS_KEY_underscore, 0x2218, 0x235B, 
+IBUS_KEY_underscore, 0x2260, 0x2262, 
+IBUS_KEY_underscore, 0x2282, 0x2286, 
+IBUS_KEY_underscore, 0x2283, 0x2287, 
+IBUS_KEY_underscore, IBUS_KEY_downtack, 0x234A, 
+IBUS_KEY_underscore, 0x22C4, 0x235A, 
+IBUS_KEY_underscore, 0x2373, 0x2378, 
+IBUS_KEY_underscore, 0x2375, 0x2379, 
+IBUS_KEY_underscore, 0x237A, 0x2376, 
+IBUS_KEY_underscore, IBUS_KEY_emopencircle, 0x235C, 
 IBUS_KEY_underscore, IBUS_KEY_KP_Space, 0x2082, 
 IBUS_KEY_underscore, IBUS_KEY_KP_Add, 0x208A, 
 IBUS_KEY_underscore, IBUS_KEY_KP_0, 0x2080, 
@@ -2279,12 +2410,13 @@
 IBUS_KEY_c, IBUS_KEY_bar, 0x00A2, 
 IBUS_KEY_c, IBUS_KEY_Udiaeresis, 0x01D9, 
 IBUS_KEY_c, IBUS_KEY_udiaeresis, 0x01DA, 
-IBUS_KEY_c, 0x01B7, 0x01EE, 
-IBUS_KEY_c, 0x0292, 0x01EF, 
-IBUS_KEY_d, IBUS_KEY_minus, 0x20AB, 
+IBUS_KEY_d, IBUS_KEY_comma, 0x1E11, 
+IBUS_KEY_d, IBUS_KEY_minus, 0x0111, 
 IBUS_KEY_d, IBUS_KEY_period, 0x1E0B, 
 IBUS_KEY_d, IBUS_KEY_less, 0x010F, 
+IBUS_KEY_d, IBUS_KEY_equal, 0x20AB, 
 IBUS_KEY_d, IBUS_KEY_h, 0x00F0, 
+IBUS_KEY_d, IBUS_KEY_i, 0x2300, 
 IBUS_KEY_e, IBUS_KEY_quotedbl, 0x00EB, 
 IBUS_KEY_e, IBUS_KEY_apostrophe, 0x00E9, 
 IBUS_KEY_e, IBUS_KEY_comma, 0x0119, 
@@ -2301,21 +2433,27 @@
 IBUS_KEY_e, IBUS_KEY_acute, 0x00E9, 
 IBUS_KEY_f, IBUS_KEY_period, 0x1E1F, 
 IBUS_KEY_f, IBUS_KEY_S, 0x017F, 
+IBUS_KEY_f, IBUS_KEY_f, 0xFB00, 
+IBUS_KEY_f, IBUS_KEY_i, 0xFB01, 
+IBUS_KEY_f, IBUS_KEY_l, 0xFB02, 
 IBUS_KEY_f, IBUS_KEY_s, 0x017F, 
 IBUS_KEY_g, IBUS_KEY_parenleft, 0x011F, 
 IBUS_KEY_g, IBUS_KEY_comma, 0x0123, 
 IBUS_KEY_g, IBUS_KEY_period, 0x0121, 
 IBUS_KEY_g, IBUS_KEY_U, 0x011F, 
 IBUS_KEY_g, IBUS_KEY_breve, 0x011F, 
+IBUS_KEY_h, IBUS_KEY_comma, 0x1E29, 
 IBUS_KEY_i, IBUS_KEY_quotedbl, 0x00EF, 
 IBUS_KEY_i, IBUS_KEY_apostrophe, 0x00ED, 
 IBUS_KEY_i, IBUS_KEY_comma, 0x012F, 
 IBUS_KEY_i, IBUS_KEY_minus, 0x012B, 
 IBUS_KEY_i, IBUS_KEY_period, 0x0131, 
+IBUS_KEY_i, IBUS_KEY_semicolon, 0x012F, 
 IBUS_KEY_i, IBUS_KEY_greater, 0x00EE, 
 IBUS_KEY_i, IBUS_KEY_asciicircum, 0x00EE, 
 IBUS_KEY_i, IBUS_KEY_underscore, 0x012B, 
 IBUS_KEY_i, IBUS_KEY_grave, 0x00EC, 
+IBUS_KEY_i, IBUS_KEY_j, 0x0133, 
 IBUS_KEY_i, IBUS_KEY_asciitilde, 0x0129, 
 IBUS_KEY_i, IBUS_KEY_diaeresis, 0x00EF, 
 IBUS_KEY_i, IBUS_KEY_acute, 0x00ED, 
@@ -2382,6 +2520,7 @@
 IBUS_KEY_s, IBUS_KEY_o, 0x00A7, 
 IBUS_KEY_s, IBUS_KEY_s, 0x00DF, 
 IBUS_KEY_s, IBUS_KEY_cedilla, 0x015F, 
+IBUS_KEY_t, IBUS_KEY_comma, 0x0163, 
 IBUS_KEY_t, IBUS_KEY_minus, 0x0167, 
 IBUS_KEY_t, IBUS_KEY_period, 0x1E6B, 
 IBUS_KEY_t, IBUS_KEY_slash, 0x0167, 
@@ -2403,6 +2542,7 @@
 IBUS_KEY_u, IBUS_KEY_asciitilde, 0x0169, 
 IBUS_KEY_u, IBUS_KEY_diaeresis, 0x00FC, 
 IBUS_KEY_u, IBUS_KEY_acute, 0x00FA, 
+IBUS_KEY_v, IBUS_KEY_slash, 0x221A, 
 IBUS_KEY_v, IBUS_KEY_Z, 0x017D, 
 IBUS_KEY_v, IBUS_KEY_l, 0x007C, 
 IBUS_KEY_v, IBUS_KEY_z, 0x017E, 
@@ -2421,9 +2561,19 @@
 IBUS_KEY_z, IBUS_KEY_apostrophe, 0x017A, 
 IBUS_KEY_z, IBUS_KEY_period, 0x017C, 
 IBUS_KEY_z, IBUS_KEY_less, 0x017E, 
+IBUS_KEY_braceleft, IBUS_KEY_braceright, 0x2205, 
 IBUS_KEY_bar, IBUS_KEY_C, 0x00A2, 
 IBUS_KEY_bar, IBUS_KEY_c, 0x00A2, 
+IBUS_KEY_bar, IBUS_KEY_asciitilde, 0x236D, 
+IBUS_KEY_bar, 0x2190, 0x2345, 
+IBUS_KEY_bar, 0x2192, 0x2346, 
+IBUS_KEY_bar, 0x2206, 0x234B, 
+IBUS_KEY_bar, 0x2207, 0x2352, 
+IBUS_KEY_bar, IBUS_KEY_union, 0x2366, 
+IBUS_KEY_bar, 0x2282, 0x2367, 
+IBUS_KEY_bar, IBUS_KEY_emopencircle, 0x233D, 
 IBUS_KEY_asciitilde, IBUS_KEY_space, 0x007E, 
+IBUS_KEY_asciitilde, IBUS_KEY_0, 0x236C, 
 IBUS_KEY_asciitilde, IBUS_KEY_A, 0x00C3, 
 IBUS_KEY_asciitilde, IBUS_KEY_E, 0x1EBC, 
 IBUS_KEY_asciitilde, IBUS_KEY_I, 0x0128, 
@@ -2440,6 +2590,8 @@
 IBUS_KEY_asciitilde, IBUS_KEY_u, 0x0169, 
 IBUS_KEY_asciitilde, IBUS_KEY_v, 0x1E7D, 
 IBUS_KEY_asciitilde, IBUS_KEY_y, 0x1EF9, 
+IBUS_KEY_asciitilde, IBUS_KEY_bar, 0x236D, 
+IBUS_KEY_asciitilde, IBUS_KEY_diaeresis, 0x2368, 
 IBUS_KEY_asciitilde, IBUS_KEY_Acircumflex, 0x1EAA, 
 IBUS_KEY_asciitilde, IBUS_KEY_Ecircumflex, 0x1EC4, 
 IBUS_KEY_asciitilde, IBUS_KEY_Ocircumflex, 0x1ED6, 
@@ -2474,7 +2626,12 @@
 IBUS_KEY_asciitilde, 0x1F61, 0x1F67, 
 IBUS_KEY_asciitilde, 0x1F68, 0x1F6E, 
 IBUS_KEY_asciitilde, 0x1F69, 0x1F6F, 
+IBUS_KEY_asciitilde, 0x2207, 0x236B, 
+IBUS_KEY_asciitilde, 0x2227, 0x2372, 
+IBUS_KEY_asciitilde, 0x2228, 0x2371, 
 IBUS_KEY_diaeresis, IBUS_KEY_apostrophe, 0x0385, 
+IBUS_KEY_diaeresis, IBUS_KEY_asterisk, 0x2363, 
+IBUS_KEY_diaeresis, IBUS_KEY_greater, 0x2369, 
 IBUS_KEY_diaeresis, IBUS_KEY_A, 0x00C4, 
 IBUS_KEY_diaeresis, IBUS_KEY_E, 0x00CB, 
 IBUS_KEY_diaeresis, IBUS_KEY_I, 0x00CF, 
@@ -2490,6 +2647,10 @@
 IBUS_KEY_diaeresis, IBUS_KEY_y, 0x00FF, 
 IBUS_KEY_diaeresis, IBUS_KEY_asciitilde, 0x1FC1, 
 IBUS_KEY_diaeresis, IBUS_KEY_acute, 0x0385, 
+IBUS_KEY_diaeresis, 0x2207, 0x2362, 
+IBUS_KEY_diaeresis, 0x2218, 0x2364, 
+IBUS_KEY_diaeresis, IBUS_KEY_uptack, 0x2361, 
+IBUS_KEY_diaeresis, IBUS_KEY_emopencircle, 0x2365, 
 IBUS_KEY_diaeresis, IBUS_KEY_dead_grave, 0x1FED, 
 IBUS_KEY_diaeresis, IBUS_KEY_dead_acute, 0x0385, 
 IBUS_KEY_diaeresis, IBUS_KEY_dead_tilde, 0x1FC1, 
@@ -2537,6 +2698,7 @@
 IBUS_KEY_macron, 0x1E37, 0x1E39, 
 IBUS_KEY_macron, 0x1E5A, 0x1E5C, 
 IBUS_KEY_macron, 0x1E5B, 0x1E5D, 
+IBUS_KEY_macron, IBUS_KEY_uptack, 0x2351, 
 IBUS_KEY_acute, IBUS_KEY_A, 0x00C1, 
 IBUS_KEY_acute, IBUS_KEY_C, 0x0106, 
 IBUS_KEY_acute, IBUS_KEY_E, 0x00C9, 
@@ -2668,6 +2830,7 @@
 IBUS_KEY_cedilla, IBUS_KEY_r, 0x0157, 
 IBUS_KEY_cedilla, IBUS_KEY_s, 0x015F, 
 IBUS_KEY_cedilla, IBUS_KEY_t, 0x0163, 
+IBUS_KEY_division, 0x2395, 0x2339, 
 IBUS_KEY_breve, IBUS_KEY_G, 0x011E, 
 IBUS_KEY_breve, IBUS_KEY_g, 0x011F, 
 0x05B4, IBUS_KEY_hebrew_yod, 0xFB1D, 
@@ -3121,15 +3284,48 @@
 0x1FFE, IBUS_KEY_dead_grave, 0x1FDD, 
 0x1FFE, IBUS_KEY_dead_acute, 0x1FDE, 
 0x1FFE, IBUS_KEY_dead_tilde, 0x1FDF, 
+0x2190, IBUS_KEY_bar, 0x2345, 
+0x2190, 0x2395, 0x2347, 
+0x2191, IBUS_KEY_minus, 0x234F, 
+0x2191, 0x2395, 0x2350, 
+0x2192, IBUS_KEY_bar, 0x2346, 
+0x2192, 0x2395, 0x2348, 
+0x2193, IBUS_KEY_minus, 0x2356, 
+0x2193, 0x2395, 0x2357, 
 0x2203, 0x0338, 0x2204, 
+0x2206, IBUS_KEY_underscore, 0x2359, 
+0x2206, IBUS_KEY_bar, 0x234B, 
+0x2206, 0x2395, 0x234D, 
+0x2207, IBUS_KEY_bar, 0x2352, 
+0x2207, IBUS_KEY_asciitilde, 0x236B, 
+0x2207, IBUS_KEY_diaeresis, 0x2362, 
+0x2207, 0x2395, 0x2354, 
 0x2208, 0x0338, 0x2209, 
+0x220A, IBUS_KEY_underscore, 0x2377, 
 0x220B, 0x0338, 0x220C, 
+0x2218, IBUS_KEY_underscore, 0x235B, 
+0x2218, IBUS_KEY_diaeresis, 0x2364, 
+0x2218, 0x2229, 0x235D, 
+0x2218, IBUS_KEY_uptack, 0x2355, 
+0x2218, IBUS_KEY_downtack, 0x234E, 
+0x2218, 0x2395, 0x233B, 
+0x2218, IBUS_KEY_emopencircle, 0x233E, 
 0x2223, 0x0338, 0x2224, 
 0x2225, 0x0338, 0x2226, 
+0x2227, IBUS_KEY_asciitilde, 0x2372, 
+0x2227, 0x2228, 0x22C4, 
+0x2227, 0x2395, 0x2353, 
+0x2228, IBUS_KEY_asciitilde, 0x2371, 
+0x2228, 0x2227, 0x22C4, 
+0x2228, 0x2395, 0x234C, 
+0x2229, 0x2218, 0x235D, 
+IBUS_KEY_union, IBUS_KEY_bar, 0x2366, 
 0x223C, 0x0338, 0x2241, 
 0x2243, 0x0338, 0x2244, 
 0x2248, 0x0338, 0x2249, 
 0x224D, 0x0338, 0x226D, 
+0x2260, IBUS_KEY_underscore, 0x2262, 
+0x2260, 0x2395, 0x236F, 
 0x2272, 0x0338, 0x2274, 
 0x2273, 0x0338, 0x2275, 
 0x2276, 0x0338, 0x2278, 
@@ -3138,10 +3334,20 @@
 0x227B, 0x0338, 0x2281, 
 0x227C, 0x0338, 0x22E0, 
 0x227D, 0x0338, 0x22E1, 
+0x2282, IBUS_KEY_underscore, 0x2286, 
+0x2282, IBUS_KEY_bar, 0x2367, 
+0x2283, IBUS_KEY_underscore, 0x2287, 
 0x2286, 0x0338, 0x2288, 
 0x2287, 0x0338, 0x2289, 
 0x2291, 0x0338, 0x22E2, 
 0x2292, 0x0338, 0x22E3, 
+IBUS_KEY_uptack, IBUS_KEY_diaeresis, 0x2361, 
+IBUS_KEY_uptack, IBUS_KEY_macron, 0x2351, 
+IBUS_KEY_uptack, 0x2218, 0x2355, 
+IBUS_KEY_uptack, IBUS_KEY_downtack, 0x2336, 
+IBUS_KEY_downtack, IBUS_KEY_underscore, 0x234A, 
+IBUS_KEY_downtack, 0x2218, 0x234E, 
+IBUS_KEY_downtack, IBUS_KEY_uptack, 0x2336, 
 0x22A8, 0x0338, 0x22AD, 
 0x22A9, 0x0338, 0x22AE, 
 0x22AB, 0x0338, 0x22AF, 
@@ -3149,6 +3355,41 @@
 0x22B3, 0x0338, 0x22EB, 
 0x22B4, 0x0338, 0x22EC, 
 0x22B5, 0x0338, 0x22ED, 
+0x22C4, IBUS_KEY_underscore, 0x235A, 
+0x22C4, 0x2395, 0x233A, 
+0x2373, IBUS_KEY_underscore, 0x2378, 
+0x2375, IBUS_KEY_underscore, 0x2379, 
+0x237A, IBUS_KEY_underscore, 0x2376, 
+0x2395, IBUS_KEY_apostrophe, 0x235E, 
+0x2395, IBUS_KEY_slash, 0x2341, 
+0x2395, IBUS_KEY_colon, 0x2360, 
+0x2395, IBUS_KEY_less, 0x2343, 
+0x2395, IBUS_KEY_equal, 0x2338, 
+0x2395, IBUS_KEY_greater, 0x2344, 
+0x2395, IBUS_KEY_question, 0x2370, 
+0x2395, IBUS_KEY_backslash, 0x2342, 
+0x2395, IBUS_KEY_division, 0x2339, 
+0x2395, 0x2190, 0x2347, 
+0x2395, 0x2191, 0x2350, 
+0x2395, 0x2192, 0x2348, 
+0x2395, 0x2193, 0x2357, 
+0x2395, 0x2206, 0x234D, 
+0x2395, 0x2207, 0x2354, 
+0x2395, 0x2218, 0x233B, 
+0x2395, 0x2227, 0x2353, 
+0x2395, 0x2228, 0x234C, 
+0x2395, 0x2260, 0x236F, 
+0x2395, 0x22C4, 0x233A, 
+0x2395, IBUS_KEY_emopencircle, 0x233C, 
+IBUS_KEY_emopencircle, IBUS_KEY_asterisk, 0x235F, 
+IBUS_KEY_emopencircle, IBUS_KEY_minus, 0x2296, 
+IBUS_KEY_emopencircle, IBUS_KEY_period, 0x2299, 
+IBUS_KEY_emopencircle, IBUS_KEY_backslash, 0x2349, 
+IBUS_KEY_emopencircle, IBUS_KEY_underscore, 0x235C, 
+IBUS_KEY_emopencircle, IBUS_KEY_bar, 0x233D, 
+IBUS_KEY_emopencircle, IBUS_KEY_diaeresis, 0x2365, 
+IBUS_KEY_emopencircle, 0x2218, 0x233E, 
+IBUS_KEY_emopencircle, 0x2395, 0x233C, 
 0x2ADD, 0x0338, 0x2ADC, 
 IBUS_KEY_KP_Divide, IBUS_KEY_D, 0x0110, 
 IBUS_KEY_KP_Divide, IBUS_KEY_G, 0x01E4, 
@@ -3503,6 +3744,8 @@
 IBUS_KEY_parenleft, IBUS_KEY_KP_7, IBUS_KEY_parenright, 0x2466, 
 IBUS_KEY_parenleft, IBUS_KEY_KP_8, IBUS_KEY_parenright, 0x2467, 
 IBUS_KEY_parenleft, IBUS_KEY_KP_9, IBUS_KEY_parenright, 0x2468, 
+IBUS_KEY_asterisk, IBUS_KEY_apostrophe, IBUS_KEY_A, 0x01FA, 
+IBUS_KEY_asterisk, IBUS_KEY_apostrophe, IBUS_KEY_a, 0x01FB, 
 IBUS_KEY_minus, IBUS_KEY_minus, IBUS_KEY_space, 0x00AD, 
 IBUS_KEY_minus, IBUS_KEY_minus, IBUS_KEY_minus, 0x2014, 
 IBUS_KEY_minus, IBUS_KEY_minus, IBUS_KEY_period, 0x2013, 
@@ -3518,6 +3761,7 @@
 IBUS_KEY_period, IBUS_KEY_dead_caron, IBUS_KEY_s, 0x1E67, 
 IBUS_KEY_period, IBUS_KEY_dead_belowdot, IBUS_KEY_S, 0x1E68, 
 IBUS_KEY_period, IBUS_KEY_dead_belowdot, IBUS_KEY_s, 0x1E69, 
+IBUS_KEY_1, IBUS_KEY_1, IBUS_KEY_0, 0x2152, 
 IBUS_KEY_question, IBUS_KEY_plus, IBUS_KEY_O, 0x1EDE, 
 IBUS_KEY_question, IBUS_KEY_plus, IBUS_KEY_U, 0x1EEC, 
 IBUS_KEY_question, IBUS_KEY_plus, IBUS_KEY_o, 0x1EDF, 
@@ -3544,8 +3788,6 @@
 IBUS_KEY_question, IBUS_KEY_dead_horn, IBUS_KEY_u, 0x1EED, 
 IBUS_KEY_U, IBUS_KEY_exclam, IBUS_KEY_A, 0x1EB6, 
 IBUS_KEY_U, IBUS_KEY_exclam, IBUS_KEY_a, 0x1EB7, 
-IBUS_KEY_U, IBUS_KEY_comma, IBUS_KEY_E, 0x1E1C, 
-IBUS_KEY_U, IBUS_KEY_comma, IBUS_KEY_e, 0x1E1D, 
 IBUS_KEY_U, IBUS_KEY_cedilla, IBUS_KEY_E, 0x1E1C, 
 IBUS_KEY_U, IBUS_KEY_cedilla, IBUS_KEY_e, 0x1E1D, 
 IBUS_KEY_U, IBUS_KEY_dead_cedilla, IBUS_KEY_E, 0x1E1C, 
@@ -3748,8 +3990,6 @@
 IBUS_KEY_c, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01DA, 
 IBUS_KEY_c, IBUS_KEY_dead_diaeresis, IBUS_KEY_U, 0x01D9, 
 IBUS_KEY_c, IBUS_KEY_dead_diaeresis, IBUS_KEY_u, 0x01DA, 
-IBUS_KEY_o, IBUS_KEY_apostrophe, IBUS_KEY_A, 0x01FA, 
-IBUS_KEY_o, IBUS_KEY_apostrophe, IBUS_KEY_a, 0x01FB, 
 IBUS_KEY_asciitilde, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota, 0x1FD7, 
 IBUS_KEY_asciitilde, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon, 0x1FE7, 
 IBUS_KEY_asciitilde, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F0F, 
@@ -4105,6 +4345,7 @@
 IBUS_KEY_Greek_iota, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F81, 
 IBUS_KEY_Greek_iota, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F91, 
 IBUS_KEY_Greek_iota, IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1FA1, 
+IBUS_KEY_dead_abovedot, IBUS_KEY_f, IBUS_KEY_s, 0x1E9B, 
 IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_0, IBUS_KEY_parenright, 0x2469, 
 IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_1, IBUS_KEY_parenright, 0x246A, 
 IBUS_KEY_parenleft, IBUS_KEY_1, IBUS_KEY_2, IBUS_KEY_parenright, 0x246B, 
@@ -4311,6 +4552,8 @@
 IBUS_KEY_parenleft, IBUS_KEY_KP_4, IBUS_KEY_KP_9, IBUS_KEY_parenright, 0x32BE, 
 IBUS_KEY_parenleft, IBUS_KEY_KP_5, IBUS_KEY_KP_0, IBUS_KEY_parenright, 0x32BF, 
 IBUS_KEY_C, IBUS_KEY_C, IBUS_KEY_C, IBUS_KEY_P, 0x262D, 
+IBUS_KEY_U, IBUS_KEY_space, IBUS_KEY_comma, IBUS_KEY_E, 0x1E1C, 
+IBUS_KEY_U, IBUS_KEY_space, IBUS_KEY_comma, IBUS_KEY_e, 0x1E1D, 
 IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F8D, 
 IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F9D, 
 IBUS_KEY_Greek_iota, IBUS_KEY_apostrophe, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1FAD, 
diff -Nru ibus-1.5.4/src/ibusattribute.h ibus-1.5.5/src/ibusattribute.h
--- ibus-1.5.4/src/ibusattribute.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusattribute.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_ATTRIBUTE_H_
+#define __IBUS_ATTRIBUTE_H_
+
 /**
  * SECTION: ibusattribute
  * @short_description: Attributes of IBusText.
@@ -31,10 +34,9 @@
  * @stability: Stable
  *
  * An IBusAttribute represents an attribute that associate to IBusText.
- * It decorates preedit buffer and auxiliary text with underline, foreground and background colors.
+ * It decorates preedit buffer and auxiliary text with underline, foreground
+ * and background colors.
  */
-#ifndef __IBUS_ATTRIBUTE_H_
-#define __IBUS_ATTRIBUTE_H_
 
 #include "ibusserializable.h"
 
diff -Nru ibus-1.5.4/src/ibusattrlist.c ibus-1.5.5/src/ibusattrlist.c
--- ibus-1.5.4/src/ibusattrlist.c	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusattrlist.c	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -130,8 +130,8 @@
                                  (IBusSerializable *)src);
     g_return_val_if_fail (retval, FALSE);
 
-    g_return_val_if_fail (IBUS_IS_ATTRIBUTE (dest), FALSE);
-    g_return_val_if_fail (IBUS_IS_ATTRIBUTE (src), FALSE);
+    g_return_val_if_fail (IBUS_IS_ATTR_LIST (dest), FALSE);
+    g_return_val_if_fail (IBUS_IS_ATTR_LIST (src), FALSE);
 
     gint i;
     for (i = 0; ; i++) {
diff -Nru ibus-1.5.4/src/ibusattrlist.h ibus-1.5.5/src/ibusattrlist.h
--- ibus-1.5.4/src/ibusattrlist.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusattrlist.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_ATTRIBUTE_LIST_H_
+#define __IBUS_ATTRIBUTE_LIST_H_
+
 /**
  * SECTION: ibusattrlist
  * @Title: IBusAttrList
@@ -32,8 +35,6 @@
  * @Stability: Stable
  *
  */
-#ifndef __IBUS_ATTRIBUTE_LIST_H_
-#define __IBUS_ATTRIBUTE_LIST_H_
 
 #include "ibusattribute.h"
 
diff -Nru ibus-1.5.4/src/ibuscomponent.h ibus-1.5.5/src/ibuscomponent.h
--- ibus-1.5.4/src/ibuscomponent.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibuscomponent.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* bus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_COMPONENT_H_
+#define __IBUS_COMPONENT_H_
+
 /**
  * SECTION: ibuscomponent
  * @short_description:  Component (executable) specification.
@@ -41,8 +44,6 @@
  * The format of a component XML file is described  at
  * http://code.google.com/p/ibus/wiki/DevXML
  */
-#ifndef __IBUS_COMPONENT_H_
-#define __IBUS_COMPONENT_H_
 
 #include "ibusserializable.h"
 #include "ibusobservedpath.h"
diff -Nru ibus-1.5.4/src/ibuscomposetable.h ibus-1.5.5/src/ibuscomposetable.h
--- ibus-1.5.4/src/ibuscomposetable.h	1970-01-01 09:00:00.000000000 +0900
+++ ibus-1.5.5/src/ibuscomposetable.h	2014-01-14 12:59:14.000000000 +0900
@@ -0,0 +1,2658 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* vim:set et sts=4: */
+/* ibus - The Input Bus
+ * Copyright (C) 2013 Peng Huang 
+ * Copyright (C) 2013 Takao Fujiwara 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+#ifndef __IBUS_COMPOSETABLE_H_
+#define __IBUS_COMPOSETABLE_H_
+
+/* The table is generated by ibus/src/gencomposetable
+ *
+ * if ibus_compose_seqs_a[N - 1] is an outputed compose character,
+ * ibus_compose_seqs_a[N * 2 - 1] is also an outputed compose character.
+ * and ibus_compose_seqs_a[0] to ibus_compose_seqs_a[0 + N - 3] are the
+ * sequences and call ibus_engine_simple_add_table:
+ * ibus_engine_simple_add_table(engine, ibus_compose_seqs_a,
+ *                              N - 2, G_N_ELEMENTS(ibus_compose_seqs_a) / N)
+ * The compose sequences are allowed within G_MAXUINT16 */
+
+typedef struct _IBusComposeTable IBusComposeTable;
+struct _IBusComposeTable
+{
+    const guint16 *data;
+    gint max_seq_len;
+    gint n_seqs;
+};
+
+typedef struct _IBusComposeTableLocaleList IBusComposeTableLocaleList;
+struct _IBusComposeTableLocaleList
+{
+    const gchar *locale;
+    const IBusComposeTable *table;
+};
+
+static const guint16 ibus_compose_seqs_am_et[] = {
+  /* Not sure if am_ET compose file is useful. It uses ASCII key
+   * at first but not compose keys.
+   * Comment out am_compose_seqs until get the request. */
+  0
+};
+
+static const IBusComposeTable ibus_compose_table_am_et = {
+    ibus_compose_seqs_am_et,
+    0,
+    0
+};
+
+static const guint16 ibus_compose_seqs_el_gr[] = {
+  IBUS_KEY_dead_grave, IBUS_KEY_space, 0, 0, 0,
+    0, 0x1FEF, /* U1fef */
+  IBUS_KEY_dead_grave, IBUS_KEY_underscore, 0, 0, 0,
+    0, 0x0060, /* grave */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_grave, 0, 0, 0,
+    0, 0x1FEF, /* U1fef */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_diaeresis, IBUS_KEY_space, 0, 0,
+    0, 0x1FED, /* U1fed */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_space, 0, 0,
+    0, 0x1FDD, /* U1fdd */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0B, /* U1f0b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x1F1B, /* U1f1b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2B, /* U1f2b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3B, /* U1f3b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMICRON, 0, 0,
+    0, 0x1F4B, /* U1f4b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_UPSILON, 0, 0,
+    0, 0x1F5B, /* U1f5b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6B, /* U1f6b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F03, /* U1f03 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x1F13, /* U1f13 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F23, /* U1f23 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F33, /* U1f33 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omicron, 0, 0,
+    0, 0x1F43, /* U1f43 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F53, /* U1f53 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F63, /* U1f63 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_space, 0, 0,
+    0, 0x1FCD, /* U1fcd */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0A, /* U1f0a */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x1F1A, /* U1f1a */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2A, /* U1f2a */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3A, /* U1f3a */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMICRON, 0, 0,
+    0, 0x1F4A, /* U1f4a */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6A, /* U1f6a */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F02, /* U1f02 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x1F12, /* U1f12 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F22, /* U1f22 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F32, /* U1f32 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omicron, 0, 0,
+    0, 0x1F42, /* U1f42 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F52, /* U1f52 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F62, /* U1f62 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_psili, IBUS_KEY_space, 0, 0,
+    0, 0x1FCD, /* U1fcd */
+  IBUS_KEY_dead_grave, IBUS_KEY_dead_dasia, IBUS_KEY_space, 0, 0,
+    0, 0x1FDD, /* U1fdd */
+  IBUS_KEY_dead_acute, IBUS_KEY_space, 0, 0, 0,
+    0, 0x0384, /* U0384 */
+  IBUS_KEY_dead_acute, IBUS_KEY_period, 0, 0, 0,
+    0, 0x00B7, /* periodcentered */
+  IBUS_KEY_dead_acute, IBUS_KEY_less, 0, 0, 0,
+    0, 0x00AB, /* guillemotleft */
+  IBUS_KEY_dead_acute, IBUS_KEY_greater, 0, 0, 0,
+    0, 0x00BB, /* guillemotright */
+  IBUS_KEY_dead_acute, IBUS_KEY_underscore, 0, 0, 0,
+    0, 0x00B4, /* acute */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_acute, 0, 0, 0,
+    0, 0x0384, /* U0384 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_space, 0, 0,
+    0, 0x1FDE, /* U1fde */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0D, /* U1f0d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x1F1D, /* U1f1d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2D, /* U1f2d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3D, /* U1f3d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMICRON, 0, 0,
+    0, 0x1F4D, /* U1f4d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_UPSILON, 0, 0,
+    0, 0x1F5D, /* U1f5d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6D, /* U1f6d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F05, /* U1f05 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x1F15, /* U1f15 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F25, /* U1f25 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F35, /* U1f35 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omicron, 0, 0,
+    0, 0x1F45, /* U1f45 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F55, /* U1f55 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F65, /* U1f65 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_space, 0, 0,
+    0, 0x1FCE, /* U1fce */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0C, /* U1f0c */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x1F1C, /* U1f1c */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2C, /* U1f2c */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3C, /* U1f3c */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMICRON, 0, 0,
+    0, 0x1F4C, /* U1f4c */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6C, /* U1f6c */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F04, /* U1f04 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x1F14, /* U1f14 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F24, /* U1f24 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F34, /* U1f34 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omicron, 0, 0,
+    0, 0x1F44, /* U1f44 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F54, /* U1f54 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F64, /* U1f64 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_psili, IBUS_KEY_space, 0, 0,
+    0, 0x1FCE, /* U1fce */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_dasia, IBUS_KEY_space, 0, 0,
+    0, 0x1FDE, /* U1fde */
+  IBUS_KEY_dead_tilde, IBUS_KEY_space, 0, 0, 0,
+    0, 0x1FC0, /* U1fc0 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_underscore, 0, 0, 0,
+    0, 0x007E, /* asciitilde */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_tilde, 0, 0, 0,
+    0, 0x1FC0, /* U1fc0 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_diaeresis, IBUS_KEY_space, 0, 0,
+    0, 0x1FC1, /* U1fc1 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_space, 0, 0,
+    0, 0x1FDF, /* U1fdf */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0F, /* U1f0f */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2F, /* U1f2f */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3F, /* U1f3f */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_UPSILON, 0, 0,
+    0, 0x1F5F, /* U1f5f */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6F, /* U1f6f */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F07, /* U1f07 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F27, /* U1f27 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F37, /* U1f37 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F57, /* U1f57 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F67, /* U1f67 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_space, 0, 0,
+    0, 0x1FCF, /* U1fcf */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0E, /* U1f0e */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2E, /* U1f2e */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3E, /* U1f3e */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6E, /* U1f6e */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F06, /* U1f06 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F26, /* U1f26 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F36, /* U1f36 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F56, /* U1f56 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F66, /* U1f66 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_psili, IBUS_KEY_space, 0, 0,
+    0, 0x1FCF, /* U1fcf */
+  IBUS_KEY_dead_tilde, IBUS_KEY_dead_dasia, IBUS_KEY_space, 0, 0,
+    0, 0x1FDF, /* U1fdf */
+  IBUS_KEY_dead_diaeresis, IBUS_KEY_space, 0, 0, 0,
+    0, 0x00A8, /* diaeresis */
+  IBUS_KEY_dead_diaeresis, IBUS_KEY_period, 0, 0, 0,
+    0, 0x00B7, /* periodcentered */
+  IBUS_KEY_dead_diaeresis, IBUS_KEY_less, 0, 0, 0,
+    0, 0x00AB, /* guillemotleft */
+  IBUS_KEY_dead_diaeresis, IBUS_KEY_greater, 0, 0, 0,
+    0, 0x00BB, /* guillemotright */
+  IBUS_KEY_dead_diaeresis, IBUS_KEY_dead_grave, IBUS_KEY_space, 0, 0,
+    0, 0x1FED, /* U1fed */
+  IBUS_KEY_dead_diaeresis, IBUS_KEY_dead_tilde, IBUS_KEY_space, 0, 0,
+    0, 0x1FC1, /* U1fc1 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_space, 0, 0, 0,
+    0, 0x1FFE, /* U1ffe */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0, 0, 0,
+    0, 0x1F09, /* U1f09 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_EPSILON, 0, 0, 0,
+    0, 0x1F19, /* U1f19 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0, 0, 0,
+    0, 0x1F29, /* U1f29 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_IOTA, 0, 0, 0,
+    0, 0x1F39, /* U1f39 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMICRON, 0, 0, 0,
+    0, 0x1F49, /* U1f49 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_RHO, 0, 0, 0,
+    0, 0x1FEC, /* U1fec */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_UPSILON, 0, 0, 0,
+    0, 0x1F59, /* U1f59 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0, 0, 0,
+    0, 0x1F69, /* U1f69 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0, 0, 0,
+    0, 0x1F01, /* U1f01 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_epsilon, 0, 0, 0,
+    0, 0x1F11, /* U1f11 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0, 0, 0,
+    0, 0x1F21, /* U1f21 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_iota, 0, 0, 0,
+    0, 0x1F31, /* U1f31 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omicron, 0, 0, 0,
+    0, 0x1F41, /* U1f41 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_rho, 0, 0, 0,
+    0, 0x1FE5, /* U1fe5 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_upsilon, 0, 0, 0,
+    0, 0x1F51, /* U1f51 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0, 0, 0,
+    0, 0x1F61, /* U1f61 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_space, 0, 0,
+    0, 0x1FDD, /* U1fdd */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0B, /* U1f0b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x1F1B, /* U1f1b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2B, /* U1f2b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3B, /* U1f3b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_OMICRON, 0, 0,
+    0, 0x1F4B, /* U1f4b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_UPSILON, 0, 0,
+    0, 0x1F5B, /* U1f5b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6B, /* U1f6b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F03, /* U1f03 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x1F13, /* U1f13 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F23, /* U1f23 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F33, /* U1f33 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_omicron, 0, 0,
+    0, 0x1F43, /* U1f43 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F53, /* U1f53 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F63, /* U1f63 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_space, 0, 0,
+    0, 0x1FDE, /* U1fde */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0D, /* U1f0d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x1F1D, /* U1f1d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2D, /* U1f2d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3D, /* U1f3d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_OMICRON, 0, 0,
+    0, 0x1F4D, /* U1f4d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_UPSILON, 0, 0,
+    0, 0x1F5D, /* U1f5d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6D, /* U1f6d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F05, /* U1f05 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x1F15, /* U1f15 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F25, /* U1f25 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F35, /* U1f35 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_omicron, 0, 0,
+    0, 0x1F45, /* U1f45 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F55, /* U1f55 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F65, /* U1f65 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_space, 0, 0,
+    0, 0x1FDF, /* U1fdf */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0F, /* U1f0f */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2F, /* U1f2f */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3F, /* U1f3f */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_UPSILON, 0, 0,
+    0, 0x1F5F, /* U1f5f */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6F, /* U1f6f */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F07, /* U1f07 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F27, /* U1f27 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F37, /* U1f37 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F57, /* U1f57 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F67, /* U1f67 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_ogonek, 0, 0, 0,
+    0, 0x1FFE, /* U1ffe */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F89, /* U1f89 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F99, /* U1f99 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1FA9, /* U1fa9 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F81, /* U1f81 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F91, /* U1f91 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1FA1, /* U1fa1 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_dead_ogonek, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_dead_iota, IBUS_KEY_underscore, 0, 0, 0,
+    0, 0x1FBE, /* U1fbe */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F89, /* U1f89 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F99, /* U1f99 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1FA9, /* U1fa9 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F81, /* U1f81 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F91, /* U1f91 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1FA1, /* U1fa1 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_grave, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_acute, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_ogonek, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F88, /* U1f88 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F98, /* U1f98 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1FA8, /* U1fa8 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F80, /* U1f80 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F90, /* U1f90 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1FA0, /* U1fa0 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_dead_horn, IBUS_KEY_space, 0, 0, 0,
+    0, 0x1FBF, /* U1fbf */
+  IBUS_KEY_dead_horn, IBUS_KEY_underscore, 0, 0, 0,
+    0, 0x1FBD, /* U1fbd */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_ALPHA, 0, 0, 0,
+    0, 0x1F08, /* U1f08 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_EPSILON, 0, 0, 0,
+    0, 0x1F18, /* U1f18 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_ETA, 0, 0, 0,
+    0, 0x1F28, /* U1f28 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_IOTA, 0, 0, 0,
+    0, 0x1F38, /* U1f38 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMICRON, 0, 0, 0,
+    0, 0x1F48, /* U1f48 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_OMEGA, 0, 0, 0,
+    0, 0x1F68, /* U1f68 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_alpha, 0, 0, 0,
+    0, 0x1F00, /* U1f00 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_epsilon, 0, 0, 0,
+    0, 0x1F10, /* U1f10 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_eta, 0, 0, 0,
+    0, 0x1F20, /* U1f20 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_iota, 0, 0, 0,
+    0, 0x1F30, /* U1f30 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_omicron, 0, 0, 0,
+    0, 0x1F40, /* U1f40 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_rho, 0, 0, 0,
+    0, 0x1FE4, /* U1fe4 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_upsilon, 0, 0, 0,
+    0, 0x1F50, /* U1f50 */
+  IBUS_KEY_dead_horn, IBUS_KEY_Greek_omega, 0, 0, 0,
+    0, 0x1F60, /* U1f60 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_space, 0, 0,
+    0, 0x1FCD, /* U1fcd */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0A, /* U1f0a */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x1F1A, /* U1f1a */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2A, /* U1f2a */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3A, /* U1f3a */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_OMICRON, 0, 0,
+    0, 0x1F4A, /* U1f4a */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6A, /* U1f6a */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F02, /* U1f02 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x1F12, /* U1f12 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F22, /* U1f22 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F32, /* U1f32 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_omicron, 0, 0,
+    0, 0x1F42, /* U1f42 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F52, /* U1f52 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F62, /* U1f62 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_grave, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_space, 0, 0,
+    0, 0x1FCE, /* U1fce */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0C, /* U1f0c */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x1F1C, /* U1f1c */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2C, /* U1f2c */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3C, /* U1f3c */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_OMICRON, 0, 0,
+    0, 0x1F4C, /* U1f4c */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6C, /* U1f6c */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F04, /* U1f04 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x1F14, /* U1f14 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F24, /* U1f24 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F34, /* U1f34 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_omicron, 0, 0,
+    0, 0x1F44, /* U1f44 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F54, /* U1f54 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F64, /* U1f64 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_acute, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_space, 0, 0,
+    0, 0x1FCF, /* U1fcf */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F0E, /* U1f0e */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F2E, /* U1f2e */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F3E, /* U1f3e */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F6E, /* U1f6e */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F06, /* U1f06 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F26, /* U1f26 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F36, /* U1f36 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F56, /* U1f56 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F66, /* U1f66 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_tilde, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F88, /* U1f88 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F98, /* U1f98 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1FA8, /* U1fa8 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F80, /* U1f80 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F90, /* U1f90 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1FA0, /* U1fa0 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_iota, IBUS_KEY_dead_tilde, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_dead_horn, IBUS_KEY_dead_horn, 0, 0, 0,
+    0, 0x1FBF, /* U1fbf */
+  IBUS_KEY_dead_psili, IBUS_KEY_space, 0, 0, 0,
+    0, 0x1FBF, /* U1fbf */
+  IBUS_KEY_dead_psili, IBUS_KEY_underscore, 0, 0, 0,
+    0, 0x1FBD, /* U1fbd */
+  IBUS_KEY_dead_psili, IBUS_KEY_dead_grave, IBUS_KEY_space, 0, 0,
+    0, 0x1FCD, /* U1fcd */
+  IBUS_KEY_dead_psili, IBUS_KEY_dead_acute, IBUS_KEY_space, 0, 0,
+    0, 0x1FCE, /* U1fce */
+  IBUS_KEY_dead_psili, IBUS_KEY_dead_tilde, IBUS_KEY_space, 0, 0,
+    0, 0x1FCF, /* U1fcf */
+  IBUS_KEY_dead_psili, IBUS_KEY_dead_horn, 0, 0, 0,
+    0, 0x1FBF, /* U1fbf */
+  IBUS_KEY_dead_dasia, IBUS_KEY_space, 0, 0, 0,
+    0, 0x1FFE, /* U1ffe */
+  IBUS_KEY_dead_dasia, IBUS_KEY_dead_grave, IBUS_KEY_space, 0, 0,
+    0, 0x1FDD, /* U1fdd */
+  IBUS_KEY_dead_dasia, IBUS_KEY_dead_acute, IBUS_KEY_space, 0, 0,
+    0, 0x1FDE, /* U1fde */
+  IBUS_KEY_dead_dasia, IBUS_KEY_dead_tilde, IBUS_KEY_space, 0, 0,
+    0, 0x1FDF, /* U1fdf */
+  IBUS_KEY_dead_dasia, IBUS_KEY_dead_ogonek, 0, 0, 0,
+    0, 0x1FFE, /* U1ffe */
+  IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_S, 0, 0,
+    0, 0x00A7, /* section */
+  IBUS_KEY_Multi_key, IBUS_KEY_exclam, IBUS_KEY_s, 0, 0,
+    0, 0x00A7, /* section */
+  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_grave, IBUS_KEY_Greek_iota, 0,
+    0, 0x1FD2, /* U1fd2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_grave, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1FE2, /* U1fe2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_asciitilde, IBUS_KEY_Greek_iota, 0,
+    0, 0x1FD7, /* U1fd7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_asciitilde, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1FE7, /* U1fe7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_space, 0,
+    0, 0x2018, /* leftsinglequotemark */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0D, /* U1f0d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_EPSILON, 0,
+    0, 0x1F1D, /* U1f1d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2D, /* U1f2d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3D, /* U1f3d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_OMICRON, 0,
+    0, 0x1F4D, /* U1f4d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_UPSILON, 0,
+    0, 0x1F5D, /* U1f5d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6D, /* U1f6d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F05, /* U1f05 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_epsilon, 0,
+    0, 0x1F15, /* U1f15 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F25, /* U1f25 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F35, /* U1f35 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_omicron, 0,
+    0, 0x1F45, /* U1f45 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F55, /* U1f55 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F65, /* U1f65 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_space, 0,
+    0, 0x2019, /* rightsinglequotemark */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0C, /* U1f0c */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_EPSILON, 0,
+    0, 0x1F1C, /* U1f1c */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2C, /* U1f2c */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3C, /* U1f3c */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_OMICRON, 0,
+    0, 0x1F4C, /* U1f4c */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6C, /* U1f6c */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F04, /* U1f04 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_epsilon, 0,
+    0, 0x1F14, /* U1f14 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F24, /* U1f24 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F34, /* U1f34 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_omicron, 0,
+    0, 0x1F44, /* U1f44 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F54, /* U1f54 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F64, /* U1f64 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_ETA,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_alpha,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_eta,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_omega,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_ETA,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_alpha,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_eta,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_omega,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1FB4, /* U1fb4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_eta, 0,
+    0, 0x1FC4, /* U1fc4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FF4, /* U1ff4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_minus, IBUS_KEY_minus, 0, 0,
+    0, 0x00AD, /* hyphen */
+  IBUS_KEY_Multi_key, IBUS_KEY_minus, IBUS_KEY_D, 0, 0,
+    0, 0x00D0, /* ETH */
+  IBUS_KEY_Multi_key, IBUS_KEY_minus, IBUS_KEY_a, 0, 0,
+    0, 0x00E3, /* atilde */
+  IBUS_KEY_Multi_key, IBUS_KEY_minus, IBUS_KEY_d, 0, 0,
+    0, 0x00F0, /* eth */
+  IBUS_KEY_Multi_key, IBUS_KEY_minus, IBUS_KEY_o, 0, 0,
+    0, 0x00F5, /* otilde */
+  IBUS_KEY_Multi_key, IBUS_KEY_slash, IBUS_KEY_slash, 0, 0,
+    0, 0x0374, /* U0374 */
+  IBUS_KEY_Multi_key, IBUS_KEY_slash, IBUS_KEY_C, 0, 0,
+    0, 0x00A2, /* cent */
+  IBUS_KEY_Multi_key, IBUS_KEY_colon, IBUS_KEY_colon, 0, 0,
+    0, 0x0387, /* U0387 */
+  IBUS_KEY_Multi_key, IBUS_KEY_semicolon, IBUS_KEY_semicolon, 0, 0,
+    0, 0x037E, /* U037e */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_space, 0,
+    0, 0x2018, /* leftsinglequotemark */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0D, /* U1f0d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_EPSILON, 0,
+    0, 0x1F1D, /* U1f1d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2D, /* U1f2d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3D, /* U1f3d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMICRON, 0,
+    0, 0x1F4D, /* U1f4d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_UPSILON, 0,
+    0, 0x1F5D, /* U1f5d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6D, /* U1f6d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F05, /* U1f05 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_epsilon, 0,
+    0, 0x1F15, /* U1f15 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F25, /* U1f25 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F35, /* U1f35 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omicron, 0,
+    0, 0x1F45, /* U1f45 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F55, /* U1f55 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F65, /* U1f65 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0B, /* U1f0b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_EPSILON, 0,
+    0, 0x1F1B, /* U1f1b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2B, /* U1f2b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3B, /* U1f3b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_OMICRON, 0,
+    0, 0x1F4B, /* U1f4b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_UPSILON, 0,
+    0, 0x1F5B, /* U1f5b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6B, /* U1f6b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F03, /* U1f03 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_epsilon, 0,
+    0, 0x1F13, /* U1f13 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F23, /* U1f23 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F33, /* U1f33 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_omicron, 0,
+    0, 0x1F43, /* U1f43 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F53, /* U1f53 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F63, /* U1f63 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ETA,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_ETA,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_alpha,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_eta,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_omega,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ETA,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F89, /* U1f89 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F99, /* U1f99 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FA9, /* U1fa9 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F81, /* U1f81 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F91, /* U1f91 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA1, /* U1fa1 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0F, /* U1f0f */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2F, /* U1f2f */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3F, /* U1f3f */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_UPSILON, 0,
+    0, 0x1F5F, /* U1f5f */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6F, /* U1f6f */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F07, /* U1f07 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F27, /* U1f27 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F37, /* U1f37 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F57, /* U1f57 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F67, /* U1f67 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F09, /* U1f09 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x1F19, /* U1f19 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F29, /* U1f29 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F39, /* U1f39 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_OMICRON, 0, 0,
+    0, 0x1F49, /* U1f49 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_RHO, 0, 0,
+    0, 0x1FEC, /* U1fec */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_UPSILON, 0, 0,
+    0, 0x1F59, /* U1f59 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F69, /* U1f69 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F01, /* U1f01 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x1F11, /* U1f11 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F21, /* U1f21 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F31, /* U1f31 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_omicron, 0, 0,
+    0, 0x1F41, /* U1f41 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_rho, 0, 0,
+    0, 0x1FE5, /* U1fe5 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F51, /* U1f51 */
+  IBUS_KEY_Multi_key, IBUS_KEY_less, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F61, /* U1f61 */
+  IBUS_KEY_Multi_key, IBUS_KEY_equal, IBUS_KEY_L, 0, 0,
+    0, 0x00A3, /* sterling */
+  IBUS_KEY_Multi_key, IBUS_KEY_equal, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x20AC, /* EuroSign */
+  IBUS_KEY_Multi_key, IBUS_KEY_equal, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x20AC, /* EuroSign */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_space, 0,
+    0, 0x2019, /* rightsinglequotemark */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0C, /* U1f0c */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_EPSILON, 0,
+    0, 0x1F1C, /* U1f1c */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2C, /* U1f2c */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3C, /* U1f3c */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMICRON, 0,
+    0, 0x1F4C, /* U1f4c */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6C, /* U1f6c */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F04, /* U1f04 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_epsilon, 0,
+    0, 0x1F14, /* U1f14 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F24, /* U1f24 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F34, /* U1f34 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omicron, 0,
+    0, 0x1F44, /* U1f44 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F54, /* U1f54 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F64, /* U1f64 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0A, /* U1f0a */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_EPSILON, 0,
+    0, 0x1F1A, /* U1f1a */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2A, /* U1f2a */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3A, /* U1f3a */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_OMICRON, 0,
+    0, 0x1F4A, /* U1f4a */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6A, /* U1f6a */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F02, /* U1f02 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_epsilon, 0,
+    0, 0x1F12, /* U1f12 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F22, /* U1f22 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F32, /* U1f32 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_omicron, 0,
+    0, 0x1F42, /* U1f42 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F52, /* U1f52 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F62, /* U1f62 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ETA,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_ETA,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_alpha,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_eta,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_omega,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ETA,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F88, /* U1f88 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F98, /* U1f98 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FA8, /* U1fa8 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F80, /* U1f80 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F90, /* U1f90 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA0, /* U1fa0 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0E, /* U1f0e */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2E, /* U1f2e */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3E, /* U1f3e */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6E, /* U1f6e */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F06, /* U1f06 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F26, /* U1f26 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F36, /* U1f36 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F56, /* U1f56 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F66, /* U1f66 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1F08, /* U1f08 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_EPSILON, 0, 0,
+    0, 0x1F18, /* U1f18 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1F28, /* U1f28 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_IOTA, 0, 0,
+    0, 0x1F38, /* U1f38 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_OMICRON, 0, 0,
+    0, 0x1F48, /* U1f48 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1F68, /* U1f68 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1F00, /* U1f00 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_epsilon, 0, 0,
+    0, 0x1F10, /* U1f10 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1F20, /* U1f20 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_iota, 0, 0,
+    0, 0x1F30, /* U1f30 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_omicron, 0, 0,
+    0, 0x1F40, /* U1f40 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_rho, 0, 0,
+    0, 0x1FE4, /* U1fe4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_upsilon, 0, 0,
+    0, 0x1F50, /* U1f50 */
+  IBUS_KEY_Multi_key, IBUS_KEY_greater, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1F60, /* U1f60 */
+  IBUS_KEY_Multi_key, IBUS_KEY_question, IBUS_KEY_exclam, 0, 0,
+    0, 0x203D, /* U203D # INTERROBANG */
+  IBUS_KEY_Multi_key, IBUS_KEY_A, IBUS_KEY_O, 0, 0,
+    0, 0x00C5, /* Aring */
+  IBUS_KEY_Multi_key, IBUS_KEY_B, IBUS_KEY_V, 0, 0,
+    0, 0x00A6, /* brokenbar */
+  IBUS_KEY_Multi_key, IBUS_KEY_C, IBUS_KEY_slash, 0, 0,
+    0, 0x00A2, /* cent */
+  IBUS_KEY_Multi_key, IBUS_KEY_C, IBUS_KEY_cedilla, 0, 0,
+    0, 0x00C7, /* Ccedilla */
+  IBUS_KEY_Multi_key, IBUS_KEY_D, IBUS_KEY_minus, 0, 0,
+    0, 0x00D0, /* ETH */
+  IBUS_KEY_Multi_key, IBUS_KEY_V, IBUS_KEY_B, 0, 0,
+    0, 0x00A6, /* brokenbar */
+  IBUS_KEY_Multi_key, IBUS_KEY_backslash, IBUS_KEY_backslash, 0, 0,
+    0, 0x0375, /* U0375 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_exclam, 0, 0,
+    0, 0x00A6, /* brokenbar */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_0, 0, 0,
+    0, 0x00B0, /* degree */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_asciicircum, 0, 0,
+    0, 0x02D8, /* breve */
+  IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_A, 0, 0,
+    0, 0x00AA, /* ordfeminine */
+  IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_O, 0, 0,
+    0, 0x00BA, /* masculine */
+  IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_a, 0, 0,
+    0, 0x00AA, /* ordfeminine */
+  IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_o, 0, 0,
+    0, 0x00BA, /* masculine */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0B, /* U1f0b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_EPSILON, 0,
+    0, 0x1F1B, /* U1f1b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2B, /* U1f2b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3B, /* U1f3b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_OMICRON, 0,
+    0, 0x1F4B, /* U1f4b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_UPSILON, 0,
+    0, 0x1F5B, /* U1f5b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6B, /* U1f6b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F03, /* U1f03 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_epsilon, 0,
+    0, 0x1F13, /* U1f13 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F23, /* U1f23 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F33, /* U1f33 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_omicron, 0,
+    0, 0x1F43, /* U1f43 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F53, /* U1f53 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F63, /* U1f63 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0A, /* U1f0a */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_EPSILON, 0,
+    0, 0x1F1A, /* U1f1a */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2A, /* U1f2a */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3A, /* U1f3a */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_OMICRON, 0,
+    0, 0x1F4A, /* U1f4a */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6A, /* U1f6a */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F02, /* U1f02 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_epsilon, 0,
+    0, 0x1F12, /* U1f12 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F22, /* U1f22 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F32, /* U1f32 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_omicron, 0,
+    0, 0x1F42, /* U1f42 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F52, /* U1f52 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F62, /* U1f62 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_ETA,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_alpha,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_eta,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_omega,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_ETA,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_alpha,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_eta,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_omega,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1FB2, /* U1fb2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_eta, 0,
+    0, 0x1FC2, /* U1fc2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_grave, IBUS_KEY_bar, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FF2, /* U1ff2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_a, IBUS_KEY_minus, 0, 0,
+    0, 0x00E3, /* atilde */
+  IBUS_KEY_Multi_key, IBUS_KEY_a, IBUS_KEY_o, 0, 0,
+    0, 0x00E5, /* aring */
+  IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_v, 0, 0,
+    0, 0x00A6, /* brokenbar */
+  IBUS_KEY_Multi_key, IBUS_KEY_c, IBUS_KEY_O, 0, 0,
+    0, 0x00A9, /* copyright */
+  IBUS_KEY_Multi_key, IBUS_KEY_c, IBUS_KEY_o, 0, 0,
+    0, 0x00A9, /* copyright */
+  IBUS_KEY_Multi_key, IBUS_KEY_c, IBUS_KEY_cedilla, 0, 0,
+    0, 0x00E7, /* ccedilla */
+  IBUS_KEY_Multi_key, IBUS_KEY_d, IBUS_KEY_minus, 0, 0,
+    0, 0x00F0, /* eth */
+  IBUS_KEY_Multi_key, IBUS_KEY_o, IBUS_KEY_minus, 0, 0,
+    0, 0x00F5, /* otilde */
+  IBUS_KEY_Multi_key, IBUS_KEY_v, IBUS_KEY_b, 0, 0,
+    0, 0x00A6, /* brokenbar */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_ETA,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_alpha,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_eta,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_less, IBUS_KEY_Greek_omega,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_ETA,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_alpha,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_eta,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_greater, IBUS_KEY_Greek_omega,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1FB4, /* U1fb4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta, 0,
+    0, 0x1FC4, /* U1fc4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FF4, /* U1ff4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8D, /* U1f8d */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ETA,
+    0, 0x1F9D, /* U1f9d */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAD, /* U1fad */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha,
+    0, 0x1F85, /* U1f85 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta,
+    0, 0x1F95, /* U1f95 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega,
+    0, 0x1FA5, /* U1fa5 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_ETA,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_alpha,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_eta,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_grave, IBUS_KEY_Greek_omega,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ETA,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F89, /* U1f89 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F99, /* U1f99 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FA9, /* U1fa9 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F81, /* U1f81 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F91, /* U1f91 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA1, /* U1fa1 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8C, /* U1f8c */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_ETA,
+    0, 0x1F9C, /* U1f9c */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAC, /* U1fac */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_alpha,
+    0, 0x1F84, /* U1f84 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_eta,
+    0, 0x1F94, /* U1f94 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_apostrophe, IBUS_KEY_Greek_omega,
+    0, 0x1FA4, /* U1fa4 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_ETA,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_alpha,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_eta,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_grave, IBUS_KEY_Greek_omega,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_ETA,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F88, /* U1f88 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F98, /* U1f98 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1FA8, /* U1fa8 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F80, /* U1f80 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F90, /* U1f90 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FA0, /* U1fa0 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8B, /* U1f8b */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_ETA,
+    0, 0x1F9B, /* U1f9b */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAB, /* U1fab */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_alpha,
+    0, 0x1F83, /* U1f83 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_eta,
+    0, 0x1F93, /* U1f93 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_less, IBUS_KEY_Greek_omega,
+    0, 0x1FA3, /* U1fa3 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8A, /* U1f8a */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_ETA,
+    0, 0x1F9A, /* U1f9a */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAA, /* U1faa */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_alpha,
+    0, 0x1F82, /* U1f82 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_eta,
+    0, 0x1F92, /* U1f92 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_greater, IBUS_KEY_Greek_omega,
+    0, 0x1FA2, /* U1fa2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1FB2, /* U1fb2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_eta, 0,
+    0, 0x1FC2, /* U1fc2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_grave, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FF2, /* U1ff2 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_bar, 0, 0,
+    0, 0x00A6, /* brokenbar */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_ETA,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_alpha,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_eta,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_omega,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_ETA,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_alpha,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_eta,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_omega,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1FB7, /* U1fb7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_eta, 0,
+    0, 0x1FC7, /* U1fc7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_asciitilde, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FF7, /* U1ff7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA, 0, 0,
+    0, 0x1FBC, /* U1fbc */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_Greek_ETA, 0, 0,
+    0, 0x1FCC, /* U1fcc */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA, 0, 0,
+    0, 0x1FFC, /* U1ffc */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_Greek_alpha, 0, 0,
+    0, 0x1FB3, /* U1fb3 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_Greek_eta, 0, 0,
+    0, 0x1FC3, /* U1fc3 */
+  IBUS_KEY_Multi_key, IBUS_KEY_bar, IBUS_KEY_Greek_omega, 0, 0,
+    0, 0x1FF3, /* U1ff3 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0F, /* U1f0f */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2F, /* U1f2f */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3F, /* U1f3f */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_UPSILON, 0,
+    0, 0x1F5F, /* U1f5f */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6F, /* U1f6f */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F07, /* U1f07 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F27, /* U1f27 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F37, /* U1f37 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F57, /* U1f57 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_less, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F67, /* U1f67 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_ETA,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_alpha,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_eta,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_bar, IBUS_KEY_Greek_omega,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA, 0,
+    0, 0x1F0E, /* U1f0e */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_ETA, 0,
+    0, 0x1F2E, /* U1f2e */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_IOTA, 0,
+    0, 0x1F3E, /* U1f3e */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA, 0,
+    0, 0x1F6E, /* U1f6e */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1F06, /* U1f06 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_eta, 0,
+    0, 0x1F26, /* U1f26 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_iota, 0,
+    0, 0x1F36, /* U1f36 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_upsilon, 0,
+    0, 0x1F56, /* U1f56 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_greater, IBUS_KEY_Greek_omega, 0,
+    0, 0x1F66, /* U1f66 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8F, /* U1f8f */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_ETA,
+    0, 0x1F9F, /* U1f9f */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAF, /* U1faf */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_alpha,
+    0, 0x1F87, /* U1f87 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_eta,
+    0, 0x1F97, /* U1f97 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_less, IBUS_KEY_Greek_omega,
+    0, 0x1FA7, /* U1fa7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_ALPHA,
+    0, 0x1F8E, /* U1f8e */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_ETA,
+    0, 0x1F9E, /* U1f9e */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_OMEGA,
+    0, 0x1FAE, /* U1fae */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_alpha,
+    0, 0x1F86, /* U1f86 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_eta,
+    0, 0x1F96, /* U1f96 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_greater, IBUS_KEY_Greek_omega,
+    0, 0x1FA6, /* U1fa6 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_alpha, 0,
+    0, 0x1FB7, /* U1fb7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_eta, 0,
+    0, 0x1FC7, /* U1fc7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_bar, IBUS_KEY_Greek_omega, 0,
+    0, 0x1FF7, /* U1ff7 */
+  IBUS_KEY_Multi_key, IBUS_KEY_asciitilde, IBUS_KEY_asciitilde, 0, 0,
+    0, 0x2015, /* Greek_horizbar */
+  IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_C, 0, 0,
+    0, 0x00C7, /* Ccedilla */
+  IBUS_KEY_Multi_key, IBUS_KEY_acute, IBUS_KEY_c, 0, 0,
+    0, 0x00E7, /* ccedilla */
+  IBUS_KEY_Multi_key, IBUS_KEY_Greek_DELTA, IBUS_KEY_Greek_RHO, 0, 0,
+    0, 0x20AF, /* U20af */
+  IBUS_KEY_Multi_key, IBUS_KEY_Greek_DELTA, IBUS_KEY_Greek_rho, 0, 0,
+    0, 0x20AF, /* U20af */
+  IBUS_KEY_Multi_key, IBUS_KEY_Greek_EPSILON, IBUS_KEY_equal, 0, 0,
+    0, 0x20AC, /* EuroSign */
+  IBUS_KEY_Multi_key, IBUS_KEY_Greek_delta, IBUS_KEY_Greek_RHO, 0, 0,
+    0, 0x20AF, /* U20af */
+  IBUS_KEY_Multi_key, IBUS_KEY_Greek_delta, IBUS_KEY_Greek_rho, 0, 0,
+    0, 0x20AF, /* U20af */
+  IBUS_KEY_Multi_key, IBUS_KEY_Greek_epsilon, IBUS_KEY_equal, 0, 0,
+    0, 0x20AC  /* EuroSign */
+};
+
+static const IBusComposeTable ibus_compose_table_el_gr = {
+    ibus_compose_seqs_el_gr,
+    5,
+    G_N_ELEMENTS (ibus_compose_seqs_el_gr) / (5 + 2)
+};
+
+static const guint16 ibus_compose_seqs_fi_fi[] = {
+  IBUS_KEY_dead_acute, IBUS_KEY_space, 0, 0,
+    0, 0x00B4, /* # ACUTE ACCENT */
+  IBUS_KEY_dead_acute, IBUS_KEY_dead_circumflex, IBUS_KEY_E, 0,
+    0, 0x1EC6, /* # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
+  IBUS_KEY_dead_diaeresis, IBUS_KEY_space, 0, 0,
+    0, 0x00A8, /* # DIAERESIS */
+  IBUS_KEY_dead_hook, IBUS_KEY_dead_horn, IBUS_KEY_o, 0,
+    0, 0x1EDD, /* # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_D, 0, 0,
+    0, 0x0110, /* # LATIN CAPITAL LETTER D WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_G, 0, 0,
+    0, 0x01E4, /* # LATIN CAPITAL LETTER G WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_H, 0, 0,
+    0, 0x0126, /* # LATIN CAPITAL LETTER H WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_L, 0, 0,
+    0, 0x0141, /* # LATIN CAPITAL LETTER L WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_O, 0, 0,
+    0, 0x00D8, /* # LATIN CAPITAL LETTER O WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_T, 0, 0,
+    0, 0x0166, /* # LATIN CAPITAL LETTER T WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_d, 0, 0,
+    0, 0x0111, /* # LATIN SMALL LETTER D WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_g, 0, 0,
+    0, 0x01E5, /* # LATIN SMALL LETTER G WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_h, 0, 0,
+    0, 0x0127, /* # LATIN SMALL LETTER H WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_l, 0, 0,
+    0, 0x0142, /* # LATIN SMALL LETTER L WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_o, 0, 0,
+    0, 0x00F8, /* # LATIN SMALL LETTER O WITH STROKE */
+  IBUS_KEY_dead_stroke, IBUS_KEY_t, 0, 0,
+    0, 0x0167, /* # LATIN SMALL LETTER T WITH STROKE */
+  IBUS_KEY_dead_belowcomma, IBUS_KEY_S, 0, 0,
+    0, 0x0218, /* # LATIN CAPITAL LETTER S WITH COMMA BELOW */
+  IBUS_KEY_dead_belowcomma, IBUS_KEY_T, 0, 0,
+    0, 0x021A, /* # LATIN CAPITAL LETTER T WITH COMMA BELOW */
+  IBUS_KEY_dead_belowcomma, IBUS_KEY_s, 0, 0,
+    0, 0x0219, /* # LATIN SMALL LETTER S WITH COMMA BELOW */
+  IBUS_KEY_dead_belowcomma, IBUS_KEY_t, 0, 0,
+    0, 0x021B, /* # LATIN SMALL LETTER T WITH COMMA BELOW */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, IBUS_KEY_space, IBUS_KEY_n,
+    0, 0x0149  /* # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE */
+};
+
+static const IBusComposeTable ibus_compose_table_fi_fi = {
+    ibus_compose_seqs_fi_fi,
+    4,
+    G_N_ELEMENTS (ibus_compose_seqs_fi_fi) / (4 + 2)
+};
+
+static const guint16 ibus_compose_seqs_pt_br[] = {
+  IBUS_KEY_dead_grave, 0x1F00, 0, 0, 0,
+    0, 0x1F02, /* U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F01, 0, 0, 0,
+    0, 0x1F03, /* U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F08, 0, 0, 0,
+    0, 0x1F0A, /* U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F09, 0, 0, 0,
+    0, 0x1F0B, /* U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F10, 0, 0, 0,
+    0, 0x1F12, /* U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F11, 0, 0, 0,
+    0, 0x1F13, /* U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F18, 0, 0, 0,
+    0, 0x1F1A, /* U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F19, 0, 0, 0,
+    0, 0x1F1B, /* U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F20, 0, 0, 0,
+    0, 0x1F22, /* U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F21, 0, 0, 0,
+    0, 0x1F23, /* U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F28, 0, 0, 0,
+    0, 0x1F2A, /* U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F29, 0, 0, 0,
+    0, 0x1F2B, /* U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F30, 0, 0, 0,
+    0, 0x1F32, /* U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F31, 0, 0, 0,
+    0, 0x1F33, /* U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F38, 0, 0, 0,
+    0, 0x1F3A, /* U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F39, 0, 0, 0,
+    0, 0x1F3B, /* U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F40, 0, 0, 0,
+    0, 0x1F42, /* U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F41, 0, 0, 0,
+    0, 0x1F43, /* U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F48, 0, 0, 0,
+    0, 0x1F4A, /* U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F49, 0, 0, 0,
+    0, 0x1F4B, /* U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F50, 0, 0, 0,
+    0, 0x1F52, /* U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F51, 0, 0, 0,
+    0, 0x1F53, /* U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F59, 0, 0, 0,
+    0, 0x1F5B, /* U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F60, 0, 0, 0,
+    0, 0x1F62, /* U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F61, 0, 0, 0,
+    0, 0x1F63, /* U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F68, 0, 0, 0,
+    0, 0x1F6A, /* U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA */
+  IBUS_KEY_dead_grave, 0x1F69, 0, 0, 0,
+    0, 0x1F6B, /* U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA */
+  IBUS_KEY_dead_acute, IBUS_KEY_C, 0, 0, 0,
+    0, 0x00C7, /* Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA */
+  IBUS_KEY_dead_acute, IBUS_KEY_c, 0, 0, 0,
+    0, 0x00E7, /* ccedilla # LATIN SMALL LETTER C WITH CEDILLA */
+  IBUS_KEY_dead_acute, 0x1F00, 0, 0, 0,
+    0, 0x1F04, /* U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F01, 0, 0, 0,
+    0, 0x1F05, /* U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F08, 0, 0, 0,
+    0, 0x1F0C, /* U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F09, 0, 0, 0,
+    0, 0x1F0D, /* U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F10, 0, 0, 0,
+    0, 0x1F14, /* U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F11, 0, 0, 0,
+    0, 0x1F15, /* U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F18, 0, 0, 0,
+    0, 0x1F1C, /* U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F19, 0, 0, 0,
+    0, 0x1F1D, /* U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F20, 0, 0, 0,
+    0, 0x1F24, /* U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F21, 0, 0, 0,
+    0, 0x1F25, /* U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F28, 0, 0, 0,
+    0, 0x1F2C, /* U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F29, 0, 0, 0,
+    0, 0x1F2D, /* U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F30, 0, 0, 0,
+    0, 0x1F34, /* U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F31, 0, 0, 0,
+    0, 0x1F35, /* U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F38, 0, 0, 0,
+    0, 0x1F3C, /* U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F39, 0, 0, 0,
+    0, 0x1F3D, /* U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F40, 0, 0, 0,
+    0, 0x1F44, /* U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F41, 0, 0, 0,
+    0, 0x1F45, /* U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F48, 0, 0, 0,
+    0, 0x1F4C, /* U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F49, 0, 0, 0,
+    0, 0x1F4D, /* U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F50, 0, 0, 0,
+    0, 0x1F54, /* U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F51, 0, 0, 0,
+    0, 0x1F55, /* U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F59, 0, 0, 0,
+    0, 0x1F5D, /* U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F60, 0, 0, 0,
+    0, 0x1F64, /* U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F61, 0, 0, 0,
+    0, 0x1F65, /* U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F68, 0, 0, 0,
+    0, 0x1F6C, /* U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA */
+  IBUS_KEY_dead_acute, 0x1F69, 0, 0, 0,
+    0, 0x1F6D, /* U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA */
+  IBUS_KEY_dead_circumflex, 0x1EA0, 0, 0, 0,
+    0, 0x1EAC, /* U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
+  IBUS_KEY_dead_circumflex, 0x1EA1, 0, 0, 0,
+    0, 0x1EAD, /* U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
+  IBUS_KEY_dead_circumflex, 0x1EB8, 0, 0, 0,
+    0, 0x1EC6, /* U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
+  IBUS_KEY_dead_circumflex, 0x1EB9, 0, 0, 0,
+    0, 0x1EC7, /* U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
+  IBUS_KEY_dead_circumflex, 0x1ECC, 0, 0, 0,
+    0, 0x1ED8, /* U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
+  IBUS_KEY_dead_circumflex, 0x1ECD, 0, 0, 0,
+    0, 0x1ED9, /* U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
+  IBUS_KEY_dead_macron, 0x01EA, 0, 0, 0,
+    0, 0x01EC, /* U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON */
+  IBUS_KEY_dead_macron, 0x01EB, 0, 0, 0,
+    0, 0x01ED, /* U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON */
+  IBUS_KEY_dead_macron, 0x0226, 0, 0, 0,
+    0, 0x01E0, /* U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON */
+  IBUS_KEY_dead_macron, 0x0227, 0, 0, 0,
+    0, 0x01E1, /* U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON */
+  IBUS_KEY_dead_macron, 0x022E, 0, 0, 0,
+    0, 0x0230, /* U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON */
+  IBUS_KEY_dead_macron, 0x022F, 0, 0, 0,
+    0, 0x0231, /* U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON */
+  IBUS_KEY_dead_macron, 0x1E36, 0, 0, 0,
+    0, 0x1E38, /* U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON */
+  IBUS_KEY_dead_macron, 0x1E37, 0, 0, 0,
+    0, 0x1E39, /* U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON */
+  IBUS_KEY_dead_macron, 0x1E5A, 0, 0, 0,
+    0, 0x1E5C, /* U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON */
+  IBUS_KEY_dead_macron, 0x1E5B, 0, 0, 0,
+    0, 0x1E5D, /* U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON */
+  IBUS_KEY_dead_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_U, 0, 0,
+    0, 0x01D5, /* U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON */
+  IBUS_KEY_dead_macron, IBUS_KEY_dead_diaeresis, IBUS_KEY_u, 0, 0,
+    0, 0x01D6, /* U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON */
+  IBUS_KEY_dead_breve, 0x0228, 0, 0, 0,
+    0, 0x1E1C, /* U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE */
+  IBUS_KEY_dead_breve, 0x0229, 0, 0, 0,
+    0, 0x1E1D, /* U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE */
+  IBUS_KEY_dead_breve, 0x1EA0, 0, 0, 0,
+    0, 0x1EB6, /* U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */
+  IBUS_KEY_dead_breve, 0x1EA1, 0, 0, 0,
+    0, 0x1EB7, /* U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW */
+  IBUS_KEY_dead_abovedot, 0x017F, 0, 0, 0,
+    0, 0x1E9B, /* U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE */
+  IBUS_KEY_dead_abovedot, 0x1E62, 0, 0, 0,
+    0, 0x1E68, /* U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE */
+  IBUS_KEY_dead_abovedot, 0x1E63, 0, 0, 0,
+    0, 0x1E69, /* U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE */
+  IBUS_KEY_dead_diaeresis, 0x04D8, 0, 0, 0,
+    0, 0x04DA, /* U04DA # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS */
+  IBUS_KEY_dead_diaeresis, 0x04D9, 0, 0, 0,
+    0, 0x04DB, /* U04DB # CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS */
+  IBUS_KEY_dead_diaeresis, 0x04E8, 0, 0, 0,
+    0, 0x04EA, /* U04EA # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS */
+  IBUS_KEY_dead_diaeresis, 0x04E9, 0, 0, 0,
+    0, 0x04EB, /* U04EB # CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS */
+  IBUS_KEY_dead_diaeresis, IBUS_KEY_dead_macron, IBUS_KEY_U, 0, 0,
+    0, 0x1E7A, /* U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS */
+  IBUS_KEY_dead_diaeresis, IBUS_KEY_dead_macron, IBUS_KEY_u, 0, 0,
+    0, 0x1E7B, /* U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS */
+  IBUS_KEY_dead_iota, 0x1F00, 0, 0, 0,
+    0, 0x1F80, /* U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F01, 0, 0, 0,
+    0, 0x1F81, /* U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F02, 0, 0, 0,
+    0, 0x1F82, /* U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F03, 0, 0, 0,
+    0, 0x1F83, /* U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F04, 0, 0, 0,
+    0, 0x1F84, /* U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F05, 0, 0, 0,
+    0, 0x1F85, /* U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F06, 0, 0, 0,
+    0, 0x1F86, /* U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F07, 0, 0, 0,
+    0, 0x1F87, /* U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F08, 0, 0, 0,
+    0, 0x1F88, /* U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F09, 0, 0, 0,
+    0, 0x1F89, /* U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F0A, 0, 0, 0,
+    0, 0x1F8A, /* U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F0B, 0, 0, 0,
+    0, 0x1F8B, /* U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F0C, 0, 0, 0,
+    0, 0x1F8C, /* U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F0D, 0, 0, 0,
+    0, 0x1F8D, /* U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F0E, 0, 0, 0,
+    0, 0x1F8E, /* U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F0F, 0, 0, 0,
+    0, 0x1F8F, /* U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F20, 0, 0, 0,
+    0, 0x1F90, /* U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F21, 0, 0, 0,
+    0, 0x1F91, /* U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F22, 0, 0, 0,
+    0, 0x1F92, /* U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F23, 0, 0, 0,
+    0, 0x1F93, /* U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F24, 0, 0, 0,
+    0, 0x1F94, /* U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F25, 0, 0, 0,
+    0, 0x1F95, /* U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F26, 0, 0, 0,
+    0, 0x1F96, /* U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F27, 0, 0, 0,
+    0, 0x1F97, /* U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F28, 0, 0, 0,
+    0, 0x1F98, /* U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F29, 0, 0, 0,
+    0, 0x1F99, /* U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F2A, 0, 0, 0,
+    0, 0x1F9A, /* U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F2B, 0, 0, 0,
+    0, 0x1F9B, /* U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F2C, 0, 0, 0,
+    0, 0x1F9C, /* U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F2D, 0, 0, 0,
+    0, 0x1F9D, /* U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F2E, 0, 0, 0,
+    0, 0x1F9E, /* U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F2F, 0, 0, 0,
+    0, 0x1F9F, /* U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F60, 0, 0, 0,
+    0, 0x1FA0, /* U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F61, 0, 0, 0,
+    0, 0x1FA1, /* U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F62, 0, 0, 0,
+    0, 0x1FA2, /* U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F63, 0, 0, 0,
+    0, 0x1FA3, /* U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F64, 0, 0, 0,
+    0, 0x1FA4, /* U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F65, 0, 0, 0,
+    0, 0x1FA5, /* U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F66, 0, 0, 0,
+    0, 0x1FA6, /* U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F67, 0, 0, 0,
+    0, 0x1FA7, /* U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F68, 0, 0, 0,
+    0, 0x1FA8, /* U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F69, 0, 0, 0,
+    0, 0x1FA9, /* U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F6A, 0, 0, 0,
+    0, 0x1FAA, /* U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F6B, 0, 0, 0,
+    0, 0x1FAB, /* U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F6C, 0, 0, 0,
+    0, 0x1FAC, /* U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F6D, 0, 0, 0,
+    0, 0x1FAD, /* U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F6E, 0, 0, 0,
+    0, 0x1FAE, /* U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F6F, 0, 0, 0,
+    0, 0x1FAF, /* U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F70, 0, 0, 0,
+    0, 0x1FB2, /* U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F74, 0, 0, 0,
+    0, 0x1FC2, /* U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1F7C, 0, 0, 0,
+    0, 0x1FF2, /* U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1FB6, 0, 0, 0,
+    0, 0x1FB7, /* U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1FC6, 0, 0, 0,
+    0, 0x1FC7, /* U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, 0x1FF6, 0, 0, 0,
+    0, 0x1FF7, /* U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F00, 0, 0,
+    0, 0x1F82, /* U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F01, 0, 0,
+    0, 0x1F83, /* U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F08, 0, 0,
+    0, 0x1F8A, /* U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F09, 0, 0,
+    0, 0x1F8B, /* U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F20, 0, 0,
+    0, 0x1F92, /* U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F21, 0, 0,
+    0, 0x1F93, /* U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F28, 0, 0,
+    0, 0x1F9A, /* U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F29, 0, 0,
+    0, 0x1F9B, /* U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F60, 0, 0,
+    0, 0x1FA2, /* U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F61, 0, 0,
+    0, 0x1FA3, /* U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F68, 0, 0,
+    0, 0x1FAA, /* U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_grave, 0x1F69, 0, 0,
+    0, 0x1FAB, /* U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F00, 0, 0,
+    0, 0x1F84, /* U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F01, 0, 0,
+    0, 0x1F85, /* U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F08, 0, 0,
+    0, 0x1F8C, /* U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F09, 0, 0,
+    0, 0x1F8D, /* U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F20, 0, 0,
+    0, 0x1F94, /* U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F21, 0, 0,
+    0, 0x1F95, /* U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F28, 0, 0,
+    0, 0x1F9C, /* U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F29, 0, 0,
+    0, 0x1F9D, /* U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F60, 0, 0,
+    0, 0x1FA4, /* U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F61, 0, 0,
+    0, 0x1FA5, /* U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F68, 0, 0,
+    0, 0x1FAC, /* U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_iota, IBUS_KEY_dead_acute, 0x1F69, 0, 0,
+    0, 0x1FAD, /* U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+  IBUS_KEY_dead_voiced_sound, 0x3046, 0, 0, 0,
+    0, 0x3094, /* U3094 # HIRAGANA LETTER VU */
+  IBUS_KEY_dead_voiced_sound, 0x304B, 0, 0, 0,
+    0, 0x304C, /* U304C # HIRAGANA LETTER GA */
+  IBUS_KEY_dead_voiced_sound, 0x304D, 0, 0, 0,
+    0, 0x304E, /* U304E # HIRAGANA LETTER GI */
+  IBUS_KEY_dead_voiced_sound, 0x304F, 0, 0, 0,
+    0, 0x3050, /* U3050 # HIRAGANA LETTER GU */
+  IBUS_KEY_dead_voiced_sound, 0x3051, 0, 0, 0,
+    0, 0x3052, /* U3052 # HIRAGANA LETTER GE */
+  IBUS_KEY_dead_voiced_sound, 0x3053, 0, 0, 0,
+    0, 0x3054, /* U3054 # HIRAGANA LETTER GO */
+  IBUS_KEY_dead_voiced_sound, 0x3055, 0, 0, 0,
+    0, 0x3056, /* U3056 # HIRAGANA LETTER ZA */
+  IBUS_KEY_dead_voiced_sound, 0x3057, 0, 0, 0,
+    0, 0x3058, /* U3058 # HIRAGANA LETTER ZI */
+  IBUS_KEY_dead_voiced_sound, 0x3059, 0, 0, 0,
+    0, 0x305A, /* U305A # HIRAGANA LETTER ZU */
+  IBUS_KEY_dead_voiced_sound, 0x305B, 0, 0, 0,
+    0, 0x305C, /* U305C # HIRAGANA LETTER ZE */
+  IBUS_KEY_dead_voiced_sound, 0x305D, 0, 0, 0,
+    0, 0x305E, /* U305E # HIRAGANA LETTER ZO */
+  IBUS_KEY_dead_voiced_sound, 0x305F, 0, 0, 0,
+    0, 0x3060, /* U3060 # HIRAGANA LETTER DA */
+  IBUS_KEY_dead_voiced_sound, 0x3061, 0, 0, 0,
+    0, 0x3062, /* U3062 # HIRAGANA LETTER DI */
+  IBUS_KEY_dead_voiced_sound, 0x3064, 0, 0, 0,
+    0, 0x3065, /* U3065 # HIRAGANA LETTER DU */
+  IBUS_KEY_dead_voiced_sound, 0x3066, 0, 0, 0,
+    0, 0x3067, /* U3067 # HIRAGANA LETTER DE */
+  IBUS_KEY_dead_voiced_sound, 0x3068, 0, 0, 0,
+    0, 0x3069, /* U3069 # HIRAGANA LETTER DO */
+  IBUS_KEY_dead_voiced_sound, 0x306F, 0, 0, 0,
+    0, 0x3070, /* U3070 # HIRAGANA LETTER BA */
+  IBUS_KEY_dead_voiced_sound, 0x3072, 0, 0, 0,
+    0, 0x3073, /* U3073 # HIRAGANA LETTER BI */
+  IBUS_KEY_dead_voiced_sound, 0x3075, 0, 0, 0,
+    0, 0x3076, /* U3076 # HIRAGANA LETTER BU */
+  IBUS_KEY_dead_voiced_sound, 0x3078, 0, 0, 0,
+    0, 0x3079, /* U3079 # HIRAGANA LETTER BE */
+  IBUS_KEY_dead_voiced_sound, 0x307B, 0, 0, 0,
+    0, 0x307C, /* U307C # HIRAGANA LETTER BO */
+  IBUS_KEY_dead_voiced_sound, 0x309D, 0, 0, 0,
+    0, 0x309E, /* U309E # HIRAGANA VOICED ITERATION MARK */
+  IBUS_KEY_dead_voiced_sound, 0x30F0, 0, 0, 0,
+    0, 0x30F8, /* U30F8 # KATAKANA LETTER VI */
+  IBUS_KEY_dead_voiced_sound, 0x30F1, 0, 0, 0,
+    0, 0x30F9, /* U30F9 # KATAKANA LETTER VE */
+  IBUS_KEY_dead_voiced_sound, 0x30FD, 0, 0, 0,
+    0, 0x30FE, /* U30FE # KATAKANA VOICED ITERATION MARK */
+  IBUS_KEY_dead_semivoiced_sound, 0x306F, 0, 0, 0,
+    0, 0x3071, /* U3071 # HIRAGANA LETTER PA */
+  IBUS_KEY_dead_semivoiced_sound, 0x3072, 0, 0, 0,
+    0, 0x3074, /* U3074 # HIRAGANA LETTER PI */
+  IBUS_KEY_dead_semivoiced_sound, 0x3075, 0, 0, 0,
+    0, 0x3077, /* U3077 # HIRAGANA LETTER PU */
+  IBUS_KEY_dead_semivoiced_sound, 0x3078, 0, 0, 0,
+    0, 0x307A, /* U307A # HIRAGANA LETTER PE */
+  IBUS_KEY_dead_semivoiced_sound, 0x307B, 0, 0, 0,
+    0, 0x307D, /* U307D # HIRAGANA LETTER PO */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_A, 0, 0, 0,
+    0, 0x0200, /* U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_E, 0, 0, 0,
+    0, 0x0204, /* U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_I, 0, 0, 0,
+    0, 0x0208, /* U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_O, 0, 0, 0,
+    0, 0x020C, /* U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_R, 0, 0, 0,
+    0, 0x0210, /* U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_U, 0, 0, 0,
+    0, 0x0214, /* U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_a, 0, 0, 0,
+    0, 0x0201, /* U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_e, 0, 0, 0,
+    0, 0x0205, /* U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_i, 0, 0, 0,
+    0, 0x0209, /* U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_o, 0, 0, 0,
+    0, 0x020D, /* U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_r, 0, 0, 0,
+    0, 0x0211, /* U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, IBUS_KEY_u, 0, 0, 0,
+    0, 0x0215, /* U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE */
+  IBUS_KEY_dead_doublegrave, 0x0474, 0, 0, 0,
+    0, 0x0476, /* U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT */
+  IBUS_KEY_dead_doublegrave, 0x0475, 0, 0, 0,
+    0, 0x0477, /* U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT */
+  IBUS_KEY_dead_belowring, IBUS_KEY_A, 0, 0, 0,
+    0, 0x1E00, /* U1E00 # LATIN CAPITAL LETTER A WITH RING BELOW */
+  IBUS_KEY_dead_belowring, IBUS_KEY_a, 0, 0, 0,
+    0, 0x1E01, /* U1E01 # LATIN SMALL LETTER A WITH RING BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_B, 0, 0, 0,
+    0, 0x1E06, /* U1E06 # LATIN CAPITAL LETTER B WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_D, 0, 0, 0,
+    0, 0x1E0E, /* U1E0E # LATIN CAPITAL LETTER D WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_K, 0, 0, 0,
+    0, 0x1E34, /* U1E34 # LATIN CAPITAL LETTER K WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_L, 0, 0, 0,
+    0, 0x1E3A, /* U1E3A # LATIN CAPITAL LETTER L WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_N, 0, 0, 0,
+    0, 0x1E48, /* U1E48 # LATIN CAPITAL LETTER N WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_R, 0, 0, 0,
+    0, 0x1E5E, /* U1E5E # LATIN CAPITAL LETTER R WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_T, 0, 0, 0,
+    0, 0x1E6E, /* U1E6E # LATIN CAPITAL LETTER T WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_Z, 0, 0, 0,
+    0, 0x1E94, /* U1E94 # LATIN CAPITAL LETTER Z WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_b, 0, 0, 0,
+    0, 0x1E07, /* U1E07 # LATIN SMALL LETTER B WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_d, 0, 0, 0,
+    0, 0x1E0F, /* U1E0F # LATIN SMALL LETTER D WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_h, 0, 0, 0,
+    0, 0x1E96, /* U1E96 # LATIN SMALL LETTER H WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_k, 0, 0, 0,
+    0, 0x1E35, /* U1E35 # LATIN SMALL LETTER K WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_l, 0, 0, 0,
+    0, 0x1E3B, /* U1E3B # LATIN SMALL LETTER L WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_n, 0, 0, 0,
+    0, 0x1E49, /* U1E49 # LATIN SMALL LETTER N WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_r, 0, 0, 0,
+    0, 0x1E5F, /* U1E5F # LATIN SMALL LETTER R WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_t, 0, 0, 0,
+    0, 0x1E6F, /* U1E6F # LATIN SMALL LETTER T WITH LINE BELOW */
+  IBUS_KEY_dead_belowmacron, IBUS_KEY_z, 0, 0, 0,
+    0, 0x1E95, /* U1E95 # LATIN SMALL LETTER Z WITH LINE BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_D, 0, 0, 0,
+    0, 0x1E12, /* U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_E, 0, 0, 0,
+    0, 0x1E18, /* U1E18 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_L, 0, 0, 0,
+    0, 0x1E3C, /* U1E3C # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_N, 0, 0, 0,
+    0, 0x1E4A, /* U1E4A # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_T, 0, 0, 0,
+    0, 0x1E70, /* U1E70 # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_U, 0, 0, 0,
+    0, 0x1E76, /* U1E76 # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_d, 0, 0, 0,
+    0, 0x1E13, /* U1E13 # LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_e, 0, 0, 0,
+    0, 0x1E19, /* U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_l, 0, 0, 0,
+    0, 0x1E3D, /* U1E3D # LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_n, 0, 0, 0,
+    0, 0x1E4B, /* U1E4B # LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_t, 0, 0, 0,
+    0, 0x1E71, /* U1E71 # LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowcircumflex, IBUS_KEY_u, 0, 0, 0,
+    0, 0x1E77, /* U1E77 # LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW */
+  IBUS_KEY_dead_belowtilde, IBUS_KEY_E, 0, 0, 0,
+    0, 0x1E1A, /* U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW */
+  IBUS_KEY_dead_belowtilde, IBUS_KEY_I, 0, 0, 0,
+    0, 0x1E2C, /* U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW */
+  IBUS_KEY_dead_belowtilde, IBUS_KEY_U, 0, 0, 0,
+    0, 0x1E74, /* U1E74 # LATIN CAPITAL LETTER U WITH TILDE BELOW */
+  IBUS_KEY_dead_belowtilde, IBUS_KEY_e, 0, 0, 0,
+    0, 0x1E1B, /* U1E1B # LATIN SMALL LETTER E WITH TILDE BELOW */
+  IBUS_KEY_dead_belowtilde, IBUS_KEY_i, 0, 0, 0,
+    0, 0x1E2D, /* U1E2D # LATIN SMALL LETTER I WITH TILDE BELOW */
+  IBUS_KEY_dead_belowtilde, IBUS_KEY_u, 0, 0, 0,
+    0, 0x1E75, /* U1E75 # LATIN SMALL LETTER U WITH TILDE BELOW */
+  IBUS_KEY_dead_belowbreve, IBUS_KEY_H, 0, 0, 0,
+    0, 0x1E2A, /* U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW */
+  IBUS_KEY_dead_belowbreve, IBUS_KEY_h, 0, 0, 0,
+    0, 0x1E2B, /* U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW */
+  IBUS_KEY_dead_belowdiaeresis, IBUS_KEY_U, 0, 0, 0,
+    0, 0x1E72, /* U1E72 # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW */
+  IBUS_KEY_dead_belowdiaeresis, IBUS_KEY_u, 0, 0, 0,
+    0, 0x1E73, /* U1E73 # LATIN SMALL LETTER U WITH DIAERESIS BELOW */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_A, 0, 0, 0,
+    0, 0x0202, /* U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_E, 0, 0, 0,
+    0, 0x0206, /* U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_I, 0, 0, 0,
+    0, 0x020A, /* U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_O, 0, 0, 0,
+    0, 0x020E, /* U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_R, 0, 0, 0,
+    0, 0x0212, /* U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_U, 0, 0, 0,
+    0, 0x0216, /* U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_a, 0, 0, 0,
+    0, 0x0203, /* U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_e, 0, 0, 0,
+    0, 0x0207, /* U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_i, 0, 0, 0,
+    0, 0x020B, /* U020B # LATIN SMALL LETTER I WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_o, 0, 0, 0,
+    0, 0x020F, /* U020F # LATIN SMALL LETTER O WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_r, 0, 0, 0,
+    0, 0x0213, /* U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE */
+  IBUS_KEY_dead_invertedbreve, IBUS_KEY_u, 0, 0, 0,
+    0, 0x0217, /* U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE */
+  IBUS_KEY_dead_belowcomma, IBUS_KEY_S, 0, 0, 0,
+    0, 0x0218, /* U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW */
+  IBUS_KEY_dead_belowcomma, IBUS_KEY_T, 0, 0, 0,
+    0, 0x021A, /* U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW */
+  IBUS_KEY_dead_belowcomma, IBUS_KEY_s, 0, 0, 0,
+    0, 0x0219, /* U0219 # LATIN SMALL LETTER S WITH COMMA BELOW */
+  IBUS_KEY_dead_belowcomma, IBUS_KEY_t, 0, 0, 0,
+    0, 0x021B, /* U021B # LATIN SMALL LETTER T WITH COMMA BELOW */
+  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_slash, 0, 0,
+    0, 0x301E, /* U301e # DOUBLE PRIME QUOTATION MARK */
+  IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_backslash, 0, 0,
+    0, 0x301D, /* U301d # REVERSED DOUBLE PRIME QUOTATION MARK */
+  IBUS_KEY_Multi_key, IBUS_KEY_apostrophe, 0x03D2, 0, 0,
+    0, 0x03D3, /* U03D3 # GREEK UPSILON WITH ACUTE AND HOOK SYMBOL */
+  IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_5, IBUS_KEY_0, IBUS_KEY_parenright,
+    0, 0x32BF, /* U32BF # CIRCLED NUMBER FIFTY */
+  IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_KP_5, IBUS_KEY_0, IBUS_KEY_parenright,
+    0, 0x32BF, /* U32BF # CIRCLED NUMBER FIFTY */
+  IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_E, 0, 0,
+    0, 0x0228, /* U0228 # LATIN CAPITAL LETTER E WITH CEDILLA */
+  IBUS_KEY_Multi_key, IBUS_KEY_comma, IBUS_KEY_e, 0, 0,
+    0, 0x0229, /* U0229 # LATIN SMALL LETTER E WITH CEDILLA */
+  IBUS_KEY_Multi_key, IBUS_KEY_period, 0x1E63, 0, 0,
+    0, 0x1E69, /* U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE */
+  IBUS_KEY_Multi_key, IBUS_KEY_question, IBUS_KEY_exclam, 0, 0,
+    0, 0x203D, /* U203D # INTERROBANG */
+  IBUS_KEY_Multi_key, IBUS_KEY_L, IBUS_KEY_equal, 0, 0,
+    0, 0x20A4, /* U20a4 # LIRA SIGN */
+  IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_comma, IBUS_KEY_E, 0,
+    0, 0x1E1C, /* U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE */
+  IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_comma, IBUS_KEY_e, 0,
+    0, 0x1E1D, /* U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE */
+  IBUS_KEY_Multi_key, IBUS_KEY_d, IBUS_KEY_minus, 0, 0,
+    0, 0x20AB, /* U20ab # DONG SIGN */
+  IBUS_KEY_Multi_key, IBUS_KEY_e, IBUS_KEY_e, 0, 0,
+    0, 0x018F, /* U018f */
+  IBUS_KEY_Multi_key, IBUS_KEY_acute, 0x03D2, 0, 0,
+    0, 0x03D3, /* U03D3 # GREEK UPSILON WITH ACUTE AND HOOK SYMBOL */
+  IBUS_KEY_Multi_key, 0x2203, 0x0338, 0, 0,
+    0, 0x2204, /* U2204 # THERE DOES NOT EXIST */
+  IBUS_KEY_Multi_key, 0x2208, 0x0338, 0, 0,
+    0, 0x2209, /* U2209 # NOT AN ELEMENT OF */
+  IBUS_KEY_Multi_key, 0x220B, 0x0338, 0, 0,
+    0, 0x220C, /* U220C # DOES NOT CONTAIN AS MEMBER */
+  IBUS_KEY_Multi_key, 0x2223, 0x0338, 0, 0,
+    0, 0x2224, /* U2224 # DOES NOT DIVIDE */
+  IBUS_KEY_Multi_key, 0x2225, 0x0338, 0, 0,
+    0, 0x2226, /* U2226 # NOT PARALLEL TO */
+  IBUS_KEY_Multi_key, 0x2286, 0x0338, 0, 0,
+    0, 0x2288, /* U2288 # NEITHER A SUBSET OF NOR EQUAL TO */
+  IBUS_KEY_Multi_key, 0x2287, 0x0338, 0, 0,
+    0, 0x2289, /* U2289 # NEITHER A SUPERSET OF NOR EQUAL TO */
+  IBUS_KEY_Multi_key, 0x2291, 0x0338, 0, 0,
+    0, 0x22E2, /* U22E2 # NOT SQUARE IMAGE OF OR EQUAL TO */
+  IBUS_KEY_Multi_key, 0x2292, 0x0338, 0, 0,
+    0, 0x22E3, /* U22E3 # NOT SQUARE ORIGINAL OF OR EQUAL TO */
+  IBUS_KEY_Multi_key, 0x22B4, 0x0338, 0, 0,
+    0, 0x22EC, /* U22EC # NOT NORMAL SUBGROUP OF OR EQUAL TO */
+  IBUS_KEY_Multi_key, 0x22B5, 0x0338, 0, 0,
+    0, 0x22ED  /* U22ED # DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL */
+};
+
+static const IBusComposeTable ibus_compose_table_pt_br = {
+    ibus_compose_seqs_pt_br,
+    5,
+    G_N_ELEMENTS (ibus_compose_seqs_pt_br) / (5 + 2)
+};
+
+static const IBusComposeTableLocaleList ibus_compose_table_locale_list[] = {
+    { "el_gr", &ibus_compose_table_el_gr },
+    { "fi_fi", &ibus_compose_table_fi_fi },
+    { "pt_br", &ibus_compose_table_pt_br },
+    { NULL, NULL }
+};
+
+#endif
diff -Nru ibus-1.5.4/src/ibusconfig.h ibus-1.5.5/src/ibusconfig.h
--- ibus-1.5.4/src/ibusconfig.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusconfig.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_CONFIG_H_
+#define __IBUS_CONFIG_H_
+
 /**
  * SECTION: ibusconfig
  * @title: IBusConfig
@@ -34,8 +37,6 @@
  *
  * Currently, IBusConfig supports gconf.
  */
-#ifndef __CONFIG_H_
-#define __CONFIG_H_
 
 #include "ibusproxy.h"
 
@@ -116,7 +117,6 @@
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback pass to
  *      ibus_config_new_async().
  * @error: Return location for error or %NULL.
- *
  * @returns: A newly allocated #IBusConfig.
  *
  * Finishes an operation started with ibus_config_new_async().
diff -Nru ibus-1.5.4/src/ibusconfigservice.h ibus-1.5.5/src/ibusconfigservice.h
--- ibus-1.5.4/src/ibusconfigservice.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusconfigservice.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_CONFIG_SERVICE_H_
+#define __IBUS_CONFIG_SERVICE_H_
+
 /**
  * SECTION: ibusconfigservice
  * @short_description: Configuration service back-end.
@@ -95,8 +98,8 @@
  *             
  *                 Returns:
  *                 TRUE if succeed; FALSE otherwise.
-*             
-*         
+ *             
+ *        
  *        Get value of a configuration option.
  *        
  *     
@@ -131,8 +134,6 @@
  *     
  * 
  */
-#ifndef __IBUS_CONFIG_SERVICE_H_
-#define __IBUS_CONFIG_SERVICE_H_
 
 #include "ibusservice.h"
 
@@ -188,7 +189,6 @@
      * @config: An IBusConfig.
      * @section: section name
      * @name: value name
-     *
      * @returns: (transfer full): The value in config associated with section and name.
      *
      */
diff -Nru ibus-1.5.4/src/ibusdebug.h ibus-1.5.5/src/ibusdebug.h
--- ibus-1.5.4/src/ibusdebug.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusdebug.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_DEBUG_H_
+#define __IBUS_DEBUG_H_
+
 /**
  * SECTION: ibusdebug
  * @short_description: Debug message output.
@@ -31,8 +34,6 @@
  *
  * This section lists functions that generate debug and warning messages.
  */
-#ifndef __IBUS_DEBUG_H_
-#define __IBUS_DEBUG_H_
 
 /**
  * ibus_warning:
diff -Nru ibus-1.5.4/src/ibusengine.h ibus-1.5.5/src/ibusengine.h
--- ibus-1.5.4/src/ibusengine.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusengine.h	2014-01-14 12:59:14.000000000 +0900
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_ENGINE_H_
+#define __IBUS_ENGINE_H_
+
 /**
  * SECTION: ibusengine
  * @short_description: Input method engine abstract.
@@ -35,8 +38,6 @@
  *
  * see_also: #IBusComponent, #IBusEngineDesc
  */
-#ifndef __IBUS_ENGINE_H_
-#define __IBUS_ENGINE_H_
 
 #include "ibusservice.h"
 #include "ibusattribute.h"
diff -Nru ibus-1.5.4/src/ibusenginedesc.h ibus-1.5.5/src/ibusenginedesc.h
--- ibus-1.5.4/src/ibusenginedesc.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusenginedesc.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* bus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_ENGINE_DESC_H_
+#define __IBUS_ENGINE_DESC_H_
+
 /**
  * SECTION: ibusenginedesc
  * @short_description:  Input method engine description data.
@@ -39,13 +42,10 @@
  * using ibus_component_new_from_file() to load a component file,
  * which also includes engine description data.
  *
- * @see_also: #IBusComponent, #IBusEngine
+ * see_also: #IBusComponent, #IBusEngine
  *
  */
 
-#ifndef __ENGINE_DESC_H_
-#define __ENGINE_DESC_H_
-
 #include "ibusserializable.h"
 #include "ibusxml.h"
 
diff -Nru ibus-1.5.4/src/ibusenginesimple.c ibus-1.5.5/src/ibusenginesimple.c
--- ibus-1.5.4/src/ibusenginesimple.c	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusenginesimple.c	2014-01-14 12:59:14.000000000 +0900
@@ -29,20 +29,18 @@
 #include "ibuskeys.h"
 #include "ibuskeysyms.h"
 
-#include 
+#include "ibuscomposetable.h"
+
+#ifdef HAVE_LOCALE_H
+#include 
+#endif
+
 #include 
+#include 
 
 #define IBUS_ENGINE_SIMPLE_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_ENGINE_SIMPLE, IBusEngineSimplePrivate))
 
-typedef struct _IBusComposeTable IBusComposeTable;
-struct _IBusComposeTable
-{
-    const guint16 *data;
-    gint max_seq_len;
-    gint n_seqs;
-};
-
 typedef struct _IBusComposeTableCompact IBusComposeTableCompact;
 struct _IBusComposeTableCompact
 {
@@ -76,7 +74,7 @@
 static const IBusComposeTableCompact ibus_compose_table_compact = {
     gtk_compose_seqs_compact,
     5,
-    24,
+    25,
     6
 };
 
@@ -930,3 +928,33 @@
     priv->tables = g_slist_prepend (priv->tables, table);
 
 }
+
+gboolean
+ibus_engine_simple_add_table_by_locale (IBusEngineSimple *simple,
+                                        const gchar      *locale)
+{
+    int i;
+
+    if (locale == NULL) {
+#ifdef HAVE_LOCALE_H
+        locale = setlocale (LC_CTYPE, NULL);
+#endif
+        if (locale == NULL)
+            locale = "C";
+    }
+
+    for (i = 0; ibus_compose_table_locale_list[i].locale != NULL; i++) {
+        const gchar *locale2 = ibus_compose_table_locale_list[i].locale;
+        const IBusComposeTable *table = ibus_compose_table_locale_list[i].table;
+
+        if (g_ascii_strncasecmp (locale, locale2 , strlen (locale2)) == 0) {
+            ibus_engine_simple_add_table (simple,
+                                          table->data,
+                                          table->max_seq_len,
+                                          table->n_seqs);
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
diff -Nru ibus-1.5.4/src/ibusenginesimple.h ibus-1.5.5/src/ibusenginesimple.h
--- ibus-1.5.4/src/ibusenginesimple.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusenginesimple.h	2014-01-14 12:59:14.000000000 +0900
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_ENGINE_SIMPLE_H__
+#define __IBUS_ENGINE_SIMPLE_H__
+
 /**
  * SECTION: ibussimpleengine
  * @short_description: Input method engine supporting table-based input method
@@ -34,8 +37,6 @@
  *
  * see_also: #IBusEngine
  */
-#ifndef __IBUS_ENGINE_SIMPLE_H__
-#define __IBUS_ENGINE_SIMPLE_H__
 
 #include "ibusengine.h"
 
@@ -110,11 +111,23 @@
  * The table must be sorted in dictionary order on the numeric value of the key
  * symbol fields. (Values beyond the length of the sequence should be zero.)
  */
-void    ibus_engine_simple_add_table      (IBusEngineSimple     *simple,
-                                           const guint16        *data,
-                                           gint                  max_seq_len,
-                                           gint                  n_seqs);
+void             ibus_engine_simple_add_table   (IBusEngineSimple  *simple,
+                                                 const guint16     *data,
+                                                 gint               max_seq_len,
+                                                 gint               n_seqs);
 
+/**
+ * ibus_engine_simple_add_table_by_locale:
+ * @simple: An IBusEngineSimple.
+ * @locale: (allow-none): The locale name. If the locale is %NULL,
+ *                        the current locale is used.
+ * @returns: %TRUE if the @locale is matched to the table.
+ *
+ * Call ibus_engine_simple_add_table() internally by locale.
+ */
+gboolean         ibus_engine_simple_add_table_by_locale
+                                                (IBusEngineSimple  *simple,
+                                                 const gchar       *locale);
 G_END_DECLS
 
 #endif // __IBUS_ENGINE_SIMPLE_H__
diff -Nru ibus-1.5.4/src/ibusenumtypes.h ibus-1.5.5/src/ibusenumtypes.h
--- ibus-1.5.4/src/ibusenumtypes.h	2013-09-20 12:19:30.000000000 +0900
+++ ibus-1.5.5/src/ibusenumtypes.h	2014-01-14 13:01:52.000000000 +0900
@@ -1,6 +1,9 @@
 
 /* Generated data (by glib-mkenums) */
 
+#ifndef __IBUS_ENUM_TYPES_H__
+#define __IBUS_ENUM_TYPES_H__
+
 /**
  * SECTION: ibusenumtypes
  * @short_description: Enumeration definition in IBus.
@@ -8,8 +11,6 @@
  *
  * IBusEnumTypes lists IBus enumeration types.
  */
-#ifndef __IBUS_ENUM_TYPES_H__
-#define __IBUS_ENUM_TYPES_H__
 
 #include 
 
diff -Nru ibus-1.5.4/src/ibusenumtypes.h.template ibus-1.5.5/src/ibusenumtypes.h.template
--- ibus-1.5.4/src/ibusenumtypes.h.template	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusenumtypes.h.template	2014-01-14 12:59:14.000000000 +0900
@@ -1,4 +1,7 @@
 /*** BEGIN file-header ***/
+#ifndef __IBUS_ENUM_TYPES_H__
+#define __IBUS_ENUM_TYPES_H__
+
 /**
  * SECTION: ibusenumtypes
  * @short_description: Enumeration definition in IBus.
@@ -6,8 +9,6 @@
  *
  * IBusEnumTypes lists IBus enumeration types.
  */
-#ifndef __IBUS_ENUM_TYPES_H__
-#define __IBUS_ENUM_TYPES_H__
 
 #include 
 
diff -Nru ibus-1.5.4/src/ibuserror.h ibus-1.5.5/src/ibuserror.h
--- ibus-1.5.4/src/ibuserror.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibuserror.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2011 Peng Huang 
+ * Copyright (C) 2011-2013 Peng Huang 
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,18 +23,17 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_ERROR_H_
+#define __IBUS_ERROR_H_
+
 /**
- * SECTION: ibusshare
- * @short_description: Shared utility functions and definition.
+ * SECTION: ibuserror
+ * @short_description: Error functions and definition.
  * @stability: Stable
  *
- * This file defines some utility functions and definition
- * which are shared among ibus component and services.
+ * This file defines some error functions and definition.
  */
 
-#ifndef __IBUS_ERROR_H_
-#define __IBUS_ERROR_H_
-
 #include 
 
 G_BEGIN_DECLS
diff -Nru ibus-1.5.4/src/ibusfactory.h ibus-1.5.5/src/ibusfactory.h
--- ibus-1.5.4/src/ibusfactory.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusfactory.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_FACTORY_H_
+#define __IBUS_FACTORY_H_
+
 /**
  * SECTION: ibusfactory
  * @short_description: Factory for creating engine instances.
@@ -34,11 +37,9 @@
  * It provides CreateEngine remote method, which creates an IME instance by name,
  * and returns the D-Bus object path to IBus daemon.
  *
- * @see_also: #IBusEngine
+ * see_also: #IBusEngine
  *
  */
-#ifndef __IBUS_FACTORY_H_
-#define __IBUS_FACTORY_H_
 
 #include "ibusservice.h"
 #include "ibusserializable.h"
diff -Nru ibus-1.5.4/src/ibushotkey.h ibus-1.5.5/src/ibushotkey.h
--- ibus-1.5.4/src/ibushotkey.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibushotkey.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_HOTKEY_H_
+#define __IBUS_HOTKEY_H_
+
 /**
  * SECTION: ibushotkey
  * @short_description: Hotkeys and associated events.
@@ -31,8 +34,6 @@
  *
  * An IBusHotkeyProfile associates a hotkey and an event.
  */
-#ifndef __IBUS_HOTKEY_H_
-#define __IBUS_HOTKEY_H_
 
 #include "ibusserializable.h"
 
diff -Nru ibus-1.5.4/src/ibusinputcontext.c ibus-1.5.5/src/ibusinputcontext.c
--- ibus-1.5.4/src/ibusinputcontext.c	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusinputcontext.c	2014-01-14 12:59:14.000000000 +0900
@@ -250,6 +250,8 @@
     /**
      * IBusInputContext::update-auxiliary-text:
      * @context: An IBusInputContext.
+     * @text: An auxiliary text
+     * @visible: The visibility of @text
      *
      * Emitted to hide auxilary text.
      *
diff -Nru ibus-1.5.4/src/ibuskeymap.h ibus-1.5.5/src/ibuskeymap.h
--- ibus-1.5.4/src/ibuskeymap.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibuskeymap.h	2014-01-14 12:59:14.000000000 +0900
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_KEYMAP_H_
+#define __IBUS_KEYMAP_H_
+
 /**
  * SECTION: ibuskeymap
  * @short_description: Keyboard mapping handling.
@@ -41,13 +44,10 @@
  * Then ibus_keymap_lookup_keysym() can
  * convert scancodes back to the key symbols.
  *
- * @see_also: #IBusComponent, #IBusEngineDesc
+ * see_also: #IBusComponent, #IBusEngineDesc
  *
  */
 
-#ifndef __IBUS_KEYMAP_H_
-#define __IBUS_KEYMAP_H_
-
 #include "ibusobject.h"
 
 /*
@@ -129,7 +129,8 @@
 /**
  * ibus_keymap_get:
  * @name: The keymap file to be loaded, such as 'us', 'jp'.
- * @returns: An IBusKeymap associated with the giving name; or NULL if failed.
+ * @returns: (transfer full): An IBusKeymap associated with the giving name;
+ * or %NULL if failed.
  *
  * Get an IBusKeymap associated with the giving name.
  *
diff -Nru ibus-1.5.4/src/ibuskeysyms-compat.h ibus-1.5.5/src/ibuskeysyms-compat.h
--- ibus-1.5.4/src/ibuskeysyms-compat.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibuskeysyms-compat.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_KEYSYMS_COMPAT_H__
+#define __IBUS_KEYSYMS_COMPAT_H__
+
 /**
  * SECTION: ibuskeysyms
  * @short_description: Key symbol definition.
@@ -36,13 +39,10 @@
  * Most of the key symbols are not explicit documented,
  * because they are self-explaining.
  *
- * @see_also: #IBusKeymap, #IBusHotkeyProfile
+ * see_also: #IBusKeymap, #IBusHotkeyProfile
  *
  */
 
-#ifndef __IBUS_KEYSYMS_COMPAT_H__
-#define __IBUS_KEYSYMS_COMPAT_H__
-
 
 #define IBUS_VoidSymbol 0xffffff
 #define IBUS_BackSpace 0xff08
diff -Nru ibus-1.5.4/src/ibuskeysyms.h ibus-1.5.5/src/ibuskeysyms.h
--- ibus-1.5.4/src/ibuskeysyms.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibuskeysyms.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -286,6 +286,7 @@
 #define IBUS_KEY_dead_U 0xfe89
 #define IBUS_KEY_dead_small_schwa 0xfe8a
 #define IBUS_KEY_dead_capital_schwa 0xfe8b
+#define IBUS_KEY_dead_greek 0xfe8c
 #define IBUS_KEY_First_Virtual_Screen 0xfed0
 #define IBUS_KEY_Prev_Virtual_Screen 0xfed1
 #define IBUS_KEY_Next_Virtual_Screen 0xfed2
@@ -1632,7 +1633,9 @@
 #define IBUS_KEY_ocaron 0x10001d2
 #define IBUS_KEY_obarred 0x1000275
 #define IBUS_KEY_SCHWA 0x100018f
+#define IBUS_KEY_EZH 0x10001b7
 #define IBUS_KEY_schwa 0x1000259
+#define IBUS_KEY_ezh 0x1000292
 #define IBUS_KEY_Lbelowdot 0x1001e36
 #define IBUS_KEY_lbelowdot 0x1001e37
 #define IBUS_KEY_Abelowdot 0x1001ea0
diff -Nru ibus-1.5.4/src/ibuskeyuni.c ibus-1.5.5/src/ibuskeyuni.c
--- ibus-1.5.4/src/ibuskeyuni.c	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibuskeyuni.c	2014-01-14 12:59:14.000000000 +0900
@@ -861,16 +861,6 @@
   { 0xFFFF /* Delete */, '\177' }
 };
 
-/**
- * ibus_keyval_to_unicode:
- * @keyval: an IBus key symbol 
- * 
- * Convert from an IBus key symbol to the corresponding ISO10646 (Unicode)
- * character.
- * 
- * Return value: the corresponding unicode character, or 0 if there
- *               is no corresponding character.
- **/
 gunichar
 ibus_keyval_to_unicode (guint keyval)
 {
@@ -1661,16 +1651,6 @@
   { 0x0ef7, 0x318e }, /*               Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */
 };
 
-/**
- * ibus_unicode_to_keyval:
- * @wc: a ISO10646 encoded character
- * 
- * Convert from a ISO10646 character to a key symbol.
- * 
- * Return value: the corresponding IBus key symbol, if one exists.
- *               or, if there is no corresponding symbol, 
- *               wc | 0x01000000
- **/
 guint
 ibus_unicode_to_keyval (gunichar wc)
 {
diff -Nru ibus-1.5.4/src/ibuslookuptable.h ibus-1.5.5/src/ibuslookuptable.h
--- ibus-1.5.4/src/ibuslookuptable.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibuslookuptable.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,20 +24,23 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_LOOKUP_TABLE_H_
+#define __IBUS_LOOKUP_TABLE_H_
+
 /**
  * SECTION: ibuslookuptable
  * @short_description: Candidate word/phrase lookup table.
  * @stability: Stable
- * @see_also: #IBusEngine
  *
- * An IBusLookuptable stores the candidate words or phrases for users to choose from.
+ * An IBusLookuptable stores the candidate words or phrases for users to
+ * choose from.
  *
  * Use ibus_engine_update_lookup_table(), ibus_engine_show_lookup_table(),
  * and ibus_engine_hide_lookup_table() to update, show and hide the lookup
  * table.
+ *
+ * see_also: #IBusEngine
  */
-#ifndef __IBUS_LOOKUP_TABLE_H_
-#define __IBUS_LOOKUP_TABLE_H_
 
 #include "ibusserializable.h"
 #include "ibustext.h"
diff -Nru ibus-1.5.4/src/ibusobject.c ibus-1.5.5/src/ibusobject.c
--- ibus-1.5.4/src/ibusobject.c	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusobject.c	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -162,13 +162,6 @@
     g_signal_handlers_destroy (obj);
 }
 
-/**
- * ibus_object_new:
- *
- * Creates a new instance of an #IBusObject.
- *
- * Returns: a new instance of #IBusObject.
- */
 IBusObject *
 ibus_object_new (void)
 {
diff -Nru ibus-1.5.4/src/ibusobject.h ibus-1.5.5/src/ibusobject.h
--- ibus-1.5.4/src/ibusobject.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusobject.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_OBJECT_H_
+#define __IBUS_OBJECT_H_
+
 /**
  * SECTION: ibusobject
  * @short_description: Base object of IBus.
@@ -32,8 +35,6 @@
  *
  * IBusObject is the base object for all objects in IBus.
  */
-#ifndef __IBUS_OBJECT_H_
-#define __IBUS_OBJECT_H_
 
 #include 
 #include "ibustypes.h"
@@ -90,7 +91,7 @@
     IBusObjectPrivate *priv;
 };
 
-typedef void ( *IBusObjectDestroyFunc) (IBusObject *);
+typedef void ( *IBusObjectDestroyFunc) (IBusObject *object);
 
 struct _IBusObjectClass {
     GInitiallyUnownedClass parent;
diff -Nru ibus-1.5.4/src/ibusobservedpath.h ibus-1.5.5/src/ibusobservedpath.h
--- ibus-1.5.4/src/ibusobservedpath.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusobservedpath.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input IBus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_OBSERVED_PATH_H_
+#define __IBUS_OBSERVED_PATH_H_
+
 /**
  * SECTION: ibusobservedpath
  * @short_description: Path object of IBus.
@@ -33,9 +36,6 @@
  * such as monitor modification, directory tree traversal.
  */
 
-#ifndef __IBUS_OBSERVED_PATH_H_
-#define __IBUS_OBSERVED_PATH_H_
-
 #include "ibusserializable.h"
 #include "ibusxml.h"
 
@@ -117,9 +117,11 @@
  * ibus_observed_path_traverse:
  * @path: An IBusObservedPath.
  * @dir_only: Only looks for subdirs, not files
- * @returns: (element-type IBusObservedPath): A newly allocate GList which holds content in path; NULL if @path is not directory.
+ * @returns: (transfer full) (element-type IBusObservedPath): A newly allocate
+ * GList which holds content in path; NULL if @path is not directory.
  *
- * Recursively traverse the path and put the files and subdirectory in to a newly allocated
+ * Recursively traverse the path and put the files and subdirectory in to
+ * a newly allocated
  * GLists, if the @path is a directory. Otherwise returns NULL.
  */
 GList               *ibus_observed_path_traverse            (IBusObservedPath   *path,
diff -Nru ibus-1.5.4/src/ibuspanelservice.c ibus-1.5.5/src/ibuspanelservice.c
--- ibus-1.5.4/src/ibuspanelservice.c	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibuspanelservice.c	2014-01-14 12:59:14.000000000 +0900
@@ -266,6 +266,7 @@
     /* install signals */
     /**
      * IBusPanelService::update-preedit-text:
+     * @panel: An #IBusPanelService
      * @text: A preedit text to be updated.
      * @cursor_pos: The cursor position of the text.
      * @visible: Whether the update is visible.
@@ -292,6 +293,7 @@
 
     /**
      * IBusPanelService::update-auxiliary-text:
+     * @panel: An #IBusPanelService
      * @text: A preedit text to be updated.
      * @visible: Whether the update is visible.
      *
@@ -316,6 +318,7 @@
 
     /**
      * IBusPanelService::update-lookup-table:
+     * @panel: An #IBusPanelService
      * @lookup_table: A lookup table to be updated.
      * @visible: Whether the update is visible.
      *
@@ -340,6 +343,7 @@
 
     /**
      * IBusPanelService::focus-in:
+     * @panel: An #IBusPanelService
      * @input_context_path: Object path of InputContext.
      *
      * Emitted when the client application get the focus-in.
@@ -362,6 +366,7 @@
 
     /**
      * IBusPanelService::focus-out:
+     * @panel: An #IBusPanelService
      * @input_context_path: Object path of InputContext.
      *
      * Emitted when the client application get the focus-out.
@@ -384,6 +389,7 @@
 
     /**
      * IBusPanelService::register-properties:
+     * @panel: An #IBusPanelService
      * @prop_list: An IBusPropList that contains properties.
      *
      * Emitted when the client application get the register-properties.
@@ -406,6 +412,7 @@
 
     /**
      * IBusPanelService::update-property:
+     * @panel: An #IBusPanelService
      * @prop: The IBusProperty to be updated.
      *
      * Emitted when the client application get the update-property.
@@ -428,6 +435,7 @@
 
     /**
      * IBusPanelService::set-cursor-location:
+     * @panel: An #IBusPanelService
      * @x: X coordinate of the cursor.
      * @y: Y coordinate of the cursor.
      * @w: Width of the cursor.
@@ -456,6 +464,7 @@
 
     /**
      * IBusPanelService::cursor-up-lookup-table:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the cursor-up-lookup-table.
      * Implement the member function cursor_up_lookup_table() in extended
@@ -475,6 +484,7 @@
 
     /**
      * IBusPanelService::cursor-down-lookup-table:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the cursor-down-lookup-table.
      * Implement the member function cursor_down_lookup_table() in extended
@@ -494,6 +504,7 @@
 
     /**
      * IBusPanelService::hide-auxiliary-text:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the hide-auxiliary-text.
      * Implement the member function hide_auxiliary_text() in extended class
@@ -513,6 +524,7 @@
 
     /**
      * IBusPanelService::hide-language-bar:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the hide-language-bar.
      * Implement the member function hide_language_bar() in extended class to
@@ -532,6 +544,7 @@
 
     /**
      * IBusPanelService::hide-lookup-table:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the hide-lookup-table.
      * Implement the member function hide_lookup_table() in extended class to
@@ -551,6 +564,7 @@
 
     /**
      * IBusPanelService::hide-preedit-text:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the hide-preedit-text.
      * Implement the member function hide_preedit_text() in extended class to
@@ -570,6 +584,7 @@
 
     /**
      * IBusPanelService::page-up-lookup-table:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the page-up-lookup-table.
      * Implement the member function page_up_lookup_table() in extended class
@@ -589,6 +604,7 @@
 
     /**
      * IBusPanelService::page-down-lookup-table:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the page-down-lookup-table.
      * Implement the member function page_down_lookup_table() in extended
@@ -608,6 +624,7 @@
 
     /**
      * IBusPanelService::reset:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the reset.
      * Implement the member function reset() in extended class to receive this
@@ -627,6 +644,7 @@
 
     /**
      * IBusPanelService::show-auxiliary-text:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the show-auxiliary-text.
      * Implement the member function show_auxiliary_text() in extended class
@@ -646,6 +664,7 @@
 
     /**
      * IBusPanelService::show-language-bar:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the show-language-bar.
      * Implement the member function show_language_bar() in extended class to
@@ -665,6 +684,7 @@
 
     /**
      * IBusPanelService::show-lookup-table:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the show-lookup-table.
      * Implement the member function show_lookup_table() in extended class to
@@ -684,6 +704,7 @@
 
     /**
      * IBusPanelService::show-preedit-text:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the show-preedit-text.
      * Implement the member function show_preedit_text() in extended class to
@@ -703,6 +724,7 @@
 
     /**
      * IBusPanelService::start-setup:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the start-setup.
      * Implement the member function start_setup() in extended class to
@@ -722,6 +744,7 @@
 
     /**
      * IBusPanelService::state-changed:
+     * @panel: An #IBusPanelService
      *
      * Emitted when the client application get the state-changed.
      * Implement the member function state_changed() in extended class to
@@ -741,6 +764,7 @@
 
     /**
      * IBusPanelService::destroy-context:
+     * @panel: An #IBusPanelService
      * @input_context_path: Object path of InputContext.
      *
      * Emitted when the client application destroys.
diff -Nru ibus-1.5.4/src/ibusproplist.h ibus-1.5.5/src/ibusproplist.h
--- ibus-1.5.4/src/ibusproplist.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusproplist.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,17 +24,18 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_PROP_LIST_H_
+#define __IBUS_PROP_LIST_H_
+
 /**
  * SECTION: ibusproplist
  * @Title: IBusPropList
  * @Short_description: An #IBusProperty container.
  * @Stability: Stable
  *
- * @See_also: #IBusProperty, #IBusEngine
+ * See_also: #IBusProperty, #IBusEngine
  *
  */
-#ifndef __IBUS_PROP_LIST_H_
-#define __IBUS_PROP_LIST_H_
 
 #include "ibusserializable.h"
 #include "ibusproperty.h"
diff -Nru ibus-1.5.4/src/ibusproxy.h ibus-1.5.5/src/ibusproxy.h
--- ibus-1.5.4/src/ibusproxy.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusproxy.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,20 +24,24 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_PROXY_H_
+#define __IBUS_PROXY_H_
+
 /**
  * SECTION: ibusproxy
  * @short_description: Base proxy object.
  * @stability: Stable
  *
  * An IBusProxy is the base of all proxy objects,
- * which communicate the corresponding #IBusServices on the other end of IBusConnection.
- * For example, IBus clients (such as editors, web browsers) invoke the proxy object,
- * IBusInputContext to communicate with the InputContext service of the ibus-daemon.
+ * which communicate the corresponding #IBusServices on the other end of
+ * IBusConnection.
+ * For example, IBus clients (such as editors, web browsers) invoke the proxy
+ * object,
+ * IBusInputContext to communicate with the InputContext service of the
+ * ibus-daemon.
  *
  * Almost all services have corresponding proxies, except very simple services.
  */
-#ifndef __IBUS_PROXY_H_
-#define __IBUS_PROXY_H_
 
 #include 
 
diff -Nru ibus-1.5.4/src/ibusserializable.h ibus-1.5.5/src/ibusserializable.h
--- ibus-1.5.4/src/ibusserializable.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusserializable.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_SERIALIZABLE_H_
+#define __IBUS_SERIALIZABLE_H_
+
 /**
  * SECTION: ibusserializable
  * @short_description: A serializable object.
@@ -48,8 +51,6 @@
  * See IBusSerializableSerializeFunc(), IBusSerializableDeserializeFunc(), IBusSerializableCopyFunc()
  * for function prototype.
  */
-#ifndef __IBUS_SERIALIZABLE_H_
-#define __IBUS_SERIALIZABLE_H_
 
 #include "ibusobject.h"
 
diff -Nru ibus-1.5.4/src/ibusservice.h ibus-1.5.5/src/ibusservice.h
--- ibus-1.5.4/src/ibusservice.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusservice.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_SERVICE_H_
+#define __IBUS_SERVICE_H_
+
 /**
  * SECTION: ibusservice
  * @short_description: IBus service back-end.
@@ -32,9 +35,6 @@
  * An IBusService is a base class for services.
  */
 
-#ifndef __IBUS_SERVICE_H_
-#define __IBUS_SERVICE_H_
-
 #include 
 #include "ibusobject.h"
 
@@ -178,7 +178,7 @@
  *
  * Send signal to all the IBusConnections of an IBusService.
  *
- * @see_also: g_dbus_connection_emit_signal()
+ * see_also: g_dbus_connection_emit_signal()
  */
 gboolean         ibus_service_emit_signal       (IBusService        *service,
                                                  const gchar        *dest_bus_name,
diff -Nru ibus-1.5.4/src/ibusshare.h ibus-1.5.5/src/ibusshare.h
--- ibus-1.5.4/src/ibusshare.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusshare.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_SHARE_H_
+#define __IBUS_SHARE_H_
+
 /**
  * SECTION: ibusshare
  * @short_description: Shared utility functions and definition.
@@ -33,9 +36,6 @@
  * which are shared among ibus component and services.
  */
 
-#ifndef __IBUS_SHARE_H_
-#define __IBUS_SHARE_H_
-
 #include 
 
 #ifdef IBUS_DISABLE_DEPRECATION_WARNINGS
diff -Nru ibus-1.5.4/src/ibustext.h ibus-1.5.5/src/ibustext.h
--- ibus-1.5.4/src/ibustext.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibustext.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* IBus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,20 +24,21 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_TEXT_H_
+#define __IBUS_TEXT_H_
+
 /**
  * SECTION: ibustext
  * @short_description: Text with decorating information.
- * @see_also: #IBusAttribute
  *
  * An IBusText is the main text object in IBus.
  * The text is decorated according to associated IBusAttribute,
  * e.g. the foreground/background color, underline, and
  * applied scope.
+ *
+ * see_also: #IBusAttribute
  */
 
-#ifndef __IBUS_TEXT_H_
-#define __IBUS_TEXT_H_
-
 #include "ibusserializable.h"
 #include "ibusattrlist.h"
 
diff -Nru ibus-1.5.4/src/ibustypes.h ibus-1.5.5/src/ibustypes.h
--- ibus-1.5.4/src/ibustypes.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibustypes.h	2014-01-14 12:59:14.000000000 +0900
@@ -24,16 +24,18 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_TYPES_H_
+#define __IBUS_TYPES_H_
+
 /**
  * SECTION: ibustypes
  * @short_description: Generic types for  IBus.
  * @stability: Stable
  *
- * This section consists generic types for IBus, including shift/control key modifiers,
+ * This section consists generic types for IBus, including shift/control key
+ * modifiers,
  * and a rectangle structure.
  */
-#ifndef __IBUS_TYPES_H_
-#define __IBUS_TYPES_H_
 
 /**
  * IBusModifierType:
diff -Nru ibus-1.5.4/src/ibusutil.h ibus-1.5.5/src/ibusutil.h
--- ibus-1.5.4/src/ibusutil.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusutil.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,9 +1,9 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* bus - The Input Bus
- * Copyright (C) 2008-2011 Peng Huang 
- * Copyright (C) 2010-2011 Takao Fujiwara 
- * Copyright (C) 2008-2011 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2010-2013 Takao Fujiwara 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_UTIL_H_
+#define __IBUS_UTIL_H_
+
 /**
  * SECTION: ibusutil
  * @short_description: Utilities with C-Language.
@@ -33,9 +36,6 @@
  * Utilized functions are available for miscellaneous purposes.
  */
 
-#ifndef __IBUS_UTIL_H_
-#define __IBUS_UTIL_H_
-
 /**
  * ibus_get_language_name:
  * @_locale: A const locale name.
diff -Nru ibus-1.5.4/src/ibusversion.h ibus-1.5.5/src/ibusversion.h
--- ibus-1.5.4/src/ibusversion.h	2013-09-20 12:18:02.000000000 +0900
+++ ibus-1.5.5/src/ibusversion.h	2014-01-14 13:00:40.000000000 +0900
@@ -18,6 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
+
+#ifndef __IBUS_VERSION_H_
+#define __IBUS_VERSION_H_
+
 /**
  * SECTION: ibusversion
  * @short_description: Current version of IBus.
@@ -26,8 +30,6 @@
  * IBusVersion shows the current IBus version.
  */
 
-#ifndef __IBUS_VERSION_H_
-#define __IBUS_VERSION_H_
 /* compile time version
  */
 /**
@@ -49,7 +51,7 @@
  *
  * IBus micro version.
  */
-#define IBUS_MICRO_VERSION				(4)
+#define IBUS_MICRO_VERSION				(5)
 
 /**
  * IBUS_CHECK_VERSION:
diff -Nru ibus-1.5.4/src/ibusversion.h.in ibus-1.5.5/src/ibusversion.h.in
--- ibus-1.5.4/src/ibusversion.h.in	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusversion.h.in	2014-01-14 12:59:14.000000000 +0900
@@ -18,6 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
+
+#ifndef __IBUS_VERSION_H_
+#define __IBUS_VERSION_H_
+
 /**
  * SECTION: ibusversion
  * @short_description: Current version of IBus.
@@ -26,8 +30,6 @@
  * IBusVersion shows the current IBus version.
  */
 
-#ifndef __IBUS_VERSION_H_
-#define __IBUS_VERSION_H_
 /* compile time version
  */
 /**
diff -Nru ibus-1.5.4/src/ibusxml.h ibus-1.5.5/src/ibusxml.h
--- ibus-1.5.4/src/ibusxml.h	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/src/ibusxml.h	2014-01-14 12:59:14.000000000 +0900
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* bus - The Input Bus
- * Copyright (C) 2008-2010 Peng Huang 
- * Copyright (C) 2008-2010 Red Hat, Inc.
+ * Copyright (C) 2008-2013 Peng Huang 
+ * Copyright (C) 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,9 @@
 #error "Only  can be included directly"
 #endif
 
+#ifndef __IBUS_XML_H__
+#define __IBUS_XML_H__
+
 /**
  * SECTION: ibusxml
  * @short_description: XML handling functions for IBus.
@@ -31,8 +34,6 @@
  *
  * IBusXML lists data structure and handling function for XML in IBus.
  */
-#ifndef __IBUS_XML_H__
-#define __IBUS_XML_H__
 
 #include 
 
diff -Nru ibus-1.5.4/tools/Makefile.am ibus-1.5.5/tools/Makefile.am
--- ibus-1.5.4/tools/Makefile.am	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/tools/Makefile.am	2014-01-14 12:59:14.000000000 +0900
@@ -77,7 +77,7 @@
 man_one_in_files = ibus.1.in
 man_one_files = $(man_one_in_files:.1.in=.1)
 man_one_DATA =$(man_one_files:.1=.1.gz) 
-man_onedir = $(datadir)/man/man1
+man_onedir = $(mandir)/man1
 %.1: %.1.in
 	$(AM_V_GEN) sed \
 		-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
diff -Nru ibus-1.5.4/tools/Makefile.in ibus-1.5.5/tools/Makefile.in
--- ibus-1.5.4/tools/Makefile.in	2013-09-20 12:17:27.000000000 +0900
+++ ibus-1.5.5/tools/Makefile.in	2014-01-14 13:00:23.000000000 +0900
@@ -526,7 +526,7 @@
 man_one_in_files = ibus.1.in
 man_one_files = $(man_one_in_files:.1.in=.1)
 man_one_DATA = $(man_one_files:.1=.1.gz) 
-man_onedir = $(datadir)/man/man1
+man_onedir = $(mandir)/man1
 EXTRA_DIST = \
 	$(man_one_in_files) \
 	ibus.bash \
diff -Nru ibus-1.5.4/tools/main.c ibus-1.5.5/tools/main.c
--- ibus-1.5.4/tools/main.c	2013-09-20 12:19:59.000000000 +0900
+++ ibus-1.5.5/tools/main.c	2014-01-14 13:02:15.000000000 +0900
@@ -1,4 +1,4 @@
-/* main.c generated by valac 0.20.1, the Vala compiler
+/* main.c generated by valac 0.22.0, the Vala compiler
  * generated from main.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
@@ -330,9 +330,9 @@
 
 IBusBus* get_bus (void) {
 	IBusBus* result = NULL;
-	IBusBus* _tmp0_;
-	IBusBus* bus;
-	IBusBus* _tmp1_;
+	IBusBus* bus = NULL;
+	IBusBus* _tmp0_ = NULL;
+	IBusBus* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	_tmp0_ = ibus_bus_new ();
 	g_object_ref_sink (_tmp0_);
@@ -382,22 +382,22 @@
 gint list_engine (gchar** argv, int argv_length1) {
 	gint result = 0;
 	static const GOptionEntry options[] = {{"name-only", (gchar) 0, 0, G_OPTION_ARG_NONE, &name_only, "List engine name only", NULL}, {NULL}};
-	GOptionContext* _tmp0_;
-	GOptionContext* option;
-	GOptionContext* _tmp1_;
+	GOptionContext* option = NULL;
+	GOptionContext* _tmp0_ = NULL;
+	GOptionContext* _tmp1_ = NULL;
+	IBusBus* bus = NULL;
 	IBusBus* _tmp6_ = NULL;
-	IBusBus* bus;
-	IBusBus* _tmp7_;
-	IBusBus* _tmp10_;
+	IBusBus* _tmp7_ = NULL;
+	GList* engines = NULL;
+	IBusBus* _tmp10_ = NULL;
 	GList* _tmp11_ = NULL;
-	GList* engines;
-	gboolean _tmp12_;
-	GHashFunc _tmp16_;
-	GEqualFunc _tmp17_;
-	GHashTable* _tmp18_;
-	GHashTable* map;
-	GList* _tmp19_;
-	GHashTable* _tmp38_;
+	gboolean _tmp12_ = FALSE;
+	GHashTable* map = NULL;
+	GHashFunc _tmp16_ = NULL;
+	GEqualFunc _tmp17_ = NULL;
+	GHashTable* _tmp18_ = NULL;
+	GList* _tmp19_ = NULL;
+	GHashTable* _tmp38_ = NULL;
 	GList* _tmp39_ = NULL;
 	GError * _inner_error_ = NULL;
 	_tmp0_ = g_option_context_new (NULL);
@@ -405,7 +405,7 @@
 	_tmp1_ = option;
 	g_option_context_add_main_entries (_tmp1_, options, GETTEXT_PACKAGE);
 	{
-		GOptionContext* _tmp2_;
+		GOptionContext* _tmp2_ = NULL;
 		_tmp2_ = option;
 		g_option_context_parse (_tmp2_, &argv_length1, &argv, &_inner_error_);
 		if (_inner_error_ != NULL) {
@@ -422,9 +422,9 @@
 	__catch0_g_option_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp3_;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
+		FILE* _tmp3_ = NULL;
+		GError* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
 		e = _inner_error_;
 		_inner_error_ = NULL;
 		_tmp3_ = stderr;
@@ -447,7 +447,7 @@
 	bus = _tmp6_;
 	_tmp7_ = bus;
 	if (_tmp7_ == NULL) {
-		FILE* _tmp8_;
+		FILE* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
 		_tmp8_ = stderr;
 		_tmp9_ = _ ("Can't connect to IBus.\n");
@@ -462,7 +462,7 @@
 	engines = _tmp11_;
 	_tmp12_ = name_only;
 	if (_tmp12_) {
-		GList* _tmp13_;
+		GList* _tmp13_ = NULL;
 		_tmp13_ = engines;
 		{
 			GList* engine_collection = NULL;
@@ -472,7 +472,7 @@
 				IBusEngineDesc* engine = NULL;
 				engine = (IBusEngineDesc*) engine_it->data;
 				{
-					IBusEngineDesc* _tmp14_;
+					IBusEngineDesc* _tmp14_ = NULL;
 					const gchar* _tmp15_ = NULL;
 					_tmp14_ = engine;
 					_tmp15_ = ibus_engine_desc_get_name (_tmp14_);
@@ -499,19 +499,19 @@
 			IBusEngineDesc* engine = NULL;
 			engine = (IBusEngineDesc*) engine_it->data;
 			{
-				GHashTable* _tmp20_;
-				IBusEngineDesc* _tmp21_;
+				EngineList* list = NULL;
+				GHashTable* _tmp20_ = NULL;
+				IBusEngineDesc* _tmp21_ = NULL;
 				const gchar* _tmp22_ = NULL;
 				gconstpointer _tmp23_ = NULL;
-				EngineList* _tmp24_;
-				EngineList* list;
-				EngineList* _tmp25_;
-				EngineList* _tmp33_;
-				EngineList* _tmp34_;
-				IBusEngineDesc** _tmp35_;
-				gint _tmp35__length1;
-				IBusEngineDesc* _tmp36_;
-				IBusEngineDesc* _tmp37_;
+				EngineList* _tmp24_ = NULL;
+				EngineList* _tmp25_ = NULL;
+				EngineList* _tmp33_ = NULL;
+				EngineList* _tmp34_ = NULL;
+				IBusEngineDesc** _tmp35_ = NULL;
+				gint _tmp35__length1 = 0;
+				IBusEngineDesc* _tmp36_ = NULL;
+				IBusEngineDesc* _tmp37_ = NULL;
 				_tmp20_ = map;
 				_tmp21_ = engine;
 				_tmp22_ = ibus_engine_desc_get_language (_tmp21_);
@@ -520,13 +520,13 @@
 				list = _tmp24_;
 				_tmp25_ = list;
 				if (_tmp25_ == NULL) {
-					EngineList* _tmp26_;
-					GHashTable* _tmp27_;
-					IBusEngineDesc* _tmp28_;
+					EngineList* _tmp26_ = NULL;
+					GHashTable* _tmp27_ = NULL;
+					IBusEngineDesc* _tmp28_ = NULL;
 					const gchar* _tmp29_ = NULL;
-					gchar* _tmp30_;
-					EngineList* _tmp31_;
-					EngineList* _tmp32_;
+					gchar* _tmp30_ = NULL;
+					EngineList* _tmp31_ = NULL;
+					EngineList* _tmp32_ = NULL;
 					_tmp26_ = engine_list_new ();
 					_engine_list_unref0 (list);
 					list = _tmp26_;
@@ -559,17 +559,17 @@
 			const gchar* language = NULL;
 			language = (const gchar*) language_it->data;
 			{
-				GHashTable* _tmp40_;
-				const gchar* _tmp41_;
+				EngineList* list = NULL;
+				GHashTable* _tmp40_ = NULL;
+				const gchar* _tmp41_ = NULL;
 				gconstpointer _tmp42_ = NULL;
-				EngineList* _tmp43_;
-				EngineList* list;
+				EngineList* _tmp43_ = NULL;
 				const gchar* _tmp44_ = NULL;
-				const gchar* _tmp45_;
+				const gchar* _tmp45_ = NULL;
 				const gchar* _tmp46_ = NULL;
-				EngineList* _tmp47_;
-				IBusEngineDesc** _tmp48_;
-				gint _tmp48__length1;
+				EngineList* _tmp47_ = NULL;
+				IBusEngineDesc** _tmp48_ = NULL;
+				gint _tmp48__length1 = 0;
 				_tmp40_ = map;
 				_tmp41_ = language;
 				_tmp42_ = g_hash_table_lookup (_tmp40_, _tmp41_);
@@ -590,14 +590,14 @@
 					engine_collection = _tmp48_;
 					engine_collection_length1 = _tmp48__length1;
 					for (engine_it = 0; engine_it < _tmp48__length1; engine_it = engine_it + 1) {
-						IBusEngineDesc* _tmp49_;
+						IBusEngineDesc* _tmp49_ = NULL;
 						IBusEngineDesc* engine = NULL;
 						_tmp49_ = _g_object_ref0 (engine_collection[engine_it]);
 						engine = _tmp49_;
 						{
-							IBusEngineDesc* _tmp50_;
+							IBusEngineDesc* _tmp50_ = NULL;
 							const gchar* _tmp51_ = NULL;
-							IBusEngineDesc* _tmp52_;
+							IBusEngineDesc* _tmp52_ = NULL;
 							const gchar* _tmp53_ = NULL;
 							_tmp50_ = engine;
 							_tmp51_ = ibus_engine_desc_get_name (_tmp50_);
@@ -694,43 +694,43 @@
 
 gint exec_setxkbmap (IBusEngineDesc* engine) {
 	gint result = 0;
-	IBusEngineDesc* _tmp0_;
+	gchar* layout = NULL;
+	IBusEngineDesc* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_;
-	gchar* layout;
-	IBusEngineDesc* _tmp3_;
+	gchar* _tmp2_ = NULL;
+	gchar* variant = NULL;
+	IBusEngineDesc* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_;
-	gchar* variant;
-	IBusEngineDesc* _tmp6_;
+	gchar* _tmp5_ = NULL;
+	gchar* option = NULL;
+	IBusEngineDesc* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_;
-	gchar* option;
-	gchar* standard_error;
-	gint exit_status;
-	gchar* _tmp9_;
+	gchar* _tmp8_ = NULL;
+	gchar* standard_error = NULL;
+	gint exit_status = 0;
+	gchar** args = NULL;
+	gchar* _tmp9_ = NULL;
 	gchar** _tmp10_ = NULL;
-	gchar** args;
-	gint args_length1;
-	gint _args_size_;
+	gint args_length1 = 0;
+	gint _args_size_ = 0;
 	gboolean _tmp11_ = FALSE;
 	gboolean _tmp12_ = FALSE;
-	const gchar* _tmp13_;
-	gboolean _tmp15_;
-	gboolean _tmp17_;
+	const gchar* _tmp13_ = NULL;
+	gboolean _tmp15_ = FALSE;
+	gboolean _tmp17_ = FALSE;
 	gboolean _tmp23_ = FALSE;
 	gboolean _tmp24_ = FALSE;
-	const gchar* _tmp25_;
-	gboolean _tmp27_;
-	gboolean _tmp29_;
+	const gchar* _tmp25_ = NULL;
+	gboolean _tmp27_ = FALSE;
+	gboolean _tmp29_ = FALSE;
 	gboolean _tmp35_ = FALSE;
 	gboolean _tmp36_ = FALSE;
-	const gchar* _tmp37_;
-	gboolean _tmp39_;
-	gboolean _tmp41_;
-	gchar** _tmp49_;
-	gint _tmp49__length1;
-	gint _tmp59_;
+	const gchar* _tmp37_ = NULL;
+	gboolean _tmp39_ = FALSE;
+	gboolean _tmp41_ = FALSE;
+	gchar** _tmp49_ = NULL;
+	gint _tmp49__length1 = 0;
+	gint _tmp59_ = 0;
 	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (engine != NULL, 0);
 	_tmp0_ = engine;
@@ -755,7 +755,7 @@
 	_args_size_ = args_length1;
 	_tmp13_ = layout;
 	if (_tmp13_ != NULL) {
-		const gchar* _tmp14_;
+		const gchar* _tmp14_ = NULL;
 		_tmp14_ = layout;
 		_tmp12_ = g_strcmp0 (_tmp14_, "") != 0;
 	} else {
@@ -763,7 +763,7 @@
 	}
 	_tmp15_ = _tmp12_;
 	if (_tmp15_) {
-		const gchar* _tmp16_;
+		const gchar* _tmp16_ = NULL;
 		_tmp16_ = layout;
 		_tmp11_ = g_strcmp0 (_tmp16_, "default") != 0;
 	} else {
@@ -771,13 +771,13 @@
 	}
 	_tmp17_ = _tmp11_;
 	if (_tmp17_) {
-		gchar** _tmp18_;
-		gint _tmp18__length1;
-		gchar* _tmp19_;
-		gchar** _tmp20_;
-		gint _tmp20__length1;
-		const gchar* _tmp21_;
-		gchar* _tmp22_;
+		gchar** _tmp18_ = NULL;
+		gint _tmp18__length1 = 0;
+		gchar* _tmp19_ = NULL;
+		gchar** _tmp20_ = NULL;
+		gint _tmp20__length1 = 0;
+		const gchar* _tmp21_ = NULL;
+		gchar* _tmp22_ = NULL;
 		_tmp18_ = args;
 		_tmp18__length1 = args_length1;
 		_tmp19_ = g_strdup ("-layout");
@@ -790,7 +790,7 @@
 	}
 	_tmp25_ = variant;
 	if (_tmp25_ != NULL) {
-		const gchar* _tmp26_;
+		const gchar* _tmp26_ = NULL;
 		_tmp26_ = variant;
 		_tmp24_ = g_strcmp0 (_tmp26_, "") != 0;
 	} else {
@@ -798,7 +798,7 @@
 	}
 	_tmp27_ = _tmp24_;
 	if (_tmp27_) {
-		const gchar* _tmp28_;
+		const gchar* _tmp28_ = NULL;
 		_tmp28_ = variant;
 		_tmp23_ = g_strcmp0 (_tmp28_, "default") != 0;
 	} else {
@@ -806,13 +806,13 @@
 	}
 	_tmp29_ = _tmp23_;
 	if (_tmp29_) {
-		gchar** _tmp30_;
-		gint _tmp30__length1;
-		gchar* _tmp31_;
-		gchar** _tmp32_;
-		gint _tmp32__length1;
-		const gchar* _tmp33_;
-		gchar* _tmp34_;
+		gchar** _tmp30_ = NULL;
+		gint _tmp30__length1 = 0;
+		gchar* _tmp31_ = NULL;
+		gchar** _tmp32_ = NULL;
+		gint _tmp32__length1 = 0;
+		const gchar* _tmp33_ = NULL;
+		gchar* _tmp34_ = NULL;
 		_tmp30_ = args;
 		_tmp30__length1 = args_length1;
 		_tmp31_ = g_strdup ("-variant");
@@ -825,7 +825,7 @@
 	}
 	_tmp37_ = option;
 	if (_tmp37_ != NULL) {
-		const gchar* _tmp38_;
+		const gchar* _tmp38_ = NULL;
 		_tmp38_ = option;
 		_tmp36_ = g_strcmp0 (_tmp38_, "") != 0;
 	} else {
@@ -833,7 +833,7 @@
 	}
 	_tmp39_ = _tmp36_;
 	if (_tmp39_) {
-		const gchar* _tmp40_;
+		const gchar* _tmp40_ = NULL;
 		_tmp40_ = option;
 		_tmp35_ = g_strcmp0 (_tmp40_, "default") != 0;
 	} else {
@@ -841,16 +841,16 @@
 	}
 	_tmp41_ = _tmp35_;
 	if (_tmp41_) {
-		gchar** _tmp42_;
-		gint _tmp42__length1;
-		gchar* _tmp43_;
-		gchar** _tmp44_;
-		gint _tmp44__length1;
-		gchar* _tmp45_;
-		gchar** _tmp46_;
-		gint _tmp46__length1;
-		const gchar* _tmp47_;
-		gchar* _tmp48_;
+		gchar** _tmp42_ = NULL;
+		gint _tmp42__length1 = 0;
+		gchar* _tmp43_ = NULL;
+		gchar** _tmp44_ = NULL;
+		gint _tmp44__length1 = 0;
+		gchar* _tmp45_ = NULL;
+		gchar** _tmp46_ = NULL;
+		gint _tmp46__length1 = 0;
+		const gchar* _tmp47_ = NULL;
+		gchar* _tmp48_ = NULL;
 		_tmp42_ = args;
 		_tmp42__length1 = args_length1;
 		_tmp43_ = g_strdup ("-option");
@@ -877,19 +877,19 @@
 		return result;
 	}
 	{
-		gchar** _tmp50_;
-		gint _tmp50__length1;
-		gchar* _tmp51_ = NULL;
-		gint _tmp52_ = 0;
-		gboolean _tmp53_ = FALSE;
-		gboolean _tmp54_;
-		_tmp50_ = args;
-		_tmp50__length1 = args_length1;
-		_tmp53_ = g_spawn_sync (NULL, _tmp50_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &_tmp51_, &_tmp52_, &_inner_error_);
+		gboolean _tmp50_ = FALSE;
+		gchar** _tmp51_ = NULL;
+		gint _tmp51__length1 = 0;
+		gchar* _tmp52_ = NULL;
+		gint _tmp53_ = 0;
+		gboolean _tmp54_ = FALSE;
+		_tmp51_ = args;
+		_tmp51__length1 = args_length1;
+		_tmp54_ = g_spawn_sync (NULL, _tmp51_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &_tmp52_, &_tmp53_, &_inner_error_);
 		_g_free0 (standard_error);
-		standard_error = _tmp51_;
-		exit_status = _tmp52_;
-		_tmp54_ = _tmp53_;
+		standard_error = _tmp52_;
+		exit_status = _tmp53_;
+		_tmp50_ = _tmp54_;
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == G_SPAWN_ERROR) {
 				goto __catch1_g_spawn_error;
@@ -903,8 +903,8 @@
 			g_clear_error (&_inner_error_);
 			return 0;
 		}
-		if (!_tmp54_) {
-			IBusEngineDesc* _tmp55_;
+		if (!_tmp50_) {
+			IBusEngineDesc* _tmp55_ = NULL;
 			const gchar* _tmp56_ = NULL;
 			_tmp55_ = engine;
 			_tmp56_ = ibus_engine_desc_get_layout (_tmp55_);
@@ -922,8 +922,8 @@
 	__catch1_g_spawn_error:
 	{
 		GError* e = NULL;
-		GError* _tmp57_;
-		const gchar* _tmp58_;
+		GError* _tmp57_ = NULL;
+		const gchar* _tmp58_ = NULL;
 		e = _inner_error_;
 		_inner_error_ = NULL;
 		_tmp57_ = e;
@@ -951,25 +951,25 @@
 	}
 	_tmp59_ = exit_status;
 	if (_tmp59_ != 0) {
-		const gchar* _tmp60_;
-		gchar* _tmp61_;
-		gchar* _tmp62_;
-		const gchar* _tmp63_;
-		const gchar* _tmp65_;
-		_tmp60_ = standard_error;
-		_tmp61_ = g_strdup (_tmp60_);
-		_tmp62_ = _tmp61_;
-		_tmp63_ = _tmp62_;
+		gchar* _tmp60_ = NULL;
+		const gchar* _tmp61_ = NULL;
+		gchar* _tmp62_ = NULL;
+		const gchar* _tmp63_ = NULL;
+		const gchar* _tmp65_ = NULL;
+		_tmp61_ = standard_error;
+		_tmp62_ = g_strdup (_tmp61_);
+		_tmp60_ = _tmp62_;
+		_tmp63_ = _tmp60_;
 		if (_tmp63_ == NULL) {
-			gchar* _tmp64_;
+			gchar* _tmp64_ = NULL;
 			_tmp64_ = g_strdup ("(null)");
-			_g_free0 (_tmp62_);
-			_tmp62_ = _tmp64_;
+			_g_free0 (_tmp60_);
+			_tmp60_ = _tmp64_;
 		}
-		_tmp65_ = _tmp62_;
+		_tmp65_ = _tmp60_;
 		g_warning ("main.vala:136: Execute setxkbmap failed: %s", _tmp65_);
 		result = EXIT_FAILURE;
-		_g_free0 (_tmp62_);
+		_g_free0 (_tmp60_);
 		args = (_vala_array_free (args, args_length1, (GDestroyNotify) g_free), NULL);
 		_g_free0 (standard_error);
 		_g_free0 (option);
@@ -989,21 +989,21 @@
 
 gint get_set_engine (gchar** argv, int argv_length1) {
 	gint result = 0;
+	IBusBus* bus = NULL;
 	IBusBus* _tmp0_ = NULL;
-	IBusBus* bus;
-	gchar* engine;
-	gchar** _tmp1_;
-	gint _tmp1__length1;
-	const gchar* _tmp5_;
-	IBusBus* _tmp14_;
-	const gchar* _tmp15_;
+	gchar* engine = NULL;
+	gchar** _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
+	const gchar* _tmp5_ = NULL;
+	IBusBus* _tmp14_ = NULL;
+	const gchar* _tmp15_ = NULL;
 	gboolean _tmp16_ = FALSE;
-	IBusBus* _tmp19_;
+	IBusEngineDesc* desc = NULL;
+	IBusBus* _tmp19_ = NULL;
 	IBusEngineDesc* _tmp20_ = NULL;
-	IBusEngineDesc* _tmp21_;
-	IBusEngineDesc* desc;
-	IBusEngineDesc* _tmp22_;
-	IBusEngineDesc* _tmp25_;
+	IBusEngineDesc* _tmp21_ = NULL;
+	IBusEngineDesc* _tmp22_ = NULL;
+	IBusEngineDesc* _tmp25_ = NULL;
 	gint _tmp26_ = 0;
 	_tmp0_ = get_bus ();
 	bus = _tmp0_;
@@ -1011,10 +1011,10 @@
 	_tmp1_ = argv;
 	_tmp1__length1 = argv_length1;
 	if (_tmp1__length1 > 1) {
-		gchar** _tmp2_;
-		gint _tmp2__length1;
-		const gchar* _tmp3_;
-		gchar* _tmp4_;
+		gchar** _tmp2_ = NULL;
+		gint _tmp2__length1 = 0;
+		const gchar* _tmp3_ = NULL;
+		gchar* _tmp4_ = NULL;
 		_tmp2_ = argv;
 		_tmp2__length1 = argv_length1;
 		_tmp3_ = _tmp2_[1];
@@ -1024,12 +1024,12 @@
 	}
 	_tmp5_ = engine;
 	if (_tmp5_ == NULL) {
-		IBusBus* _tmp6_;
+		IBusEngineDesc* desc = NULL;
+		IBusBus* _tmp6_ = NULL;
 		IBusEngineDesc* _tmp7_ = NULL;
-		IBusEngineDesc* _tmp8_;
-		IBusEngineDesc* desc;
-		IBusEngineDesc* _tmp9_;
-		IBusEngineDesc* _tmp12_;
+		IBusEngineDesc* _tmp8_ = NULL;
+		IBusEngineDesc* _tmp9_ = NULL;
+		IBusEngineDesc* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		_tmp6_ = bus;
 		_tmp7_ = ibus_bus_get_global_engine (_tmp6_);
@@ -1037,7 +1037,7 @@
 		desc = _tmp8_;
 		_tmp9_ = desc;
 		if (_tmp9_ == NULL) {
-			FILE* _tmp10_;
+			FILE* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
 			_tmp10_ = stderr;
 			_tmp11_ = _ ("No engine is set.\n");
@@ -1061,7 +1061,7 @@
 	_tmp15_ = engine;
 	_tmp16_ = ibus_bus_set_global_engine (_tmp14_, _tmp15_);
 	if (!_tmp16_) {
-		FILE* _tmp17_;
+		FILE* _tmp17_ = NULL;
 		const gchar* _tmp18_ = NULL;
 		_tmp17_ = stderr;
 		_tmp18_ = _ ("Set global engine failed.\n");
@@ -1077,7 +1077,7 @@
 	desc = _tmp21_;
 	_tmp22_ = desc;
 	if (_tmp22_ == NULL) {
-		FILE* _tmp23_;
+		FILE* _tmp23_ = NULL;
 		const gchar* _tmp24_ = NULL;
 		_tmp23_ = stderr;
 		_tmp24_ = _ ("Get global engine failed.\n");
@@ -1107,15 +1107,15 @@
 
 gint restart_daemon (gchar** argv, int argv_length1) {
 	gint result = 0;
+	IBusBus* bus = NULL;
 	IBusBus* _tmp0_ = NULL;
-	IBusBus* bus;
-	IBusBus* _tmp1_;
-	IBusBus* _tmp4_;
+	IBusBus* _tmp1_ = NULL;
+	IBusBus* _tmp4_ = NULL;
 	_tmp0_ = get_bus ();
 	bus = _tmp0_;
 	_tmp1_ = bus;
 	if (_tmp1_ == NULL) {
-		FILE* _tmp2_;
+		FILE* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		_tmp2_ = stderr;
 		_tmp3_ = _ ("Can't connect to IBus.\n");
@@ -1134,15 +1134,15 @@
 
 gint exit_daemon (gchar** argv, int argv_length1) {
 	gint result = 0;
+	IBusBus* bus = NULL;
 	IBusBus* _tmp0_ = NULL;
-	IBusBus* bus;
-	IBusBus* _tmp1_;
-	IBusBus* _tmp4_;
+	IBusBus* _tmp1_ = NULL;
+	IBusBus* _tmp4_ = NULL;
 	_tmp0_ = get_bus ();
 	bus = _tmp0_;
 	_tmp1_ = bus;
 	if (_tmp1_ == NULL) {
-		FILE* _tmp2_;
+		FILE* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		_tmp2_ = stderr;
 		_tmp3_ = _ ("Can't connect to IBus.\n");
@@ -1170,25 +1170,25 @@
 gint read_cache (gchar** argv, int argv_length1) {
 	gint result = 0;
 	static const GOptionEntry options[] = {{"system", (gchar) 0, 0, G_OPTION_ARG_NONE, &is_system, "Read the system registry cache.", NULL}, {"file", (gchar) 0, 0, G_OPTION_ARG_STRING, &cache_file, "Read the registry cache FILE.", "FILE"}, {NULL}};
-	GOptionContext* _tmp0_;
-	GOptionContext* option;
-	GOptionContext* _tmp1_;
-	IBusRegistry* _tmp6_;
-	IBusRegistry* registry;
-	const gchar* _tmp7_;
-	GString* _tmp18_;
-	GString* output;
-	IBusRegistry* _tmp19_;
-	GString* _tmp20_;
-	GString* _tmp21_;
-	const gchar* _tmp22_;
+	GOptionContext* option = NULL;
+	GOptionContext* _tmp0_ = NULL;
+	GOptionContext* _tmp1_ = NULL;
+	IBusRegistry* registry = NULL;
+	IBusRegistry* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	GString* output = NULL;
+	GString* _tmp18_ = NULL;
+	IBusRegistry* _tmp19_ = NULL;
+	GString* _tmp20_ = NULL;
+	GString* _tmp21_ = NULL;
+	const gchar* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
 	_tmp0_ = g_option_context_new (NULL);
 	option = _tmp0_;
 	_tmp1_ = option;
 	g_option_context_add_main_entries (_tmp1_, options, GETTEXT_PACKAGE);
 	{
-		GOptionContext* _tmp2_;
+		GOptionContext* _tmp2_ = NULL;
 		_tmp2_ = option;
 		g_option_context_parse (_tmp2_, &argv_length1, &argv, &_inner_error_);
 		if (_inner_error_ != NULL) {
@@ -1205,9 +1205,9 @@
 	__catch2_g_option_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp3_;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
+		FILE* _tmp3_ = NULL;
+		GError* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
 		e = _inner_error_;
 		_inner_error_ = NULL;
 		_tmp3_ = stderr;
@@ -1231,14 +1231,14 @@
 	registry = _tmp6_;
 	_tmp7_ = cache_file;
 	if (_tmp7_ != NULL) {
-		IBusRegistry* _tmp8_;
-		const gchar* _tmp9_;
+		IBusRegistry* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
 		_tmp8_ = registry;
 		_tmp9_ = cache_file;
 		_tmp10_ = ibus_registry_load_cache_file (_tmp8_, _tmp9_);
 		if (!_tmp10_) {
-			FILE* _tmp11_;
+			FILE* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
 			_tmp11_ = stderr;
 			_tmp12_ = _ ("The registry cache is invalid.\n");
@@ -1249,14 +1249,14 @@
 			return result;
 		}
 	} else {
-		IBusRegistry* _tmp13_;
-		gboolean _tmp14_;
+		IBusRegistry* _tmp13_ = NULL;
+		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
 		_tmp13_ = registry;
 		_tmp14_ = is_system;
 		_tmp15_ = ibus_registry_load_cache (_tmp13_, !_tmp14_);
 		if (!_tmp15_) {
-			FILE* _tmp16_;
+			FILE* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			_tmp16_ = stderr;
 			_tmp17_ = _ ("The registry cache is invalid.\n");
@@ -1286,25 +1286,25 @@
 gint write_cache (gchar** argv, int argv_length1) {
 	gint result = 0;
 	static const GOptionEntry options[] = {{"system", (gchar) 0, 0, G_OPTION_ARG_NONE, &is_system, "Write the system registry cache.", NULL}, {"file", (gchar) 0, 0, G_OPTION_ARG_STRING, &cache_file, "Write the registry cache FILE.", "FILE"}, {NULL}};
-	GOptionContext* _tmp0_;
-	GOptionContext* option;
-	GOptionContext* _tmp1_;
-	IBusRegistry* _tmp6_;
-	IBusRegistry* registry;
-	IBusRegistry* _tmp7_;
-	const gchar* _tmp8_;
+	GOptionContext* option = NULL;
+	GOptionContext* _tmp0_ = NULL;
+	GOptionContext* _tmp1_ = NULL;
+	IBusRegistry* registry = NULL;
+	IBusRegistry* _tmp6_ = NULL;
+	IBusRegistry* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
 	gint _tmp14_ = 0;
-	IBusRegistry* _tmp15_;
-	gboolean _tmp16_;
+	IBusRegistry* _tmp15_ = NULL;
+	gboolean _tmp16_ = FALSE;
 	gboolean _tmp17_ = FALSE;
-	gint _tmp18_;
+	gint _tmp18_ = 0;
 	GError * _inner_error_ = NULL;
 	_tmp0_ = g_option_context_new (NULL);
 	option = _tmp0_;
 	_tmp1_ = option;
 	g_option_context_add_main_entries (_tmp1_, options, GETTEXT_PACKAGE);
 	{
-		GOptionContext* _tmp2_;
+		GOptionContext* _tmp2_ = NULL;
 		_tmp2_ = option;
 		g_option_context_parse (_tmp2_, &argv_length1, &argv, &_inner_error_);
 		if (_inner_error_ != NULL) {
@@ -1321,9 +1321,9 @@
 	__catch3_g_option_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp3_;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
+		FILE* _tmp3_ = NULL;
+		GError* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
 		e = _inner_error_;
 		_inner_error_ = NULL;
 		_tmp3_ = stderr;
@@ -1350,10 +1350,10 @@
 	_tmp8_ = cache_file;
 	if (_tmp8_ != NULL) {
 		gint _tmp9_ = 0;
-		IBusRegistry* _tmp10_;
-		const gchar* _tmp11_;
+		IBusRegistry* _tmp10_ = NULL;
+		const gchar* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
-		gint _tmp13_;
+		gint _tmp13_ = 0;
 		_tmp10_ = registry;
 		_tmp11_ = cache_file;
 		_tmp12_ = ibus_registry_save_cache_file (_tmp10_, _tmp11_);
@@ -1386,17 +1386,34 @@
 
 gint print_address (gchar** argv, int argv_length1) {
 	gint result = 0;
+	gchar* address = NULL;
 	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp5_ = NULL;
 	_tmp0_ = ibus_get_address ();
-	g_print ("%s\n", _tmp0_);
+	_tmp1_ = g_strdup (_tmp0_);
+	address = _tmp1_;
+	_tmp3_ = address;
+	if (_tmp3_ != NULL) {
+		const gchar* _tmp4_ = NULL;
+		_tmp4_ = address;
+		_tmp2_ = _tmp4_;
+	} else {
+		_tmp2_ = "(null)";
+	}
+	_tmp5_ = _tmp2_;
+	g_print ("%s\n", _tmp5_);
 	result = EXIT_SUCCESS;
+	_g_free0 (address);
 	return result;
 }
 
 
 gint print_help (gchar** argv, int argv_length1) {
 	gint result = 0;
-	FILE* _tmp0_;
+	FILE* _tmp0_ = NULL;
 	_tmp0_ = stdout;
 	print_usage (_tmp0_);
 	result = EXIT_SUCCESS;
@@ -1499,10 +1516,10 @@
 
 
 void print_usage (FILE* stream) {
-	FILE* _tmp0_;
+	FILE* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_;
-	FILE* _tmp3_;
+	const gchar* _tmp2_ = NULL;
+	FILE* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	g_return_if_fail (stream != NULL);
 	_tmp0_ = stream;
@@ -1513,25 +1530,25 @@
 	_tmp4_ = _ ("Commands:\n");
 	fprintf (_tmp3_, "%s", _tmp4_);
 	{
-		gint i;
+		gint i = 0;
 		i = 0;
 		{
-			gboolean _tmp5_;
+			gboolean _tmp5_ = FALSE;
 			_tmp5_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp6_;
-				gint _tmp8_;
-				FILE* _tmp9_;
-				gint _tmp10_;
-				CommandEntry _tmp11_;
-				const gchar* _tmp12_;
-				gint _tmp13_;
-				CommandEntry _tmp14_;
-				const gchar* _tmp15_;
+				gboolean _tmp6_ = FALSE;
+				gint _tmp8_ = 0;
+				FILE* _tmp9_ = NULL;
+				gint _tmp10_ = 0;
+				CommandEntry _tmp11_ = {0};
+				const gchar* _tmp12_ = NULL;
+				gint _tmp13_ = 0;
+				CommandEntry _tmp14_ = {0};
+				const gchar* _tmp15_ = NULL;
 				const gchar* _tmp16_ = NULL;
 				_tmp6_ = _tmp5_;
 				if (!_tmp6_) {
-					gint _tmp7_;
+					gint _tmp7_ = 0;
 					_tmp7_ = i;
 					i = _tmp7_ + 1;
 				}
@@ -1560,7 +1577,7 @@
 	int i;
 	result = g_new0 (gchar*, length + 1);
 	for (i = 0; i < length; i++) {
-		gchar* _tmp0_;
+		gchar* _tmp0_ = NULL;
 		_tmp0_ = g_strdup (self[i]);
 		result[i] = _tmp0_;
 	}
@@ -1570,35 +1587,35 @@
 
 gint _vala_main (gchar** argv, int argv_length1) {
 	gint result = 0;
-	gchar** _tmp0_;
-	gint _tmp0__length1;
-	const gchar* _tmp1_;
+	gchar** _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
+	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-	gchar** _tmp5_;
-	gint _tmp5__length1;
-	gchar** _tmp6_;
-	gint _tmp6__length1;
-	gchar** _tmp7_;
-	gint _tmp7__length1;
-	gchar** new_argv;
-	gint new_argv_length1;
-	gint _new_argv_size_;
-	gchar** _tmp8_;
-	gint _tmp8__length1;
-	const gchar* _tmp9_;
-	gchar** _tmp10_;
-	gint _tmp10__length1;
-	const gchar* _tmp11_;
+	gchar** _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+	gchar** new_argv = NULL;
+	gchar** _tmp5_ = NULL;
+	gint _tmp5__length1 = 0;
+	gchar** _tmp6_ = NULL;
+	gint _tmp6__length1 = 0;
+	gchar** _tmp7_ = NULL;
+	gint _tmp7__length1 = 0;
+	gint new_argv_length1 = 0;
+	gint _new_argv_size_ = 0;
+	gchar** _tmp8_ = NULL;
+	gint _tmp8__length1 = 0;
+	const gchar* _tmp9_ = NULL;
+	gchar** _tmp10_ = NULL;
+	gint _tmp10__length1 = 0;
+	const gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_;
-	FILE* _tmp28_;
+	gchar* _tmp13_ = NULL;
+	FILE* _tmp28_ = NULL;
 	const gchar* _tmp29_ = NULL;
-	gchar** _tmp30_;
-	gint _tmp30__length1;
-	const gchar* _tmp31_;
-	FILE* _tmp32_;
+	gchar** _tmp30_ = NULL;
+	gint _tmp30__length1 = 0;
+	const gchar* _tmp31_ = NULL;
+	FILE* _tmp32_ = NULL;
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -1613,7 +1630,7 @@
 	_tmp3_ = argv;
 	_tmp3__length1 = argv_length1;
 	if (_tmp3__length1 < 2) {
-		FILE* _tmp4_;
+		FILE* _tmp4_ = NULL;
 		_tmp4_ = stderr;
 		print_usage (_tmp4_);
 		result = EXIT_FAILURE;
@@ -1639,23 +1656,23 @@
 	_tmp8_[0] = _tmp12_;
 	_tmp13_ = _tmp8_[0];
 	{
-		gint i;
+		gint i = 0;
 		i = 0;
 		{
-			gboolean _tmp14_;
+			gboolean _tmp14_ = FALSE;
 			_tmp14_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp15_;
-				gint _tmp17_;
-				gint _tmp18_;
-				CommandEntry _tmp19_;
-				const gchar* _tmp20_;
-				gchar** _tmp21_;
-				gint _tmp21__length1;
-				const gchar* _tmp22_;
+				gboolean _tmp15_ = FALSE;
+				gint _tmp17_ = 0;
+				gint _tmp18_ = 0;
+				CommandEntry _tmp19_ = {0};
+				const gchar* _tmp20_ = NULL;
+				gchar** _tmp21_ = NULL;
+				gint _tmp21__length1 = 0;
+				const gchar* _tmp22_ = NULL;
 				_tmp15_ = _tmp14_;
 				if (!_tmp15_) {
-					gint _tmp16_;
+					gint _tmp16_ = 0;
 					_tmp16_ = i;
 					i = _tmp16_ + 1;
 				}
@@ -1671,12 +1688,12 @@
 				_tmp21__length1 = argv_length1;
 				_tmp22_ = _tmp21_[1];
 				if (g_strcmp0 (_tmp20_, _tmp22_) == 0) {
-					gint _tmp23_;
-					CommandEntry _tmp24_;
-					EntryFunc _tmp25_;
-					void* _tmp25__target;
-					gchar** _tmp26_;
-					gint _tmp26__length1;
+					gint _tmp23_ = 0;
+					CommandEntry _tmp24_ = {0};
+					EntryFunc _tmp25_ = NULL;
+					void* _tmp25__target = NULL;
+					gchar** _tmp26_ = NULL;
+					gint _tmp26__length1 = 0;
 					gint _tmp27_ = 0;
 					_tmp23_ = i;
 					_tmp24_ = commands[_tmp23_];
diff -Nru ibus-1.5.4/tools/main.vala ibus-1.5.5/tools/main.vala
--- ibus-1.5.4/tools/main.vala	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/tools/main.vala	2014-01-14 12:59:14.000000000 +0900
@@ -271,7 +271,8 @@
 }
 
 int print_address(string[] argv) {
-    print("%s\n", IBus.get_address());
+    string address = IBus.get_address();
+    print("%s\n", address != null ? address : "(null)");
     return Posix.EXIT_SUCCESS;
 }
 
diff -Nru ibus-1.5.4/ui/gtk3/Makefile.am ibus-1.5.5/ui/gtk3/Makefile.am
--- ibus-1.5.4/ui/gtk3/Makefile.am	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/Makefile.am	2014-01-14 12:59:14.000000000 +0900
@@ -109,6 +109,7 @@
 	panel.vala \
 	pango.vala \
 	property.vala \
+	propertypanel.vala \
 	separator.vala \
 	switcher.vala \
 	$(NULL)
diff -Nru ibus-1.5.4/ui/gtk3/Makefile.in ibus-1.5.5/ui/gtk3/Makefile.in
--- ibus-1.5.4/ui/gtk3/Makefile.in	2013-09-20 12:17:28.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/Makefile.in	2014-01-14 13:00:24.000000000 +0900
@@ -119,7 +119,7 @@
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	application.c candidatearea.c candidatepanel.c handle.c \
 	iconwidget.c keybindingmanager.c panel.c pango.c property.c \
-	separator.c switcher.c $(top_srcdir)/depcomp \
+	propertypanel.c separator.c switcher.c $(top_srcdir)/depcomp \
 	$(srcdir)/ibus_ui_gtk3_vala.stamp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gconf-2.m4 \
@@ -142,8 +142,8 @@
 	candidatearea.$(OBJEXT) candidatepanel.$(OBJEXT) \
 	handle.$(OBJEXT) iconwidget.$(OBJEXT) \
 	keybindingmanager.$(OBJEXT) panel.$(OBJEXT) pango.$(OBJEXT) \
-	property.$(OBJEXT) separator.$(OBJEXT) switcher.$(OBJEXT) \
-	$(am__objects_1)
+	property.$(OBJEXT) propertypanel.$(OBJEXT) separator.$(OBJEXT) \
+	switcher.$(OBJEXT) $(am__objects_1)
 ibus_ui_gtk3_OBJECTS = $(am_ibus_ui_gtk3_OBJECTS)
 am__DEPENDENCIES_1 =
 @ENABLE_LIBNOTIFY_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@@ -535,6 +535,7 @@
 	panel.vala \
 	pango.vala \
 	property.vala \
+	propertypanel.vala \
 	separator.vala \
 	switcher.vala \
 	$(NULL)
@@ -654,6 +655,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pango.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/property.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertypanel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/separator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switcher.Po@am__quote@
 
@@ -722,6 +724,11 @@
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/ibus_ui_gtk3_vala.stamp; \
 	fi
+$(srcdir)/propertypanel.c: $(srcdir)/ibus_ui_gtk3_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/ibus_ui_gtk3_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/ibus_ui_gtk3_vala.stamp; \
+	fi
 $(srcdir)/separator.c: $(srcdir)/ibus_ui_gtk3_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/ibus_ui_gtk3_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -732,9 +739,9 @@
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/ibus_ui_gtk3_vala.stamp; \
 	fi
-$(srcdir)/ibus_ui_gtk3_vala.stamp: application.vala candidatearea.vala candidatepanel.vala handle.vala iconwidget.vala keybindingmanager.vala panel.vala pango.vala property.vala separator.vala switcher.vala
+$(srcdir)/ibus_ui_gtk3_vala.stamp: application.vala candidatearea.vala candidatepanel.vala handle.vala iconwidget.vala keybindingmanager.vala panel.vala pango.vala property.vala propertypanel.vala separator.vala switcher.vala
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C application.vala candidatearea.vala candidatepanel.vala handle.vala iconwidget.vala keybindingmanager.vala panel.vala pango.vala property.vala separator.vala switcher.vala
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C application.vala candidatearea.vala candidatepanel.vala handle.vala iconwidget.vala keybindingmanager.vala panel.vala pango.vala property.vala propertypanel.vala separator.vala switcher.vala
 	$(AM_V_at)mv -f $@-t $@
 
 mostlyclean-libtool:
@@ -894,6 +901,7 @@
 	-rm -f $(srcdir)/panel.c
 	-rm -f $(srcdir)/pango.c
 	-rm -f $(srcdir)/property.c
+	-rm -f $(srcdir)/propertypanel.c
 	-rm -f $(srcdir)/separator.c
 	-rm -f $(srcdir)/switcher.c
 	-rm -f application.c
@@ -905,6 +913,7 @@
 	-rm -f panel.c
 	-rm -f pango.c
 	-rm -f property.c
+	-rm -f propertypanel.c
 	-rm -f separator.c
 	-rm -f switcher.c
 clean: clean-am
diff -Nru ibus-1.5.4/ui/gtk3/application.c ibus-1.5.5/ui/gtk3/application.c
--- ibus-1.5.4/ui/gtk3/application.c	2013-09-20 12:21:58.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/application.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,4 +1,4 @@
-/* application.c generated by valac 0.20.1, the Vala compiler
+/* application.c generated by valac 0.22.0, the Vala compiler
  * generated from application.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
@@ -125,10 +125,10 @@
 
 Application* application_construct (GType object_type, gchar** argv, int argv_length1) {
 	Application* self = NULL;
-	IBusBus* _tmp0_;
-	IBusBus* _tmp1_;
-	IBusBus* _tmp2_;
-	IBusBus* _tmp3_;
+	IBusBus* _tmp0_ = NULL;
+	IBusBus* _tmp1_ = NULL;
+	IBusBus* _tmp2_ = NULL;
+	IBusBus* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	self = (Application*) g_type_create_instance (object_type);
 	bindtextdomain (GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
@@ -173,12 +173,12 @@
 
 
 static void application_init (Application* self) {
-	IBusBus* _tmp0_;
+	GDBusConnection* connection = NULL;
+	IBusBus* _tmp0_ = NULL;
 	GDBusConnection* _tmp1_ = NULL;
-	GDBusConnection* _tmp2_;
-	GDBusConnection* connection;
-	IBusBusNameFlag flags;
-	IBusBus* _tmp3_;
+	GDBusConnection* _tmp2_ = NULL;
+	IBusBusNameFlag flags = 0;
+	IBusBus* _tmp3_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_bus;
 	_tmp1_ = ibus_bus_get_connection (_tmp0_);
@@ -203,10 +203,10 @@
 
 
 static void application_bus_name_acquired_cb (Application* self, GDBusConnection* connection, const gchar* sender_name, const gchar* object_path, const gchar* interface_name, const gchar* signal_name, GVariant* parameters) {
-	const gchar* _tmp0_;
-	IBusBus* _tmp1_;
-	Panel* _tmp2_;
-	Panel* _tmp3_;
+	const gchar* _tmp0_ = NULL;
+	IBusBus* _tmp1_ = NULL;
+	Panel* _tmp2_ = NULL;
+	Panel* _tmp3_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (connection != NULL);
 	g_return_if_fail (sender_name != NULL);
@@ -227,7 +227,7 @@
 
 
 static void application_bus_name_lost_cb (Application* self, GDBusConnection* connection, const gchar* sender_name, const gchar* object_path, const gchar* interface_name, const gchar* signal_name, GVariant* parameters) {
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (connection != NULL);
 	g_return_if_fail (sender_name != NULL);
@@ -258,10 +258,10 @@
 
 
 void application_main (gchar** argv, int argv_length1) {
-	gchar** _tmp0_;
-	gint _tmp0__length1;
-	Application* _tmp1_;
-	Application* app;
+	Application* app = NULL;
+	gchar** _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
+	Application* _tmp1_ = NULL;
 	_tmp0_ = argv;
 	_tmp0__length1 = argv_length1;
 	_tmp1_ = application_new (_tmp0_, _tmp0__length1);
diff -Nru ibus-1.5.4/ui/gtk3/candidatearea.c ibus-1.5.5/ui/gtk3/candidatearea.c
--- ibus-1.5.4/ui/gtk3/candidatearea.c	2013-09-20 12:21:58.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/candidatearea.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,4 +1,4 @@
-/* candidatearea.c generated by valac 0.20.1, the Vala compiler
+/* candidatearea.c generated by valac 0.22.0, the Vala compiler
  * generated from candidatearea.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
@@ -45,7 +45,7 @@
 typedef struct _CandidateAreaPrivate CandidateAreaPrivate;
 #define _pango_attribute_destroy0(var) ((var == NULL) ? NULL : (var = (pango_attribute_destroy (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define __vala_PangoAttrList_free0(var) ((var == NULL) ? NULL : (var = (_vala_PangoAttrList_free (var), NULL)))
+#define _pango_attr_list_unref0(var) ((var == NULL) ? NULL : (var = (pango_attr_list_unref (var), NULL)))
 #define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
 
 #define TYPE_VSEPARATOR (vseparator_get_type ())
@@ -133,7 +133,6 @@
 void candidate_area_set_labels (CandidateArea* self, IBusText** labels, int labels_length1);
 static IBusText** _vala_array_dup1 (IBusText** self, int length);
 PangoAttrList* get_pango_attr_list_from_ibus_text (IBusText* text);
-static void _vala_PangoAttrList_free (PangoAttrList* self);
 static void __lambda2_ (CandidateArea* self, GtkButton* b);
 static void ___lambda2__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void __lambda3_ (CandidateArea* self, GtkButton* b);
@@ -174,7 +173,7 @@
 
 CandidateArea* candidate_area_construct (GType object_type, gboolean vertical) {
 	CandidateArea * self = NULL;
-	gboolean _tmp0_;
+	gboolean _tmp0_ = FALSE;
 	self = (CandidateArea*) g_object_new (object_type, NULL);
 	_tmp0_ = vertical;
 	candidate_area_set_vertical (self, _tmp0_, TRUE);
@@ -189,19 +188,19 @@
 
 void candidate_area_set_vertical (CandidateArea* self, gboolean vertical, gboolean force) {
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
+	gboolean _tmp1_ = FALSE;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp5_ = FALSE;
 	GtkOrientation _tmp6_ = 0;
-	gboolean _tmp7_;
-	GtkOrientation _tmp8_;
-	IBusText** _tmp9_;
-	gint _tmp9__length1;
+	gboolean _tmp7_ = FALSE;
+	GtkOrientation _tmp8_ = 0;
+	IBusText** _tmp9_ = NULL;
+	gint _tmp9__length1 = 0;
 	g_return_if_fail (self != NULL);
 	_tmp1_ = force;
 	if (!_tmp1_) {
-		gboolean _tmp2_;
-		gboolean _tmp3_;
+		gboolean _tmp2_ = FALSE;
+		gboolean _tmp3_ = FALSE;
 		_tmp2_ = self->priv->m_vertical;
 		_tmp3_ = vertical;
 		_tmp0_ = _tmp2_ == _tmp3_;
@@ -226,12 +225,12 @@
 	_tmp9_ = self->priv->m_ibus_candidates;
 	_tmp9__length1 = self->priv->m_ibus_candidates_length1;
 	if (_tmp9__length1 > 0) {
-		IBusText** _tmp10_;
-		gint _tmp10__length1;
-		IBusText** _tmp11_;
-		gint _tmp11__length1;
-		guint _tmp12_;
-		gboolean _tmp13_;
+		IBusText** _tmp10_ = NULL;
+		gint _tmp10__length1 = 0;
+		IBusText** _tmp11_ = NULL;
+		gint _tmp11__length1 = 0;
+		guint _tmp12_ = 0U;
+		gboolean _tmp13_ = FALSE;
 		_tmp10_ = self->priv->m_ibus_candidates;
 		_tmp10__length1 = self->priv->m_ibus_candidates_length1;
 		self->priv->m_ibus_candidates = NULL;
@@ -250,27 +249,27 @@
 	gint i = 0;
 	g_return_if_fail (self != NULL);
 	{
-		gboolean _tmp0_;
+		gboolean _tmp0_ = FALSE;
 		i = 0;
 		_tmp0_ = TRUE;
 		while (TRUE) {
-			gboolean _tmp1_;
-			gint _tmp3_;
-			IBusText** _tmp4_;
-			gint _tmp4__length1;
+			gboolean _tmp1_ = FALSE;
+			gint _tmp3_ = 0;
+			IBusText** _tmp4_ = NULL;
+			gint _tmp4__length1 = 0;
 			gint _tmp5_ = 0;
-			GtkLabel** _tmp6_;
-			gint _tmp6__length1;
-			gint _tmp7_;
-			GtkLabel* _tmp8_;
-			IBusText** _tmp9_;
-			gint _tmp9__length1;
-			gint _tmp10_;
-			IBusText* _tmp11_;
+			GtkLabel** _tmp6_ = NULL;
+			gint _tmp6__length1 = 0;
+			gint _tmp7_ = 0;
+			GtkLabel* _tmp8_ = NULL;
+			IBusText** _tmp9_ = NULL;
+			gint _tmp9__length1 = 0;
+			gint _tmp10_ = 0;
+			IBusText* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
 			_tmp1_ = _tmp0_;
 			if (!_tmp1_) {
-				gint _tmp2_;
+				gint _tmp2_ = 0;
 				_tmp2_ = i;
 				i = _tmp2_ + 1;
 			}
@@ -295,20 +294,20 @@
 		}
 	}
 	{
-		gboolean _tmp13_;
+		gboolean _tmp13_ = FALSE;
 		_tmp13_ = TRUE;
 		while (TRUE) {
-			gboolean _tmp14_;
-			gint _tmp16_;
-			GtkLabel** _tmp17_;
-			gint _tmp17__length1;
-			gint _tmp18_;
-			GtkLabel* _tmp19_;
-			gint _tmp20_;
-			const gchar* _tmp21_;
+			gboolean _tmp14_ = FALSE;
+			gint _tmp16_ = 0;
+			GtkLabel** _tmp17_ = NULL;
+			gint _tmp17__length1 = 0;
+			gint _tmp18_ = 0;
+			GtkLabel* _tmp19_ = NULL;
+			gint _tmp20_ = 0;
+			const gchar* _tmp21_ = NULL;
 			_tmp14_ = _tmp13_;
 			if (!_tmp14_) {
-				gint _tmp15_;
+				gint _tmp15_ = 0;
 				_tmp15_ = i;
 				i = _tmp15_ + 1;
 			}
@@ -339,7 +338,7 @@
 	int i;
 	result = g_new0 (IBusText*, length + 1);
 	for (i = 0; i < length; i++) {
-		IBusText* _tmp0_;
+		IBusText* _tmp0_ = NULL;
 		_tmp0_ = _g_object_ref0 (self[i]);
 		result[i] = _tmp0_;
 	}
@@ -347,20 +346,15 @@
 }
 
 
-static void _vala_PangoAttrList_free (PangoAttrList* self) {
-	g_boxed_free (pango_attr_list_get_type (), self);
-}
-
-
 void candidate_area_set_candidates (CandidateArea* self, IBusText** candidates, int candidates_length1, guint focus_candidate, gboolean show_cursor) {
-	IBusText** _tmp0_;
-	gint _tmp0__length1;
-	IBusText** _tmp1_;
-	gint _tmp1__length1;
-	guint _tmp2_;
-	gboolean _tmp3_;
-	IBusText** _tmp4_;
-	gint _tmp4__length1;
+	IBusText** _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
+	IBusText** _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
+	guint _tmp2_ = 0U;
+	gboolean _tmp3_ = FALSE;
+	IBusText** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = candidates;
 	_tmp0__length1 = candidates_length1;
@@ -378,28 +372,28 @@
 	_tmp4__length1 = candidates_length1;
 	_vala_assert (_tmp4__length1 < 16, "candidates.length < 16");
 	{
-		gint i;
+		gint i = 0;
 		i = 0;
 		{
-			gboolean _tmp5_;
+			gboolean _tmp5_ = FALSE;
 			_tmp5_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp6_;
-				gint _tmp8_;
-				GtkLabel** _tmp9_;
-				gint _tmp9__length1;
-				gint _tmp10_;
-				GtkLabel* _tmp11_;
-				GtkLabel* _tmp12_;
-				GtkLabel* label;
-				gboolean visible;
-				gint _tmp13_;
-				IBusText** _tmp14_;
-				gint _tmp14__length1;
-				gboolean _tmp84_;
+				gboolean _tmp6_ = FALSE;
+				gint _tmp8_ = 0;
+				GtkLabel* label = NULL;
+				GtkLabel** _tmp9_ = NULL;
+				gint _tmp9__length1 = 0;
+				gint _tmp10_ = 0;
+				GtkLabel* _tmp11_ = NULL;
+				GtkLabel* _tmp12_ = NULL;
+				gboolean visible = FALSE;
+				gint _tmp13_ = 0;
+				IBusText** _tmp14_ = NULL;
+				gint _tmp14__length1 = 0;
+				gboolean _tmp84_ = FALSE;
 				_tmp6_ = _tmp5_;
 				if (!_tmp6_) {
-					gint _tmp7_;
+					gint _tmp7_ = 0;
 					_tmp7_ = i;
 					i = _tmp7_ + 1;
 				}
@@ -419,24 +413,24 @@
 				_tmp14_ = candidates;
 				_tmp14__length1 = candidates_length1;
 				if (_tmp13_ < _tmp14__length1) {
-					IBusText** _tmp15_;
-					gint _tmp15__length1;
-					gint _tmp16_;
-					IBusText* _tmp17_;
+					PangoAttrList* attrs = NULL;
+					IBusText** _tmp15_ = NULL;
+					gint _tmp15__length1 = 0;
+					gint _tmp16_ = 0;
+					IBusText* _tmp17_ = NULL;
 					PangoAttrList* _tmp18_ = NULL;
-					PangoAttrList* attrs;
 					gboolean _tmp19_ = FALSE;
-					gint _tmp20_;
-					guint _tmp21_;
-					gboolean _tmp23_;
-					GtkLabel* _tmp73_;
-					IBusText** _tmp74_;
-					gint _tmp74__length1;
-					gint _tmp75_;
-					IBusText* _tmp76_;
+					gint _tmp20_ = 0;
+					guint _tmp21_ = 0U;
+					gboolean _tmp23_ = FALSE;
+					GtkLabel* _tmp73_ = NULL;
+					IBusText** _tmp74_ = NULL;
+					gint _tmp74__length1 = 0;
+					gint _tmp75_ = 0;
+					IBusText* _tmp76_ = NULL;
 					const gchar* _tmp77_ = NULL;
-					GtkLabel* _tmp78_;
-					PangoAttrList* _tmp79_;
+					GtkLabel* _tmp78_ = NULL;
+					PangoAttrList* _tmp79_ = NULL;
 					_tmp15_ = candidates;
 					_tmp15__length1 = candidates_length1;
 					_tmp16_ = i;
@@ -446,7 +440,7 @@
 					_tmp20_ = i;
 					_tmp21_ = focus_candidate;
 					if (((guint) _tmp20_) == _tmp21_) {
-						gboolean _tmp22_;
+						gboolean _tmp22_ = FALSE;
 						_tmp22_ = show_cursor;
 						_tmp19_ = _tmp22_;
 					} else {
@@ -454,61 +448,61 @@
 					}
 					_tmp23_ = _tmp19_;
 					if (_tmp23_) {
-						GtkLabel** _tmp24_;
-						gint _tmp24__length1;
-						gint _tmp25_;
-						GtkLabel* _tmp26_;
+						GtkStyleContext* context = NULL;
+						GtkLabel** _tmp24_ = NULL;
+						gint _tmp24__length1 = 0;
+						gint _tmp25_ = 0;
+						GtkLabel* _tmp26_ = NULL;
 						GtkStyleContext* _tmp27_ = NULL;
-						GtkStyleContext* _tmp28_;
-						GtkStyleContext* context;
-						GtkStyleContext* _tmp29_;
+						GtkStyleContext* _tmp28_ = NULL;
+						GdkRGBA color = {0};
+						GtkStyleContext* _tmp29_ = NULL;
 						GdkRGBA _tmp30_ = {0};
-						GdkRGBA color;
-						GdkRGBA _tmp31_;
-						gdouble _tmp32_;
-						guint16 _tmp33_;
-						GdkRGBA _tmp34_;
-						gdouble _tmp35_;
-						guint16 _tmp36_;
-						GdkRGBA _tmp37_;
-						gdouble _tmp38_;
-						guint16 _tmp39_;
+						PangoAttribute* pango_attr = NULL;
+						GdkRGBA _tmp31_ = {0};
+						gdouble _tmp32_ = 0.0;
+						guint16 _tmp33_ = 0U;
+						GdkRGBA _tmp34_ = {0};
+						gdouble _tmp35_ = 0.0;
+						guint16 _tmp36_ = 0U;
+						GdkRGBA _tmp37_ = {0};
+						gdouble _tmp38_ = 0.0;
+						guint16 _tmp39_ = 0U;
 						PangoAttribute* _tmp40_ = NULL;
-						PangoAttribute* pango_attr;
-						PangoAttribute* _tmp41_;
-						PangoAttribute* _tmp42_;
-						IBusText** _tmp43_;
-						gint _tmp43__length1;
-						gint _tmp44_;
-						IBusText* _tmp45_;
+						PangoAttribute* _tmp41_ = NULL;
+						PangoAttribute* _tmp42_ = NULL;
+						IBusText** _tmp43_ = NULL;
+						gint _tmp43__length1 = 0;
+						gint _tmp44_ = 0;
+						IBusText* _tmp45_ = NULL;
 						const gchar* _tmp46_ = NULL;
-						gint _tmp47_;
-						gint _tmp48_;
-						PangoAttrList* _tmp49_;
-						PangoAttribute* _tmp50_;
-						GtkStyleContext* _tmp51_;
+						gint _tmp47_ = 0;
+						gint _tmp48_ = 0;
+						PangoAttrList* _tmp49_ = NULL;
+						PangoAttribute* _tmp50_ = NULL;
+						GtkStyleContext* _tmp51_ = NULL;
 						GdkRGBA _tmp52_ = {0};
-						GdkRGBA _tmp53_;
-						gdouble _tmp54_;
-						guint16 _tmp55_;
-						GdkRGBA _tmp56_;
-						gdouble _tmp57_;
-						guint16 _tmp58_;
-						GdkRGBA _tmp59_;
-						gdouble _tmp60_;
-						guint16 _tmp61_;
+						GdkRGBA _tmp53_ = {0};
+						gdouble _tmp54_ = 0.0;
+						guint16 _tmp55_ = 0U;
+						GdkRGBA _tmp56_ = {0};
+						gdouble _tmp57_ = 0.0;
+						guint16 _tmp58_ = 0U;
+						GdkRGBA _tmp59_ = {0};
+						gdouble _tmp60_ = 0.0;
+						guint16 _tmp61_ = 0U;
 						PangoAttribute* _tmp62_ = NULL;
-						PangoAttribute* _tmp63_;
-						PangoAttribute* _tmp64_;
-						IBusText** _tmp65_;
-						gint _tmp65__length1;
-						gint _tmp66_;
-						IBusText* _tmp67_;
+						PangoAttribute* _tmp63_ = NULL;
+						PangoAttribute* _tmp64_ = NULL;
+						IBusText** _tmp65_ = NULL;
+						gint _tmp65__length1 = 0;
+						gint _tmp66_ = 0;
+						IBusText* _tmp67_ = NULL;
 						const gchar* _tmp68_ = NULL;
-						gint _tmp69_;
-						gint _tmp70_;
-						PangoAttrList* _tmp71_;
-						PangoAttribute* _tmp72_;
+						gint _tmp69_ = 0;
+						gint _tmp70_ = 0;
+						PangoAttrList* _tmp71_ = NULL;
+						PangoAttribute* _tmp72_ = NULL;
 						_tmp24_ = self->priv->m_candidates;
 						_tmp24__length1 = self->priv->m_candidates_length1;
 						_tmp25_ = i;
@@ -589,32 +583,32 @@
 					_tmp79_ = attrs;
 					gtk_label_set_attributes (_tmp78_, _tmp79_);
 					visible = TRUE;
-					__vala_PangoAttrList_free0 (attrs);
+					_pango_attr_list_unref0 (attrs);
 				} else {
-					GtkLabel* _tmp80_;
-					GtkLabel* _tmp81_;
-					PangoAttrList* _tmp82_;
-					PangoAttrList* _tmp83_;
+					GtkLabel* _tmp80_ = NULL;
+					GtkLabel* _tmp81_ = NULL;
+					PangoAttrList* _tmp82_ = NULL;
+					PangoAttrList* _tmp83_ = NULL;
 					_tmp80_ = label;
 					gtk_label_set_text (_tmp80_, "");
 					_tmp81_ = label;
 					_tmp82_ = pango_attr_list_new ();
 					_tmp83_ = _tmp82_;
 					gtk_label_set_attributes (_tmp81_, _tmp83_);
-					__vala_PangoAttrList_free0 (_tmp83_);
+					_pango_attr_list_unref0 (_tmp83_);
 				}
 				_tmp84_ = self->priv->m_vertical;
 				if (_tmp84_) {
-					GtkWidget** _tmp85_;
-					gint _tmp85__length1;
-					gint _tmp86_;
-					GtkWidget* _tmp87_;
-					gboolean _tmp88_;
-					GtkWidget** _tmp89_;
-					gint _tmp89__length1;
-					gint _tmp90_;
-					GtkWidget* _tmp91_;
-					gboolean _tmp92_;
+					GtkWidget** _tmp85_ = NULL;
+					gint _tmp85__length1 = 0;
+					gint _tmp86_ = 0;
+					GtkWidget* _tmp87_ = NULL;
+					gboolean _tmp88_ = FALSE;
+					GtkWidget** _tmp89_ = NULL;
+					gint _tmp89__length1 = 0;
+					gint _tmp90_ = 0;
+					GtkWidget* _tmp91_ = NULL;
+					gboolean _tmp92_ = FALSE;
 					_tmp85_ = self->priv->m_widgets;
 					_tmp85__length1 = self->priv->m_widgets_length1;
 					_tmp86_ = i;
@@ -628,11 +622,11 @@
 					_tmp92_ = visible;
 					gtk_widget_set_visible (_tmp91_, _tmp92_);
 				} else {
-					GtkWidget** _tmp93_;
-					gint _tmp93__length1;
-					gint _tmp94_;
-					GtkWidget* _tmp95_;
-					gboolean _tmp96_;
+					GtkWidget** _tmp93_ = NULL;
+					gint _tmp93__length1 = 0;
+					gint _tmp94_ = 0;
+					GtkWidget* _tmp95_ = NULL;
+					gboolean _tmp96_ = FALSE;
 					_tmp93_ = self->priv->m_widgets;
 					_tmp93__length1 = self->priv->m_widgets_length1;
 					_tmp94_ = i;
@@ -730,11 +724,11 @@
 	Block1Data* _data1_;
 	CandidateArea * self;
 	gboolean result = FALSE;
-	gint _tmp0_;
-	GdkEventButton _tmp1_;
-	guint _tmp2_;
-	GdkEventButton _tmp3_;
-	GdkModifierType _tmp4_;
+	gint _tmp0_ = 0;
+	GdkEventButton _tmp1_ = {0};
+	guint _tmp2_ = 0U;
+	GdkEventButton _tmp3_ = {0};
+	GdkModifierType _tmp4_ = 0;
 	_data1_ = _data2_->_data1_;
 	self = _data1_->self;
 	g_return_val_if_fail (w != NULL, FALSE);
@@ -771,11 +765,11 @@
 	Block1Data* _data1_;
 	CandidateArea * self;
 	gboolean result = FALSE;
-	gint _tmp0_;
-	GdkEventButton _tmp1_;
-	guint _tmp2_;
-	GdkEventButton _tmp3_;
-	GdkModifierType _tmp4_;
+	gint _tmp0_ = 0;
+	GdkEventButton _tmp1_ = {0};
+	guint _tmp2_ = 0U;
+	GdkEventButton _tmp3_ = {0};
+	GdkModifierType _tmp4_ = 0;
 	_data1_ = _data2_->_data1_;
 	self = _data1_->self;
 	g_return_val_if_fail (w != NULL, FALSE);
@@ -849,11 +843,11 @@
 static gboolean ______lambda6_ (Block3Data* _data3_, GtkWidget* w, GdkEventButton* e) {
 	CandidateArea * self;
 	gboolean result = FALSE;
-	gint _tmp0_;
-	GdkEventButton _tmp1_;
-	guint _tmp2_;
-	GdkEventButton _tmp3_;
-	GdkModifierType _tmp4_;
+	gint _tmp0_ = 0;
+	GdkEventButton _tmp1_ = {0};
+	guint _tmp2_ = 0U;
+	GdkEventButton _tmp3_ = {0};
+	GdkModifierType _tmp4_ = 0;
 	self = _data3_->self;
 	g_return_val_if_fail (w != NULL, FALSE);
 	g_return_val_if_fail (e != NULL, FALSE);
@@ -887,27 +881,27 @@
 
 static void candidate_area_recreate_ui (CandidateArea* self) {
 	GList* _tmp0_ = NULL;
-	GtkButton* _tmp3_;
-	GtkButton* prev_button;
-	GtkButton* _tmp4_;
-	GtkButton* _tmp5_;
-	GtkOrientation _tmp6_;
-	GtkOrientation _tmp7_;
-	const gchar* _tmp8_;
-	GtkImage* _tmp9_;
-	GtkImage* _tmp10_;
-	GtkButton* _tmp11_;
-	GtkButton* _tmp12_;
-	GtkButton* next_button;
-	GtkButton* _tmp13_;
-	GtkButton* _tmp14_;
-	GtkOrientation _tmp15_;
-	GtkOrientation _tmp16_;
-	const gchar* _tmp17_;
-	GtkImage* _tmp18_;
-	GtkImage* _tmp19_;
-	GtkButton* _tmp20_;
-	gboolean _tmp21_;
+	GtkButton* prev_button = NULL;
+	GtkButton* _tmp3_ = NULL;
+	GtkButton* _tmp4_ = NULL;
+	GtkButton* _tmp5_ = NULL;
+	GtkOrientation _tmp6_ = 0;
+	GtkOrientation _tmp7_ = 0;
+	const gchar* _tmp8_ = NULL;
+	GtkImage* _tmp9_ = NULL;
+	GtkImage* _tmp10_ = NULL;
+	GtkButton* _tmp11_ = NULL;
+	GtkButton* next_button = NULL;
+	GtkButton* _tmp12_ = NULL;
+	GtkButton* _tmp13_ = NULL;
+	GtkButton* _tmp14_ = NULL;
+	GtkOrientation _tmp15_ = 0;
+	GtkOrientation _tmp16_ = 0;
+	const gchar* _tmp17_ = NULL;
+	GtkImage* _tmp18_ = NULL;
+	GtkImage* _tmp19_ = NULL;
+	GtkButton* _tmp20_ = NULL;
+	gboolean _tmp21_ = FALSE;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = gtk_container_get_children ((GtkContainer*) self);
 	{
@@ -915,12 +909,12 @@
 		GList* w_it = NULL;
 		w_collection = _tmp0_;
 		for (w_it = w_collection; w_it != NULL; w_it = w_it->next) {
-			GtkWidget* _tmp1_;
+			GtkWidget* _tmp1_ = NULL;
 			GtkWidget* w = NULL;
 			_tmp1_ = _g_object_ref0 ((GtkWidget*) w_it->data);
 			w = _tmp1_;
 			{
-				GtkWidget* _tmp2_;
+				GtkWidget* _tmp2_ = NULL;
 				_tmp2_ = w;
 				gtk_widget_destroy (_tmp2_);
 				_g_object_unref0 (w);
@@ -962,36 +956,36 @@
 	gtk_button_set_relief (_tmp20_, GTK_RELIEF_NONE);
 	_tmp21_ = self->priv->m_vertical;
 	if (_tmp21_) {
-		GtkBox* _tmp22_;
-		GtkBox* candidates_hbox;
-		GtkBox* _tmp23_;
-		GtkBox* _tmp24_;
-		GtkBox* labels_vbox;
-		GtkBox* _tmp25_;
-		GtkBox* _tmp26_;
-		GtkBox* candidates_vbox;
-		GtkBox* _tmp27_;
-		GtkBox* _tmp28_;
-		GtkBox* _tmp29_;
-		GtkBox* _tmp30_;
-		VSeparator* _tmp31_;
-		VSeparator* _tmp32_;
-		GtkBox* _tmp33_;
-		GtkBox* _tmp34_;
-		HSeparator* _tmp35_;
-		HSeparator* _tmp36_;
-		GtkBox* _tmp37_;
-		GtkBox* buttons_hbox;
-		GtkLabel* _tmp38_;
-		GtkLabel* state_label;
-		GtkLabel* _tmp39_;
-		GtkBox* _tmp40_;
-		GtkLabel* _tmp41_;
-		GtkBox* _tmp42_;
-		GtkButton* _tmp43_;
-		GtkBox* _tmp44_;
-		GtkButton* _tmp45_;
-		GtkBox* _tmp46_;
+		GtkBox* candidates_hbox = NULL;
+		GtkBox* _tmp22_ = NULL;
+		GtkBox* _tmp23_ = NULL;
+		GtkBox* labels_vbox = NULL;
+		GtkBox* _tmp24_ = NULL;
+		GtkBox* _tmp25_ = NULL;
+		GtkBox* candidates_vbox = NULL;
+		GtkBox* _tmp26_ = NULL;
+		GtkBox* _tmp27_ = NULL;
+		GtkBox* _tmp28_ = NULL;
+		GtkBox* _tmp29_ = NULL;
+		GtkBox* _tmp30_ = NULL;
+		VSeparator* _tmp31_ = NULL;
+		VSeparator* _tmp32_ = NULL;
+		GtkBox* _tmp33_ = NULL;
+		GtkBox* _tmp34_ = NULL;
+		HSeparator* _tmp35_ = NULL;
+		HSeparator* _tmp36_ = NULL;
+		GtkBox* buttons_hbox = NULL;
+		GtkBox* _tmp37_ = NULL;
+		GtkLabel* state_label = NULL;
+		GtkLabel* _tmp38_ = NULL;
+		GtkLabel* _tmp39_ = NULL;
+		GtkBox* _tmp40_ = NULL;
+		GtkLabel* _tmp41_ = NULL;
+		GtkBox* _tmp42_ = NULL;
+		GtkButton* _tmp43_ = NULL;
+		GtkBox* _tmp44_ = NULL;
+		GtkButton* _tmp45_ = NULL;
+		GtkBox* _tmp46_ = NULL;
 		GtkLabel** _tmp47_ = NULL;
 		GtkLabel** _tmp48_ = NULL;
 		GtkWidget** _tmp49_ = NULL;
@@ -1068,65 +1062,65 @@
 			_data1_->self = g_object_ref (self);
 			_data1_->i = 0;
 			{
-				gboolean _tmp50_;
+				gboolean _tmp50_ = FALSE;
 				_tmp50_ = TRUE;
 				while (TRUE) {
 					Block2Data* _data2_;
-					gboolean _tmp51_;
-					gint _tmp53_;
-					gint _tmp54_;
-					const gchar* _tmp55_;
-					GtkLabel* _tmp56_;
-					GtkLabel* label;
-					GtkLabel* _tmp57_;
-					GtkLabel* _tmp58_;
-					GtkLabel** _tmp59_;
-					gint _tmp59__length1;
-					GtkLabel* _tmp60_;
-					GtkLabel* _tmp61_;
-					GtkLabel* _tmp62_;
-					GtkLabel* candidate;
-					GtkLabel* _tmp63_;
-					GtkLabel* _tmp64_;
-					GtkLabel** _tmp65_;
-					gint _tmp65__length1;
-					GtkLabel* _tmp66_;
-					GtkLabel* _tmp67_;
-					GtkLabel* _tmp68_;
+					gboolean _tmp51_ = FALSE;
+					gint _tmp53_ = 0;
+					GtkLabel* label = NULL;
+					gint _tmp54_ = 0;
+					const gchar* _tmp55_ = NULL;
+					GtkLabel* _tmp56_ = NULL;
+					GtkLabel* _tmp57_ = NULL;
+					GtkLabel* _tmp58_ = NULL;
+					GtkLabel** _tmp59_ = NULL;
+					gint _tmp59__length1 = 0;
+					GtkLabel* _tmp60_ = NULL;
+					GtkLabel* _tmp61_ = NULL;
+					GtkLabel* candidate = NULL;
+					GtkLabel* _tmp62_ = NULL;
+					GtkLabel* _tmp63_ = NULL;
+					GtkLabel* _tmp64_ = NULL;
+					GtkLabel** _tmp65_ = NULL;
+					gint _tmp65__length1 = 0;
+					GtkLabel* _tmp66_ = NULL;
+					GtkLabel* _tmp67_ = NULL;
+					GtkLabel* _tmp68_ = NULL;
 					GValue _tmp69_ = {0};
-					GtkLabel* _tmp70_;
+					GtkLabel* _tmp70_ = NULL;
 					GValue _tmp71_ = {0};
-					gint _tmp72_;
-					GtkEventBox* _tmp73_;
-					GtkEventBox* label_ebox;
-					GtkEventBox* _tmp74_;
-					GtkEventBox* _tmp75_;
-					GtkEventBox* _tmp76_;
-					GtkLabel* _tmp77_;
-					GtkBox* _tmp78_;
-					GtkEventBox* _tmp79_;
-					GtkWidget** _tmp80_;
-					gint _tmp80__length1;
-					GtkEventBox* _tmp81_;
-					GtkWidget* _tmp82_;
-					GtkEventBox* _tmp83_;
-					GtkEventBox* candidate_ebox;
-					GtkEventBox* _tmp84_;
-					GtkEventBox* _tmp85_;
-					GtkEventBox* _tmp86_;
-					GtkLabel* _tmp87_;
-					GtkBox* _tmp88_;
-					GtkEventBox* _tmp89_;
-					GtkWidget** _tmp90_;
-					gint _tmp90__length1;
-					GtkEventBox* _tmp91_;
-					GtkWidget* _tmp92_;
+					gint _tmp72_ = 0;
+					GtkEventBox* label_ebox = NULL;
+					GtkEventBox* _tmp73_ = NULL;
+					GtkEventBox* _tmp74_ = NULL;
+					GtkEventBox* _tmp75_ = NULL;
+					GtkEventBox* _tmp76_ = NULL;
+					GtkLabel* _tmp77_ = NULL;
+					GtkBox* _tmp78_ = NULL;
+					GtkEventBox* _tmp79_ = NULL;
+					GtkWidget** _tmp80_ = NULL;
+					gint _tmp80__length1 = 0;
+					GtkEventBox* _tmp81_ = NULL;
+					GtkWidget* _tmp82_ = NULL;
+					GtkEventBox* candidate_ebox = NULL;
+					GtkEventBox* _tmp83_ = NULL;
+					GtkEventBox* _tmp84_ = NULL;
+					GtkEventBox* _tmp85_ = NULL;
+					GtkEventBox* _tmp86_ = NULL;
+					GtkLabel* _tmp87_ = NULL;
+					GtkBox* _tmp88_ = NULL;
+					GtkEventBox* _tmp89_ = NULL;
+					GtkWidget** _tmp90_ = NULL;
+					gint _tmp90__length1 = 0;
+					GtkEventBox* _tmp91_ = NULL;
+					GtkWidget* _tmp92_ = NULL;
 					_data2_ = g_slice_new0 (Block2Data);
 					_data2_->_ref_count_ = 1;
 					_data2_->_data1_ = block1_data_ref (_data1_);
 					_tmp51_ = _tmp50_;
 					if (!_tmp51_) {
-						gint _tmp52_;
+						gint _tmp52_ = 0;
 						_tmp52_ = _data1_->i;
 						_data1_->i = _tmp52_ + 1;
 					}
@@ -1228,19 +1222,19 @@
 		_g_object_unref0 (labels_vbox);
 		_g_object_unref0 (candidates_hbox);
 	} else {
-		GtkBox* _tmp93_;
-		GtkBox* hbox;
-		GtkBox* _tmp94_;
+		GtkBox* hbox = NULL;
+		GtkBox* _tmp93_ = NULL;
+		GtkBox* _tmp94_ = NULL;
 		GtkLabel** _tmp95_ = NULL;
 		GtkLabel** _tmp96_ = NULL;
 		GtkWidget** _tmp97_ = NULL;
-		GtkBox* _tmp133_;
-		VSeparator* _tmp134_;
-		VSeparator* _tmp135_;
-		GtkBox* _tmp136_;
-		GtkButton* _tmp137_;
-		GtkBox* _tmp138_;
-		GtkButton* _tmp139_;
+		GtkBox* _tmp133_ = NULL;
+		VSeparator* _tmp134_ = NULL;
+		VSeparator* _tmp135_ = NULL;
+		GtkBox* _tmp136_ = NULL;
+		GtkButton* _tmp137_ = NULL;
+		GtkBox* _tmp138_ = NULL;
+		GtkButton* _tmp139_ = NULL;
 		_tmp93_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 		g_object_ref_sink (_tmp93_);
 		hbox = _tmp93_;
@@ -1262,59 +1256,59 @@
 		self->priv->m_widgets_length1 = 0;
 		self->priv->_m_widgets_size_ = self->priv->m_widgets_length1;
 		{
-			gint i;
+			gint i = 0;
 			i = 0;
 			{
-				gboolean _tmp98_;
+				gboolean _tmp98_ = FALSE;
 				_tmp98_ = TRUE;
 				while (TRUE) {
 					Block3Data* _data3_;
-					gboolean _tmp99_;
-					gint _tmp101_;
-					gint _tmp102_;
-					const gchar* _tmp103_;
-					GtkLabel* _tmp104_;
-					GtkLabel* label;
-					GtkLabel* _tmp105_;
-					GtkLabel* _tmp106_;
-					GtkLabel** _tmp107_;
-					gint _tmp107__length1;
-					GtkLabel* _tmp108_;
-					GtkLabel* _tmp109_;
-					GtkLabel* _tmp110_;
-					GtkLabel* candidate;
-					GtkLabel* _tmp111_;
-					GtkLabel* _tmp112_;
-					GtkLabel** _tmp113_;
-					gint _tmp113__length1;
-					GtkLabel* _tmp114_;
-					GtkLabel* _tmp115_;
-					GtkBox* _tmp116_;
-					GtkBox* candidate_hbox;
-					GtkBox* _tmp117_;
-					GtkBox* _tmp118_;
-					GtkLabel* _tmp119_;
-					GtkBox* _tmp120_;
-					GtkLabel* _tmp121_;
-					gint _tmp122_;
-					GtkEventBox* _tmp123_;
-					GtkEventBox* ebox;
-					GtkEventBox* _tmp124_;
-					GtkEventBox* _tmp125_;
-					GtkEventBox* _tmp126_;
-					GtkBox* _tmp127_;
-					GtkBox* _tmp128_;
-					GtkEventBox* _tmp129_;
-					GtkWidget** _tmp130_;
-					gint _tmp130__length1;
-					GtkEventBox* _tmp131_;
-					GtkWidget* _tmp132_;
+					gboolean _tmp99_ = FALSE;
+					gint _tmp101_ = 0;
+					GtkLabel* label = NULL;
+					gint _tmp102_ = 0;
+					const gchar* _tmp103_ = NULL;
+					GtkLabel* _tmp104_ = NULL;
+					GtkLabel* _tmp105_ = NULL;
+					GtkLabel* _tmp106_ = NULL;
+					GtkLabel** _tmp107_ = NULL;
+					gint _tmp107__length1 = 0;
+					GtkLabel* _tmp108_ = NULL;
+					GtkLabel* _tmp109_ = NULL;
+					GtkLabel* candidate = NULL;
+					GtkLabel* _tmp110_ = NULL;
+					GtkLabel* _tmp111_ = NULL;
+					GtkLabel* _tmp112_ = NULL;
+					GtkLabel** _tmp113_ = NULL;
+					gint _tmp113__length1 = 0;
+					GtkLabel* _tmp114_ = NULL;
+					GtkLabel* _tmp115_ = NULL;
+					GtkBox* candidate_hbox = NULL;
+					GtkBox* _tmp116_ = NULL;
+					GtkBox* _tmp117_ = NULL;
+					GtkBox* _tmp118_ = NULL;
+					GtkLabel* _tmp119_ = NULL;
+					GtkBox* _tmp120_ = NULL;
+					GtkLabel* _tmp121_ = NULL;
+					gint _tmp122_ = 0;
+					GtkEventBox* ebox = NULL;
+					GtkEventBox* _tmp123_ = NULL;
+					GtkEventBox* _tmp124_ = NULL;
+					GtkEventBox* _tmp125_ = NULL;
+					GtkEventBox* _tmp126_ = NULL;
+					GtkBox* _tmp127_ = NULL;
+					GtkBox* _tmp128_ = NULL;
+					GtkEventBox* _tmp129_ = NULL;
+					GtkWidget** _tmp130_ = NULL;
+					gint _tmp130__length1 = 0;
+					GtkEventBox* _tmp131_ = NULL;
+					GtkWidget* _tmp132_ = NULL;
 					_data3_ = g_slice_new0 (Block3Data);
 					_data3_->_ref_count_ = 1;
 					_data3_->self = g_object_ref (self);
 					_tmp99_ = _tmp98_;
 					if (!_tmp99_) {
-						gint _tmp100_;
+						gint _tmp100_ = 0;
 						_tmp100_ = i;
 						i = _tmp100_ + 1;
 					}
diff -Nru ibus-1.5.4/ui/gtk3/candidatepanel.c ibus-1.5.5/ui/gtk3/candidatepanel.c
--- ibus-1.5.4/ui/gtk3/candidatepanel.c	2013-09-20 12:21:58.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/candidatepanel.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,4 +1,4 @@
-/* candidatepanel.c generated by valac 0.20.1, the Vala compiler
+/* candidatepanel.c generated by valac 0.22.0, the Vala compiler
  * generated from candidatepanel.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
@@ -109,15 +109,17 @@
 static gboolean __lambda7_ (CandidatePanel* self, GtkWidget* w, GdkEventButton* e);
 void candidate_panel_set_vertical (CandidatePanel* self, gboolean vertical);
 static gboolean ___lambda7__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static void __lambda8_ (CandidatePanel* self, GtkWidget* w, GtkAllocation* a);
+static void candidate_panel_adjust_window_position (CandidatePanel* self);
+static void ___lambda8__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self);
+GType handle_get_type (void) G_GNUC_CONST;
 Handle* handle_new (void);
 Handle* handle_construct (GType object_type);
-GType handle_get_type (void) G_GNUC_CONST;
 static void candidate_panel_create_ui (CandidatePanel* self);
 void candidate_area_set_vertical (CandidateArea* self, gboolean vertical, gboolean force);
 static void candidate_panel_set_orientation (CandidatePanel* self, IBusOrientation orientation);
 void candidate_panel_set_cursor_location (CandidatePanel* self, gint x, gint y, gint width, gint height);
 static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t* s1, const cairo_rectangle_int_t* s2);
-static void candidate_panel_adjust_window_position (CandidatePanel* self);
 static void candidate_panel_set_labels (CandidatePanel* self, IBusText** labels, int labels_length1);
 void candidate_area_set_labels (CandidateArea* self, IBusText** labels, int labels_length1);
 void candidate_panel_set_preedit_text (CandidatePanel* self, IBusText* text, guint cursor);
@@ -131,16 +133,16 @@
 static void candidate_panel_real_get_preferred_height (GtkWidget* base, gint* minimum_width, gint* natural_width);
 CandidateArea* candidate_area_new (gboolean vertical);
 CandidateArea* candidate_area_construct (GType object_type, gboolean vertical);
-static void __lambda8_ (CandidatePanel* self, CandidateArea* w, guint i, guint b, guint s);
-static void ___lambda8__candidate_area_candidate_clicked (CandidateArea* _sender, guint index, guint button, guint state, gpointer self);
-static void __lambda9_ (CandidatePanel* self, CandidateArea* c);
-static void ___lambda9__candidate_area_page_up (CandidateArea* _sender, gpointer self);
+static void __lambda9_ (CandidatePanel* self, CandidateArea* w, guint i, guint b, guint s);
+static void ___lambda9__candidate_area_candidate_clicked (CandidateArea* _sender, guint index, guint button, guint state, gpointer self);
 static void __lambda10_ (CandidatePanel* self, CandidateArea* c);
-static void ___lambda10__candidate_area_page_down (CandidateArea* _sender, gpointer self);
+static void ___lambda10__candidate_area_page_up (CandidateArea* _sender, gpointer self);
 static void __lambda11_ (CandidatePanel* self, CandidateArea* c);
-static void ___lambda11__candidate_area_cursor_up (CandidateArea* _sender, gpointer self);
+static void ___lambda11__candidate_area_page_down (CandidateArea* _sender, gpointer self);
 static void __lambda12_ (CandidatePanel* self, CandidateArea* c);
-static void ___lambda12__candidate_area_cursor_down (CandidateArea* _sender, gpointer self);
+static void ___lambda12__candidate_area_cursor_up (CandidateArea* _sender, gpointer self);
+static void __lambda13_ (CandidatePanel* self, CandidateArea* c);
+static void ___lambda13__candidate_area_cursor_down (CandidateArea* _sender, gpointer self);
 HSeparator* hseparator_new (void);
 HSeparator* hseparator_construct (GType object_type);
 static void candidate_panel_pack_all_widgets (CandidatePanel* self);
@@ -156,10 +158,10 @@
 static gboolean __lambda7_ (CandidatePanel* self, GtkWidget* w, GdkEventButton* e) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GdkEventButton _tmp1_;
-	guint _tmp2_;
-	gboolean _tmp5_;
-	gboolean _tmp6_;
+	GdkEventButton _tmp1_ = {0};
+	guint _tmp2_ = 0U;
+	gboolean _tmp5_ = FALSE;
+	gboolean _tmp6_ = FALSE;
 	g_return_val_if_fail (w != NULL, FALSE);
 	g_return_val_if_fail (e != NULL, FALSE);
 	_tmp1_ = *e;
@@ -167,8 +169,8 @@
 	if (_tmp2_ != ((guint) 1)) {
 		_tmp0_ = TRUE;
 	} else {
-		GdkEventButton _tmp3_;
-		GdkModifierType _tmp4_;
+		GdkEventButton _tmp3_ = {0};
+		GdkModifierType _tmp4_ = 0;
 		_tmp3_ = *e;
 		_tmp4_ = _tmp3_.state;
 		_tmp0_ = (_tmp4_ & GDK_CONTROL_MASK) == 0;
@@ -192,17 +194,30 @@
 }
 
 
+static void __lambda8_ (CandidatePanel* self, GtkWidget* w, GtkAllocation* a) {
+	g_return_if_fail (w != NULL);
+	g_return_if_fail (a != NULL);
+	candidate_panel_adjust_window_position (self);
+}
+
+
+static void ___lambda8__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
+	__lambda8_ (self, _sender, allocation);
+}
+
+
 CandidatePanel* candidate_panel_construct (GType object_type) {
 	CandidatePanel * self = NULL;
-	GtkWindow* _tmp0_;
-	GtkWindow* _tmp1_;
-	GtkWindow* _tmp2_;
-	Handle* _tmp3_;
-	Handle* handle;
-	GtkBox* _tmp4_;
-	GtkBox* _tmp5_;
-	GtkBox* _tmp6_;
-	GtkWindow* _tmp7_;
+	GtkWindow* _tmp0_ = NULL;
+	GtkWindow* _tmp1_ = NULL;
+	GtkWindow* _tmp2_ = NULL;
+	GtkWindow* _tmp3_ = NULL;
+	Handle* handle = NULL;
+	Handle* _tmp4_ = NULL;
+	GtkBox* _tmp5_ = NULL;
+	GtkBox* _tmp6_ = NULL;
+	GtkBox* _tmp7_ = NULL;
+	GtkWindow* _tmp8_ = NULL;
 	self = (CandidatePanel*) g_object_new (object_type, "name", "IBusCandidate", "visible", TRUE, NULL);
 	_tmp0_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_POPUP);
 	g_object_ref_sink (_tmp0_);
@@ -212,21 +227,23 @@
 	gtk_widget_add_events ((GtkWidget*) _tmp1_, (gint) GDK_BUTTON_PRESS_MASK);
 	_tmp2_ = self->priv->m_toplevel;
 	g_signal_connect_object ((GtkWidget*) _tmp2_, "button-press-event", (GCallback) ___lambda7__gtk_widget_button_press_event, self, 0);
-	_tmp3_ = handle_new ();
-	g_object_ref_sink (_tmp3_);
-	handle = _tmp3_;
+	_tmp3_ = self->priv->m_toplevel;
+	g_signal_connect_object ((GtkWidget*) _tmp3_, "size-allocate", (GCallback) ___lambda8__gtk_widget_size_allocate, self, 0);
+	_tmp4_ = handle_new ();
+	g_object_ref_sink (_tmp4_);
+	handle = _tmp4_;
 	gtk_widget_set_visible ((GtkWidget*) handle, TRUE);
 	gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) handle, FALSE, FALSE, (guint) 0);
-	_tmp4_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-	g_object_ref_sink (_tmp4_);
+	_tmp5_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	g_object_ref_sink (_tmp5_);
 	_g_object_unref0 (self->priv->m_vbox);
-	self->priv->m_vbox = _tmp4_;
-	_tmp5_ = self->priv->m_vbox;
-	gtk_widget_set_visible ((GtkWidget*) _tmp5_, TRUE);
+	self->priv->m_vbox = _tmp5_;
 	_tmp6_ = self->priv->m_vbox;
-	gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) _tmp6_, FALSE, FALSE, (guint) 0);
-	_tmp7_ = self->priv->m_toplevel;
-	gtk_container_add ((GtkContainer*) _tmp7_, (GtkWidget*) self);
+	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
+	_tmp7_ = self->priv->m_vbox;
+	gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) _tmp7_, FALSE, FALSE, (guint) 0);
+	_tmp8_ = self->priv->m_toplevel;
+	gtk_container_add ((GtkContainer*) _tmp8_, (GtkWidget*) self);
 	candidate_panel_create_ui (self);
 	_g_object_unref0 (handle);
 	return self;
@@ -239,11 +256,11 @@
 
 
 void candidate_panel_set_vertical (CandidatePanel* self, gboolean vertical) {
-	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	CandidateArea* _tmp3_;
-	gboolean _tmp4_;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	gboolean _tmp2_ = FALSE;
+	CandidateArea* _tmp3_ = NULL;
+	gboolean _tmp4_ = FALSE;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_vertical;
 	_tmp1_ = vertical;
@@ -259,28 +276,28 @@
 
 
 static void candidate_panel_set_orientation (CandidatePanel* self, IBusOrientation orientation) {
-	IBusOrientation _tmp0_;
+	IBusOrientation _tmp0_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = orientation;
 	switch (_tmp0_) {
 		case IBUS_ORIENTATION_VERTICAL:
 		{
-			CandidateArea* _tmp1_;
+			CandidateArea* _tmp1_ = NULL;
 			_tmp1_ = self->priv->m_candidate_area;
 			candidate_area_set_vertical (_tmp1_, TRUE, FALSE);
 			break;
 		}
 		case IBUS_ORIENTATION_HORIZONTAL:
 		{
-			CandidateArea* _tmp2_;
+			CandidateArea* _tmp2_ = NULL;
 			_tmp2_ = self->priv->m_candidate_area;
 			candidate_area_set_vertical (_tmp2_, FALSE, FALSE);
 			break;
 		}
 		case IBUS_ORIENTATION_SYSTEM:
 		{
-			CandidateArea* _tmp3_;
-			gboolean _tmp4_;
+			CandidateArea* _tmp3_ = NULL;
+			gboolean _tmp4_ = FALSE;
 			_tmp3_ = self->priv->m_candidate_area;
 			_tmp4_ = self->priv->m_vertical;
 			candidate_area_set_vertical (_tmp3_, _tmp4_, FALSE);
@@ -319,15 +336,15 @@
 
 
 void candidate_panel_set_cursor_location (CandidatePanel* self, gint x, gint y, gint width, gint height) {
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
+	GdkRectangle location = {0};
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
 	GdkRectangle _tmp4_ = {0};
-	GdkRectangle location;
-	GdkRectangle _tmp5_;
-	GdkRectangle _tmp6_;
-	GdkRectangle _tmp7_;
+	GdkRectangle _tmp5_ = {0};
+	GdkRectangle _tmp6_ = {0};
+	GdkRectangle _tmp7_ = {0};
 	g_return_if_fail (self != NULL);
 	_tmp0_ = x;
 	_tmp1_ = y;
@@ -346,14 +363,13 @@
 	}
 	_tmp7_ = location;
 	self->priv->m_cursor_location = _tmp7_;
-	candidate_panel_adjust_window_position (self);
 }
 
 
 static void candidate_panel_set_labels (CandidatePanel* self, IBusText** labels, int labels_length1) {
-	CandidateArea* _tmp0_;
-	IBusText** _tmp1_;
-	gint _tmp1__length1;
+	CandidateArea* _tmp0_ = NULL;
+	IBusText** _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_candidate_area;
 	_tmp1_ = labels;
@@ -363,14 +379,14 @@
 
 
 void candidate_panel_set_preedit_text (CandidatePanel* self, IBusText* text, guint cursor) {
-	IBusText* _tmp0_;
+	IBusText* _tmp0_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = text;
 	if (_tmp0_ != NULL) {
-		GtkLabel* _tmp1_;
-		IBusText* _tmp2_;
+		GtkLabel* _tmp1_ = NULL;
+		IBusText* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-		GtkLabel* _tmp4_;
+		GtkLabel* _tmp4_ = NULL;
 		_tmp1_ = self->priv->m_preedit_label;
 		_tmp2_ = text;
 		_tmp3_ = ibus_text_get_text (_tmp2_);
@@ -378,8 +394,8 @@
 		_tmp4_ = self->priv->m_preedit_label;
 		gtk_widget_show ((GtkWidget*) _tmp4_);
 	} else {
-		GtkLabel* _tmp5_;
-		GtkLabel* _tmp6_;
+		GtkLabel* _tmp5_ = NULL;
+		GtkLabel* _tmp6_ = NULL;
 		_tmp5_ = self->priv->m_preedit_label;
 		gtk_label_set_text (_tmp5_, "");
 		_tmp6_ = self->priv->m_preedit_label;
@@ -390,14 +406,14 @@
 
 
 void candidate_panel_set_auxiliary_text (CandidatePanel* self, IBusText* text) {
-	IBusText* _tmp0_;
+	IBusText* _tmp0_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = text;
 	if (_tmp0_ != NULL) {
-		GtkLabel* _tmp1_;
-		IBusText* _tmp2_;
+		GtkLabel* _tmp1_ = NULL;
+		IBusText* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-		GtkLabel* _tmp4_;
+		GtkLabel* _tmp4_ = NULL;
 		_tmp1_ = self->priv->m_aux_label;
 		_tmp2_ = text;
 		_tmp3_ = ibus_text_get_text (_tmp2_);
@@ -405,8 +421,8 @@
 		_tmp4_ = self->priv->m_aux_label;
 		gtk_widget_show ((GtkWidget*) _tmp4_);
 	} else {
-		GtkLabel* _tmp5_;
-		GtkLabel* _tmp6_;
+		GtkLabel* _tmp5_ = NULL;
+		GtkLabel* _tmp6_ = NULL;
 		_tmp5_ = self->priv->m_aux_label;
 		gtk_label_set_text (_tmp5_, "");
 		_tmp6_ = self->priv->m_aux_label;
@@ -442,28 +458,28 @@
 
 
 void candidate_panel_set_lookup_table (CandidatePanel* self, IBusLookupTable* table) {
+	IBusText** candidates = NULL;
 	IBusText** _tmp0_ = NULL;
-	IBusText** candidates;
-	gint candidates_length1;
-	gint _candidates_size_;
-	guint cursor_in_page;
-	gboolean show_cursor;
+	gint candidates_length1 = 0;
+	gint _candidates_size_ = 0;
+	guint cursor_in_page = 0U;
+	gboolean show_cursor = FALSE;
+	IBusText** labels = NULL;
 	IBusText** _tmp1_ = NULL;
-	IBusText** labels;
-	gint labels_length1;
-	gint _labels_size_;
-	IBusOrientation orientation;
-	IBusLookupTable* _tmp2_;
-	CandidateArea* _tmp46_;
-	IBusText** _tmp47_;
-	gint _tmp47__length1;
-	guint _tmp48_;
-	gboolean _tmp49_;
-	IBusText** _tmp50_;
-	gint _tmp50__length1;
-	IBusLookupTable* _tmp51_;
-	IBusText** _tmp53_;
-	gint _tmp53__length1;
+	gint labels_length1 = 0;
+	gint _labels_size_ = 0;
+	IBusOrientation orientation = 0;
+	IBusLookupTable* _tmp2_ = NULL;
+	CandidateArea* _tmp46_ = NULL;
+	IBusText** _tmp47_ = NULL;
+	gint _tmp47__length1 = 0;
+	guint _tmp48_ = 0U;
+	gboolean _tmp49_ = FALSE;
+	IBusText** _tmp50_ = NULL;
+	gint _tmp50__length1 = 0;
+	IBusLookupTable* _tmp51_ = NULL;
+	IBusText** _tmp53_ = NULL;
+	gint _tmp53__length1 = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = g_new0 (IBusText*, 0 + 1);
 	candidates = _tmp0_;
@@ -478,29 +494,29 @@
 	orientation = IBUS_ORIENTATION_SYSTEM;
 	_tmp2_ = table;
 	if (_tmp2_ != NULL) {
-		IBusLookupTable* _tmp3_;
+		guint page_size = 0U;
+		IBusLookupTable* _tmp3_ = NULL;
 		guint _tmp4_ = 0U;
-		guint page_size;
-		IBusLookupTable* _tmp5_;
+		guint ncandidates = 0U;
+		IBusLookupTable* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
-		guint ncandidates;
-		IBusLookupTable* _tmp7_;
+		guint cursor = 0U;
+		IBusLookupTable* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
-		guint cursor;
-		IBusLookupTable* _tmp9_;
+		IBusLookupTable* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-		IBusLookupTable* _tmp11_;
+		IBusLookupTable* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
-		guint _tmp13_;
-		guint _tmp14_;
-		guint _tmp15_;
-		guint page_start_pos;
-		guint _tmp16_;
-		guint _tmp17_;
-		guint _tmp18_;
+		guint page_start_pos = 0U;
+		guint _tmp13_ = 0U;
+		guint _tmp14_ = 0U;
+		guint _tmp15_ = 0U;
+		guint page_end_pos = 0U;
+		guint _tmp16_ = 0U;
+		guint _tmp17_ = 0U;
+		guint _tmp18_ = 0U;
 		guint _tmp19_ = 0U;
-		guint page_end_pos;
-		IBusLookupTable* _tmp44_;
+		IBusLookupTable* _tmp44_ = NULL;
 		gint _tmp45_ = 0;
 		_tmp3_ = table;
 		_tmp4_ = ibus_lookup_table_get_page_size (_tmp3_);
@@ -527,26 +543,26 @@
 		_tmp19_ = MIN (_tmp16_ + _tmp17_, _tmp18_);
 		page_end_pos = _tmp19_;
 		{
-			guint _tmp20_;
-			guint i;
+			guint i = 0U;
+			guint _tmp20_ = 0U;
 			_tmp20_ = page_start_pos;
 			i = _tmp20_;
 			{
-				gboolean _tmp21_;
+				gboolean _tmp21_ = FALSE;
 				_tmp21_ = TRUE;
 				while (TRUE) {
-					gboolean _tmp22_;
-					guint _tmp24_;
-					guint _tmp25_;
-					IBusText** _tmp26_;
-					gint _tmp26__length1;
-					IBusLookupTable* _tmp27_;
-					guint _tmp28_;
+					gboolean _tmp22_ = FALSE;
+					guint _tmp24_ = 0U;
+					guint _tmp25_ = 0U;
+					IBusText** _tmp26_ = NULL;
+					gint _tmp26__length1 = 0;
+					IBusLookupTable* _tmp27_ = NULL;
+					guint _tmp28_ = 0U;
 					IBusText* _tmp29_ = NULL;
-					IBusText* _tmp30_;
+					IBusText* _tmp30_ = NULL;
 					_tmp22_ = _tmp21_;
 					if (!_tmp22_) {
-						guint _tmp23_;
+						guint _tmp23_ = 0U;
 						_tmp23_ = i;
 						i = _tmp23_ + 1;
 					}
@@ -567,24 +583,24 @@
 			}
 		}
 		{
-			guint i;
+			guint i = 0U;
 			i = (guint) 0;
 			{
-				gboolean _tmp31_;
+				gboolean _tmp31_ = FALSE;
 				_tmp31_ = TRUE;
 				while (TRUE) {
-					gboolean _tmp32_;
-					guint _tmp34_;
-					guint _tmp35_;
-					IBusLookupTable* _tmp36_;
-					guint _tmp37_;
+					gboolean _tmp32_ = FALSE;
+					guint _tmp34_ = 0U;
+					guint _tmp35_ = 0U;
+					IBusText* label = NULL;
+					IBusLookupTable* _tmp36_ = NULL;
+					guint _tmp37_ = 0U;
 					IBusText* _tmp38_ = NULL;
-					IBusText* _tmp39_;
-					IBusText* label;
-					IBusText* _tmp40_;
+					IBusText* _tmp39_ = NULL;
+					IBusText* _tmp40_ = NULL;
 					_tmp32_ = _tmp31_;
 					if (!_tmp32_) {
-						guint _tmp33_;
+						guint _tmp33_ = 0U;
 						_tmp33_ = i;
 						i = _tmp33_ + 1;
 					}
@@ -601,10 +617,10 @@
 					label = _tmp39_;
 					_tmp40_ = label;
 					if (_tmp40_ != NULL) {
-						IBusText** _tmp41_;
-						gint _tmp41__length1;
-						IBusText* _tmp42_;
-						IBusText* _tmp43_;
+						IBusText** _tmp41_ = NULL;
+						gint _tmp41__length1 = 0;
+						IBusText* _tmp42_ = NULL;
+						IBusText* _tmp43_ = NULL;
 						_tmp41_ = labels;
 						_tmp41__length1 = labels_length1;
 						_tmp42_ = label;
@@ -630,18 +646,18 @@
 	candidate_panel_set_labels (self, _tmp50_, _tmp50__length1);
 	_tmp51_ = table;
 	if (_tmp51_ != NULL) {
-		IBusOrientation _tmp52_;
+		IBusOrientation _tmp52_ = 0;
 		_tmp52_ = orientation;
 		candidate_panel_set_orientation (self, _tmp52_);
 	}
 	_tmp53_ = candidates;
 	_tmp53__length1 = candidates_length1;
 	if (_tmp53__length1 != 0) {
-		CandidateArea* _tmp54_;
+		CandidateArea* _tmp54_ = NULL;
 		_tmp54_ = self->priv->m_candidate_area;
 		gtk_widget_show_all ((GtkWidget*) _tmp54_);
 	} else {
-		CandidateArea* _tmp55_;
+		CandidateArea* _tmp55_ = NULL;
 		_tmp55_ = self->priv->m_candidate_area;
 		gtk_widget_hide ((GtkWidget*) _tmp55_);
 	}
@@ -654,21 +670,21 @@
 static void candidate_panel_update (CandidatePanel* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	CandidateArea* _tmp2_;
+	CandidateArea* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-	gboolean _tmp6_;
-	gboolean _tmp9_;
+	gboolean _tmp6_ = FALSE;
+	gboolean _tmp9_ = FALSE;
 	gboolean _tmp12_ = FALSE;
-	GtkLabel* _tmp13_;
+	GtkLabel* _tmp13_ = NULL;
 	gboolean _tmp14_ = FALSE;
-	gboolean _tmp21_;
+	gboolean _tmp21_ = FALSE;
 	g_return_if_fail (self != NULL);
 	_tmp2_ = self->priv->m_candidate_area;
 	_tmp3_ = gtk_widget_get_visible ((GtkWidget*) _tmp2_);
 	if (_tmp3_) {
 		_tmp1_ = TRUE;
 	} else {
-		GtkLabel* _tmp4_;
+		GtkLabel* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		_tmp4_ = self->priv->m_preedit_label;
 		_tmp5_ = gtk_widget_get_visible ((GtkWidget*) _tmp4_);
@@ -678,7 +694,7 @@
 	if (_tmp6_) {
 		_tmp0_ = TRUE;
 	} else {
-		GtkLabel* _tmp7_;
+		GtkLabel* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
 		_tmp7_ = self->priv->m_aux_label;
 		_tmp8_ = gtk_widget_get_visible ((GtkWidget*) _tmp7_);
@@ -686,11 +702,11 @@
 	}
 	_tmp9_ = _tmp0_;
 	if (_tmp9_) {
-		GtkWindow* _tmp10_;
+		GtkWindow* _tmp10_ = NULL;
 		_tmp10_ = self->priv->m_toplevel;
 		gtk_widget_show ((GtkWidget*) _tmp10_);
 	} else {
-		GtkWindow* _tmp11_;
+		GtkWindow* _tmp11_ = NULL;
 		_tmp11_ = self->priv->m_toplevel;
 		gtk_widget_hide ((GtkWidget*) _tmp11_);
 	}
@@ -698,15 +714,15 @@
 	_tmp14_ = gtk_widget_get_visible ((GtkWidget*) _tmp13_);
 	if (_tmp14_) {
 		gboolean _tmp15_ = FALSE;
-		CandidateArea* _tmp16_;
+		CandidateArea* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
-		gboolean _tmp20_;
+		gboolean _tmp20_ = FALSE;
 		_tmp16_ = self->priv->m_candidate_area;
 		_tmp17_ = gtk_widget_get_visible ((GtkWidget*) _tmp16_);
 		if (_tmp17_) {
 			_tmp15_ = TRUE;
 		} else {
-			GtkLabel* _tmp18_;
+			GtkLabel* _tmp18_ = NULL;
 			gboolean _tmp19_ = FALSE;
 			_tmp18_ = self->priv->m_preedit_label;
 			_tmp19_ = gtk_widget_get_visible ((GtkWidget*) _tmp18_);
@@ -719,11 +735,11 @@
 	}
 	_tmp21_ = _tmp12_;
 	if (_tmp21_) {
-		HSeparator* _tmp22_;
+		HSeparator* _tmp22_ = NULL;
 		_tmp22_ = self->priv->m_hseparator;
 		gtk_widget_show ((GtkWidget*) _tmp22_);
 	} else {
-		HSeparator* _tmp23_;
+		HSeparator* _tmp23_ = NULL;
 		_tmp23_ = self->priv->m_hseparator;
 		gtk_widget_hide ((GtkWidget*) _tmp23_);
 	}
@@ -736,7 +752,7 @@
 	gint _vala_natural_width = 0;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-	GtkWindow* _tmp2_;
+	GtkWindow* _tmp2_ = NULL;
 	self = (CandidatePanel*) base;
 	GTK_WIDGET_CLASS (candidate_panel_parent_class)->get_preferred_width ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_HBOX, GtkHBox), &_tmp0_, &_tmp1_);
 	_vala_minimum_width = _tmp0_;
@@ -758,7 +774,7 @@
 	gint _vala_natural_width = 0;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-	GtkWindow* _tmp2_;
+	GtkWindow* _tmp2_ = NULL;
 	self = (CandidatePanel*) base;
 	GTK_WIDGET_CLASS (candidate_panel_parent_class)->get_preferred_height ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_HBOX, GtkHBox), &_tmp0_, &_tmp1_);
 	_vala_minimum_width = _tmp0_;
@@ -774,10 +790,10 @@
 }
 
 
-static void __lambda8_ (CandidatePanel* self, CandidateArea* w, guint i, guint b, guint s) {
-	guint _tmp0_;
-	guint _tmp1_;
-	guint _tmp2_;
+static void __lambda9_ (CandidatePanel* self, CandidateArea* w, guint i, guint b, guint s) {
+	guint _tmp0_ = 0U;
+	guint _tmp1_ = 0U;
+	guint _tmp2_ = 0U;
 	g_return_if_fail (w != NULL);
 	_tmp0_ = i;
 	_tmp1_ = b;
@@ -786,75 +802,75 @@
 }
 
 
-static void ___lambda8__candidate_area_candidate_clicked (CandidateArea* _sender, guint index, guint button, guint state, gpointer self) {
-	__lambda8_ (self, _sender, index, button, state);
+static void ___lambda9__candidate_area_candidate_clicked (CandidateArea* _sender, guint index, guint button, guint state, gpointer self) {
+	__lambda9_ (self, _sender, index, button, state);
 }
 
 
-static void __lambda9_ (CandidatePanel* self, CandidateArea* c) {
+static void __lambda10_ (CandidatePanel* self, CandidateArea* c) {
 	g_return_if_fail (c != NULL);
 	g_signal_emit_by_name (self, "page-up");
 }
 
 
-static void ___lambda9__candidate_area_page_up (CandidateArea* _sender, gpointer self) {
-	__lambda9_ (self, _sender);
+static void ___lambda10__candidate_area_page_up (CandidateArea* _sender, gpointer self) {
+	__lambda10_ (self, _sender);
 }
 
 
-static void __lambda10_ (CandidatePanel* self, CandidateArea* c) {
+static void __lambda11_ (CandidatePanel* self, CandidateArea* c) {
 	g_return_if_fail (c != NULL);
 	g_signal_emit_by_name (self, "page-down");
 }
 
 
-static void ___lambda10__candidate_area_page_down (CandidateArea* _sender, gpointer self) {
-	__lambda10_ (self, _sender);
+static void ___lambda11__candidate_area_page_down (CandidateArea* _sender, gpointer self) {
+	__lambda11_ (self, _sender);
 }
 
 
-static void __lambda11_ (CandidatePanel* self, CandidateArea* c) {
+static void __lambda12_ (CandidatePanel* self, CandidateArea* c) {
 	g_return_if_fail (c != NULL);
 	g_signal_emit_by_name (self, "cursor-up");
 }
 
 
-static void ___lambda11__candidate_area_cursor_up (CandidateArea* _sender, gpointer self) {
-	__lambda11_ (self, _sender);
+static void ___lambda12__candidate_area_cursor_up (CandidateArea* _sender, gpointer self) {
+	__lambda12_ (self, _sender);
 }
 
 
-static void __lambda12_ (CandidatePanel* self, CandidateArea* c) {
+static void __lambda13_ (CandidatePanel* self, CandidateArea* c) {
 	g_return_if_fail (c != NULL);
 	g_signal_emit_by_name (self, "cursor-down");
 }
 
 
-static void ___lambda12__candidate_area_cursor_down (CandidateArea* _sender, gpointer self) {
-	__lambda12_ (self, _sender);
+static void ___lambda13__candidate_area_cursor_down (CandidateArea* _sender, gpointer self) {
+	__lambda13_ (self, _sender);
 }
 
 
 static void candidate_panel_create_ui (CandidatePanel* self) {
-	GtkLabel* _tmp0_;
-	GtkLabel* _tmp1_;
-	GtkLabel* _tmp2_;
-	GtkLabel* _tmp3_;
-	GtkLabel* _tmp4_;
-	GtkLabel* _tmp5_;
-	GtkLabel* _tmp6_;
-	GtkLabel* _tmp7_;
-	GtkLabel* _tmp8_;
-	GtkLabel* _tmp9_;
-	gboolean _tmp10_;
-	CandidateArea* _tmp11_;
-	CandidateArea* _tmp12_;
-	CandidateArea* _tmp13_;
-	CandidateArea* _tmp14_;
-	CandidateArea* _tmp15_;
-	CandidateArea* _tmp16_;
-	HSeparator* _tmp17_;
-	HSeparator* _tmp18_;
+	GtkLabel* _tmp0_ = NULL;
+	GtkLabel* _tmp1_ = NULL;
+	GtkLabel* _tmp2_ = NULL;
+	GtkLabel* _tmp3_ = NULL;
+	GtkLabel* _tmp4_ = NULL;
+	GtkLabel* _tmp5_ = NULL;
+	GtkLabel* _tmp6_ = NULL;
+	GtkLabel* _tmp7_ = NULL;
+	GtkLabel* _tmp8_ = NULL;
+	GtkLabel* _tmp9_ = NULL;
+	gboolean _tmp10_ = FALSE;
+	CandidateArea* _tmp11_ = NULL;
+	CandidateArea* _tmp12_ = NULL;
+	CandidateArea* _tmp13_ = NULL;
+	CandidateArea* _tmp14_ = NULL;
+	CandidateArea* _tmp15_ = NULL;
+	CandidateArea* _tmp16_ = NULL;
+	HSeparator* _tmp17_ = NULL;
+	HSeparator* _tmp18_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = (GtkLabel*) gtk_label_new (NULL);
 	g_object_ref_sink (_tmp0_);
@@ -886,15 +902,15 @@
 	_g_object_unref0 (self->priv->m_candidate_area);
 	self->priv->m_candidate_area = _tmp11_;
 	_tmp12_ = self->priv->m_candidate_area;
-	g_signal_connect_object (_tmp12_, "candidate-clicked", (GCallback) ___lambda8__candidate_area_candidate_clicked, self, 0);
+	g_signal_connect_object (_tmp12_, "candidate-clicked", (GCallback) ___lambda9__candidate_area_candidate_clicked, self, 0);
 	_tmp13_ = self->priv->m_candidate_area;
-	g_signal_connect_object (_tmp13_, "page-up", (GCallback) ___lambda9__candidate_area_page_up, self, 0);
+	g_signal_connect_object (_tmp13_, "page-up", (GCallback) ___lambda10__candidate_area_page_up, self, 0);
 	_tmp14_ = self->priv->m_candidate_area;
-	g_signal_connect_object (_tmp14_, "page-down", (GCallback) ___lambda10__candidate_area_page_down, self, 0);
+	g_signal_connect_object (_tmp14_, "page-down", (GCallback) ___lambda11__candidate_area_page_down, self, 0);
 	_tmp15_ = self->priv->m_candidate_area;
-	g_signal_connect_object (_tmp15_, "cursor-up", (GCallback) ___lambda11__candidate_area_cursor_up, self, 0);
+	g_signal_connect_object (_tmp15_, "cursor-up", (GCallback) ___lambda12__candidate_area_cursor_up, self, 0);
 	_tmp16_ = self->priv->m_candidate_area;
-	g_signal_connect_object (_tmp16_, "cursor-down", (GCallback) ___lambda12__candidate_area_cursor_down, self, 0);
+	g_signal_connect_object (_tmp16_, "cursor-down", (GCallback) ___lambda13__candidate_area_cursor_down, self, 0);
 	_tmp17_ = hseparator_new ();
 	g_object_ref_sink (_tmp17_);
 	_g_object_unref0 (self->priv->m_hseparator);
@@ -906,14 +922,14 @@
 
 
 static void candidate_panel_pack_all_widgets (CandidatePanel* self) {
-	GtkBox* _tmp0_;
-	GtkLabel* _tmp1_;
-	GtkBox* _tmp2_;
-	GtkLabel* _tmp3_;
-	GtkBox* _tmp4_;
-	HSeparator* _tmp5_;
-	GtkBox* _tmp6_;
-	CandidateArea* _tmp7_;
+	GtkBox* _tmp0_ = NULL;
+	GtkLabel* _tmp1_ = NULL;
+	GtkBox* _tmp2_ = NULL;
+	GtkLabel* _tmp3_ = NULL;
+	GtkBox* _tmp4_ = NULL;
+	HSeparator* _tmp5_ = NULL;
+	GtkBox* _tmp6_ = NULL;
+	CandidateArea* _tmp7_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_vbox;
 	_tmp1_ = self->priv->m_preedit_label;
@@ -931,7 +947,7 @@
 
 
 void candidate_panel_show (CandidatePanel* self) {
-	GtkWindow* _tmp0_;
+	GtkWindow* _tmp0_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_toplevel;
 	gtk_widget_show_all ((GtkWidget*) _tmp0_);
@@ -939,7 +955,7 @@
 
 
 void candidate_panel_hide (CandidatePanel* self) {
-	GtkWindow* _tmp0_;
+	GtkWindow* _tmp0_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_toplevel;
 	gtk_widget_hide ((GtkWidget*) _tmp0_);
@@ -947,9 +963,9 @@
 
 
 static void candidate_panel_move (CandidatePanel* self, gint x, gint y) {
-	GtkWindow* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
+	GtkWindow* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_toplevel;
 	_tmp1_ = x;
@@ -959,48 +975,48 @@
 
 
 static void candidate_panel_adjust_window_position (CandidatePanel* self) {
-	GdkRectangle _tmp0_;
-	gint _tmp1_;
-	GdkRectangle _tmp2_;
-	gint _tmp3_;
-	GdkRectangle _tmp4_;
-	gint _tmp5_;
-	GdkRectangle _tmp6_;
-	gint _tmp7_;
+	GdkPoint cursor_right_bottom = {0};
+	GdkRectangle _tmp0_ = {0};
+	gint _tmp1_ = 0;
+	GdkRectangle _tmp2_ = {0};
+	gint _tmp3_ = 0;
+	GdkRectangle _tmp4_ = {0};
+	gint _tmp5_ = 0;
+	GdkRectangle _tmp6_ = {0};
+	gint _tmp7_ = 0;
 	GdkPoint _tmp8_ = {0};
-	GdkPoint cursor_right_bottom;
 	GtkAllocation allocation = {0};
-	GtkWindow* _tmp9_;
+	GtkWindow* _tmp9_ = NULL;
 	GtkAllocation _tmp10_ = {0};
-	GdkPoint _tmp11_;
-	gint _tmp12_;
-	GtkAllocation _tmp13_;
-	gint _tmp14_;
-	GdkPoint _tmp15_;
-	gint _tmp16_;
-	GtkAllocation _tmp17_;
-	gint _tmp18_;
+	GdkPoint window_right_bottom = {0};
+	GdkPoint _tmp11_ = {0};
+	gint _tmp12_ = 0;
+	GtkAllocation _tmp13_ = {0};
+	gint _tmp14_ = 0;
+	GdkPoint _tmp15_ = {0};
+	gint _tmp16_ = 0;
+	GtkAllocation _tmp17_ = {0};
+	gint _tmp18_ = 0;
 	GdkPoint _tmp19_ = {0};
-	GdkPoint window_right_bottom;
+	GdkWindow* root = NULL;
 	GdkWindow* _tmp20_ = NULL;
-	GdkWindow* _tmp21_;
-	GdkWindow* root;
-	GdkWindow* _tmp22_;
+	GdkWindow* _tmp21_ = NULL;
+	gint root_width = 0;
+	GdkWindow* _tmp22_ = NULL;
 	gint _tmp23_ = 0;
-	gint root_width;
-	GdkWindow* _tmp24_;
+	gint root_height = 0;
+	GdkWindow* _tmp24_ = NULL;
 	gint _tmp25_ = 0;
-	gint root_height;
 	gint x = 0;
 	gint y = 0;
-	GdkPoint _tmp26_;
-	gint _tmp27_;
-	gint _tmp28_;
-	GdkPoint _tmp34_;
-	gint _tmp35_;
-	gint _tmp36_;
-	gint _tmp43_;
-	gint _tmp44_;
+	GdkPoint _tmp26_ = {0};
+	gint _tmp27_ = 0;
+	gint _tmp28_ = 0;
+	GdkPoint _tmp34_ = {0};
+	gint _tmp35_ = 0;
+	gint _tmp36_ = 0;
+	gint _tmp43_ = 0;
+	gint _tmp44_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_cursor_location;
 	_tmp1_ = _tmp0_.x;
@@ -1040,16 +1056,16 @@
 	_tmp27_ = _tmp26_.x;
 	_tmp28_ = root_width;
 	if (_tmp27_ > _tmp28_) {
-		gint _tmp29_;
-		GtkAllocation _tmp30_;
-		gint _tmp31_;
+		gint _tmp29_ = 0;
+		GtkAllocation _tmp30_ = {0};
+		gint _tmp31_ = 0;
 		_tmp29_ = root_width;
 		_tmp30_ = allocation;
 		_tmp31_ = _tmp30_.width;
 		x = _tmp29_ - _tmp31_;
 	} else {
-		GdkPoint _tmp32_;
-		gint _tmp33_;
+		GdkPoint _tmp32_ = {0};
+		gint _tmp33_ = 0;
 		_tmp32_ = cursor_right_bottom;
 		_tmp33_ = _tmp32_.x;
 		x = _tmp33_;
@@ -1058,18 +1074,18 @@
 	_tmp35_ = _tmp34_.y;
 	_tmp36_ = root_height;
 	if (_tmp35_ > _tmp36_) {
-		GdkRectangle _tmp37_;
-		gint _tmp38_;
-		GtkAllocation _tmp39_;
-		gint _tmp40_;
+		GdkRectangle _tmp37_ = {0};
+		gint _tmp38_ = 0;
+		GtkAllocation _tmp39_ = {0};
+		gint _tmp40_ = 0;
 		_tmp37_ = self->priv->m_cursor_location;
 		_tmp38_ = _tmp37_.y;
 		_tmp39_ = allocation;
 		_tmp40_ = _tmp39_.height;
 		y = _tmp38_ - _tmp40_;
 	} else {
-		GdkPoint _tmp41_;
-		gint _tmp42_;
+		GdkPoint _tmp41_ = {0};
+		gint _tmp42_ = 0;
 		_tmp41_ = cursor_right_bottom;
 		_tmp42_ = _tmp41_.y;
 		y = _tmp42_;
diff -Nru ibus-1.5.4/ui/gtk3/candidatepanel.vala ibus-1.5.5/ui/gtk3/candidatepanel.vala
--- ibus-1.5.4/ui/gtk3/candidatepanel.vala	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/candidatepanel.vala	2014-01-14 12:59:14.000000000 +0900
@@ -55,6 +55,9 @@
             set_vertical(!m_vertical);
             return true;
         });
+        m_toplevel.size_allocate.connect((w, a) => {
+            adjust_window_position();
+        });
 
         Handle handle = new Handle();
         handle.set_visible(true);
@@ -96,7 +99,10 @@
         if (m_cursor_location == location)
             return;
         m_cursor_location = location;
-        adjust_window_position();
+
+        /* Do not call adjust_window_position() here because
+         * m_toplevel is not shown yet and
+         * m_toplevel.get_allocation() returns height = width = 1 */
     }
 
     private void set_labels(IBus.Text[] labels) {
diff -Nru ibus-1.5.4/ui/gtk3/handle.c ibus-1.5.5/ui/gtk3/handle.c
--- ibus-1.5.4/ui/gtk3/handle.c	2013-09-20 12:21:58.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/handle.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,4 +1,4 @@
-/* handle.c generated by valac 0.20.1, the Vala compiler
+/* handle.c generated by valac 0.22.0, the Vala compiler
  * generated from handle.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
@@ -80,7 +80,7 @@
 
 Handle* handle_construct (GType object_type) {
 	Handle * self = NULL;
-	GdkEventMask mask;
+	GdkEventMask mask = 0;
 	self = (Handle*) g_object_new (object_type, NULL);
 	gtk_widget_set_size_request ((GtkWidget*) self, 6, -1);
 	mask = ((GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_BUTTON1_MOTION_MASK;
@@ -110,26 +110,26 @@
 static gboolean handle_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
 	Handle * self;
 	gboolean result = FALSE;
-	GdkEventButton _tmp0_;
-	guint _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
+	GdkEventButton _tmp0_ = {0};
+	guint _tmp1_ = 0U;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
 	GdkRectangle _tmp4_ = {0};
-	GdkRectangle _tmp5_;
+	GdkRectangle _tmp5_ = {0};
 	gint x = 0;
 	gint y = 0;
+	GtkWindow* toplevel = NULL;
 	GtkWidget* _tmp115_ = NULL;
-	GtkWindow* _tmp116_;
-	GtkWindow* toplevel;
-	GtkWindow* _tmp117_;
+	GtkWindow* _tmp116_ = NULL;
+	GtkWindow* _tmp117_ = NULL;
 	gint _tmp118_ = 0;
 	gint _tmp119_ = 0;
-	GdkEventButton _tmp120_;
-	gdouble _tmp121_;
-	gint _tmp122_;
-	GdkEventButton _tmp123_;
-	gdouble _tmp124_;
-	gint _tmp125_;
+	GdkEventButton _tmp120_ = {0};
+	gdouble _tmp121_ = 0.0;
+	gint _tmp122_ = 0;
+	GdkEventButton _tmp123_ = {0};
+	gdouble _tmp124_ = 0.0;
+	gint _tmp125_ = 0;
 	self = (Handle*) base;
 	g_return_val_if_fail (event != NULL, FALSE);
 	_tmp0_ = *event;
@@ -148,27 +148,27 @@
 	self->priv->m_workarea = _tmp4_;
 	_tmp5_ = self->priv->m_workarea;
 	{
-		gboolean _tmp6_;
+		gboolean _tmp6_ = FALSE;
 		_tmp6_ = TRUE;
 		while (TRUE) {
-			gboolean _tmp7_;
+			gboolean _tmp7_ = FALSE;
+			GdkWindow* root = NULL;
 			GdkWindow* _tmp8_ = NULL;
-			GdkWindow* _tmp9_;
-			GdkWindow* root;
+			GdkWindow* _tmp9_ = NULL;
+			GdkAtom property = 0U;
 			GdkAtom _tmp10_ = 0U;
-			GdkAtom property;
+			GdkAtom type = 0U;
 			GdkAtom _tmp11_ = 0U;
-			GdkAtom type;
 			GdkAtom actual_type = 0U;
 			gint format = 0;
 			guchar* data = NULL;
 			gint data_length1 = 0;
 			gint _data_size_ = 0;
 			gboolean _result_ = FALSE;
-			GdkWindow* _tmp12_;
-			GdkAtom _tmp13_;
-			GdkAtom _tmp14_;
-			glong _tmp15_;
+			GdkWindow* _tmp12_ = NULL;
+			GdkAtom _tmp13_ = 0U;
+			GdkAtom _tmp14_ = 0U;
+			glong _tmp15_ = 0L;
 			GdkAtom _tmp16_ = 0U;
 			gint _tmp17_ = 0;
 			guint8* _tmp18_ = NULL;
@@ -177,29 +177,29 @@
 			gboolean _tmp21_ = FALSE;
 			gboolean _tmp22_ = FALSE;
 			gboolean _tmp23_ = FALSE;
-			gboolean _tmp24_;
-			gboolean _tmp27_;
-			gboolean _tmp29_;
-			gboolean _tmp31_;
-			guchar* _tmp32_;
-			gint _tmp32__length1;
-			guchar _tmp33_;
-			guchar* _tmp34_;
-			gint _tmp34__length1;
-			guchar _tmp35_;
-			guchar* _tmp36_;
-			gint _tmp36__length1;
-			guchar _tmp37_;
-			guchar* _tmp38_;
-			gint _tmp38__length1;
-			guchar _tmp39_;
-			gint index;
+			gboolean _tmp24_ = FALSE;
+			gboolean _tmp27_ = FALSE;
+			gboolean _tmp29_ = FALSE;
+			gboolean _tmp31_ = FALSE;
+			gint index = 0;
+			guchar* _tmp32_ = NULL;
+			gint _tmp32__length1 = 0;
+			guchar _tmp33_ = '\0';
+			guchar* _tmp34_ = NULL;
+			gint _tmp34__length1 = 0;
+			guchar _tmp35_ = '\0';
+			guchar* _tmp36_ = NULL;
+			gint _tmp36__length1 = 0;
+			guchar _tmp37_ = '\0';
+			guchar* _tmp38_ = NULL;
+			gint _tmp38__length1 = 0;
+			guchar _tmp39_ = '\0';
 			GdkAtom _tmp40_ = 0U;
 			GdkAtom _tmp41_ = 0U;
-			GdkWindow* _tmp42_;
-			GdkAtom _tmp43_;
-			GdkAtom _tmp44_;
-			glong _tmp45_;
+			GdkWindow* _tmp42_ = NULL;
+			GdkAtom _tmp43_ = 0U;
+			GdkAtom _tmp44_ = 0U;
+			glong _tmp45_ = 0L;
 			GdkAtom _tmp46_ = 0U;
 			gint _tmp47_ = 0;
 			guint8* _tmp48_ = NULL;
@@ -208,79 +208,79 @@
 			gboolean _tmp51_ = FALSE;
 			gboolean _tmp52_ = FALSE;
 			gboolean _tmp53_ = FALSE;
-			gboolean _tmp54_;
-			gboolean _tmp57_;
-			gboolean _tmp59_;
-			gboolean _tmp62_;
-			gint _tmp63_;
-			gint i;
-			guchar* _tmp64_;
-			gint _tmp64__length1;
-			gint _tmp65_;
-			guchar _tmp66_;
-			guchar* _tmp67_;
-			gint _tmp67__length1;
-			gint _tmp68_;
-			guchar _tmp69_;
-			guchar* _tmp70_;
-			gint _tmp70__length1;
-			gint _tmp71_;
-			guchar _tmp72_;
-			guchar* _tmp73_;
-			gint _tmp73__length1;
-			gint _tmp74_;
-			guchar _tmp75_;
-			gint _tmp76_;
-			guchar* _tmp77_;
-			gint _tmp77__length1;
-			gint _tmp78_;
-			guchar _tmp79_;
-			guchar* _tmp80_;
-			gint _tmp80__length1;
-			gint _tmp81_;
-			guchar _tmp82_;
-			guchar* _tmp83_;
-			gint _tmp83__length1;
-			gint _tmp84_;
-			guchar _tmp85_;
-			guchar* _tmp86_;
-			gint _tmp86__length1;
-			gint _tmp87_;
-			guchar _tmp88_;
-			gint _tmp89_;
-			guchar* _tmp90_;
-			gint _tmp90__length1;
-			gint _tmp91_;
-			guchar _tmp92_;
-			guchar* _tmp93_;
-			gint _tmp93__length1;
-			gint _tmp94_;
-			guchar _tmp95_;
-			guchar* _tmp96_;
-			gint _tmp96__length1;
-			gint _tmp97_;
-			guchar _tmp98_;
-			guchar* _tmp99_;
-			gint _tmp99__length1;
-			gint _tmp100_;
-			guchar _tmp101_;
-			gint _tmp102_;
-			guchar* _tmp103_;
-			gint _tmp103__length1;
-			gint _tmp104_;
-			guchar _tmp105_;
-			guchar* _tmp106_;
-			gint _tmp106__length1;
-			gint _tmp107_;
-			guchar _tmp108_;
-			guchar* _tmp109_;
-			gint _tmp109__length1;
-			gint _tmp110_;
-			guchar _tmp111_;
-			guchar* _tmp112_;
-			gint _tmp112__length1;
-			gint _tmp113_;
-			guchar _tmp114_;
+			gboolean _tmp54_ = FALSE;
+			gboolean _tmp57_ = FALSE;
+			gboolean _tmp59_ = FALSE;
+			gboolean _tmp62_ = FALSE;
+			gint i = 0;
+			gint _tmp63_ = 0;
+			guchar* _tmp64_ = NULL;
+			gint _tmp64__length1 = 0;
+			gint _tmp65_ = 0;
+			guchar _tmp66_ = '\0';
+			guchar* _tmp67_ = NULL;
+			gint _tmp67__length1 = 0;
+			gint _tmp68_ = 0;
+			guchar _tmp69_ = '\0';
+			guchar* _tmp70_ = NULL;
+			gint _tmp70__length1 = 0;
+			gint _tmp71_ = 0;
+			guchar _tmp72_ = '\0';
+			guchar* _tmp73_ = NULL;
+			gint _tmp73__length1 = 0;
+			gint _tmp74_ = 0;
+			guchar _tmp75_ = '\0';
+			gint _tmp76_ = 0;
+			guchar* _tmp77_ = NULL;
+			gint _tmp77__length1 = 0;
+			gint _tmp78_ = 0;
+			guchar _tmp79_ = '\0';
+			guchar* _tmp80_ = NULL;
+			gint _tmp80__length1 = 0;
+			gint _tmp81_ = 0;
+			guchar _tmp82_ = '\0';
+			guchar* _tmp83_ = NULL;
+			gint _tmp83__length1 = 0;
+			gint _tmp84_ = 0;
+			guchar _tmp85_ = '\0';
+			guchar* _tmp86_ = NULL;
+			gint _tmp86__length1 = 0;
+			gint _tmp87_ = 0;
+			guchar _tmp88_ = '\0';
+			gint _tmp89_ = 0;
+			guchar* _tmp90_ = NULL;
+			gint _tmp90__length1 = 0;
+			gint _tmp91_ = 0;
+			guchar _tmp92_ = '\0';
+			guchar* _tmp93_ = NULL;
+			gint _tmp93__length1 = 0;
+			gint _tmp94_ = 0;
+			guchar _tmp95_ = '\0';
+			guchar* _tmp96_ = NULL;
+			gint _tmp96__length1 = 0;
+			gint _tmp97_ = 0;
+			guchar _tmp98_ = '\0';
+			guchar* _tmp99_ = NULL;
+			gint _tmp99__length1 = 0;
+			gint _tmp100_ = 0;
+			guchar _tmp101_ = '\0';
+			gint _tmp102_ = 0;
+			guchar* _tmp103_ = NULL;
+			gint _tmp103__length1 = 0;
+			gint _tmp104_ = 0;
+			guchar _tmp105_ = '\0';
+			guchar* _tmp106_ = NULL;
+			gint _tmp106__length1 = 0;
+			gint _tmp107_ = 0;
+			guchar _tmp108_ = '\0';
+			guchar* _tmp109_ = NULL;
+			gint _tmp109__length1 = 0;
+			gint _tmp110_ = 0;
+			guchar _tmp111_ = '\0';
+			guchar* _tmp112_ = NULL;
+			gint _tmp112__length1 = 0;
+			gint _tmp113_ = 0;
+			guchar _tmp114_ = '\0';
 			_tmp7_ = _tmp6_;
 			if (!_tmp7_) {
 				if (!FALSE) {
@@ -311,8 +311,8 @@
 			if (!_tmp24_) {
 				_tmp23_ = TRUE;
 			} else {
-				GdkAtom _tmp25_;
-				GdkAtom _tmp26_;
+				GdkAtom _tmp25_ = 0U;
+				GdkAtom _tmp26_ = 0U;
 				_tmp25_ = actual_type;
 				_tmp26_ = type;
 				_tmp23_ = _tmp25_ != _tmp26_;
@@ -321,7 +321,7 @@
 			if (_tmp27_) {
 				_tmp22_ = TRUE;
 			} else {
-				gint _tmp28_;
+				gint _tmp28_ = 0;
 				_tmp28_ = format;
 				_tmp22_ = _tmp28_ != 32;
 			}
@@ -329,8 +329,8 @@
 			if (_tmp29_) {
 				_tmp21_ = TRUE;
 			} else {
-				guchar* _tmp30_;
-				gint _tmp30__length1;
+				guchar* _tmp30_ = NULL;
+				gint _tmp30__length1 = 0;
 				_tmp30_ = data;
 				_tmp30__length1 = data_length1;
 				_tmp21_ = _tmp30__length1 != 4;
@@ -374,8 +374,8 @@
 			if (!_tmp54_) {
 				_tmp53_ = TRUE;
 			} else {
-				GdkAtom _tmp55_;
-				GdkAtom _tmp56_;
+				GdkAtom _tmp55_ = 0U;
+				GdkAtom _tmp56_ = 0U;
 				_tmp55_ = actual_type;
 				_tmp56_ = type;
 				_tmp53_ = _tmp55_ != _tmp56_;
@@ -384,7 +384,7 @@
 			if (_tmp57_) {
 				_tmp52_ = TRUE;
 			} else {
-				gint _tmp58_;
+				gint _tmp58_ = 0;
 				_tmp58_ = format;
 				_tmp52_ = _tmp58_ != 32;
 			}
@@ -392,9 +392,9 @@
 			if (_tmp59_) {
 				_tmp51_ = TRUE;
 			} else {
-				guchar* _tmp60_;
-				gint _tmp60__length1;
-				gint _tmp61_;
+				guchar* _tmp60_ = NULL;
+				gint _tmp60__length1 = 0;
+				gint _tmp61_ = 0;
 				_tmp60_ = data;
 				_tmp60__length1 = data_length1;
 				_tmp61_ = index;
@@ -512,11 +512,11 @@
 static gboolean handle_real_button_release_event (GtkWidget* base, GdkEventButton* event) {
 	Handle * self;
 	gboolean result = FALSE;
-	GdkEventButton _tmp0_;
-	guint _tmp1_;
+	GdkEventButton _tmp0_ = {0};
+	guint _tmp1_ = 0U;
 	GdkWindow* _tmp2_ = NULL;
-	GdkCursor* _tmp3_;
-	GdkCursor* _tmp4_;
+	GdkCursor* _tmp3_ = NULL;
+	GdkCursor* _tmp4_ = NULL;
 	self = (Handle*) base;
 	g_return_val_if_fail (event != NULL, FALSE);
 	_tmp0_ = *event;
@@ -542,54 +542,54 @@
 static gboolean handle_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event) {
 	Handle * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_;
+	gboolean _tmp0_ = FALSE;
+	GtkWindow* toplevel = NULL;
 	GtkWidget* _tmp1_ = NULL;
-	GtkWindow* _tmp2_;
-	GtkWindow* toplevel;
-	GdkEventMotion _tmp3_;
-	gdouble _tmp4_;
-	GdkPoint _tmp5_;
-	gint _tmp6_;
-	gint x;
-	GdkEventMotion _tmp7_;
-	gdouble _tmp8_;
-	GdkPoint _tmp9_;
-	gint _tmp10_;
-	gint y;
+	GtkWindow* _tmp2_ = NULL;
+	gint x = 0;
+	GdkEventMotion _tmp3_ = {0};
+	gdouble _tmp4_ = 0.0;
+	GdkPoint _tmp5_ = {0};
+	gint _tmp6_ = 0;
+	gint y = 0;
+	GdkEventMotion _tmp7_ = {0};
+	gdouble _tmp8_ = 0.0;
+	GdkPoint _tmp9_ = {0};
+	gint _tmp10_ = 0;
 	gboolean _tmp11_ = FALSE;
-	gint _tmp12_;
-	GdkRectangle _tmp13_;
-	gint _tmp14_;
-	gboolean _tmp18_;
+	gint _tmp12_ = 0;
+	GdkRectangle _tmp13_ = {0};
+	gint _tmp14_ = 0;
+	gboolean _tmp18_ = FALSE;
 	gboolean _tmp21_ = FALSE;
-	gint _tmp22_;
-	GdkRectangle _tmp23_;
-	gint _tmp24_;
-	gboolean _tmp28_;
+	gint _tmp22_ = 0;
+	GdkRectangle _tmp23_ = {0};
+	gint _tmp24_ = 0;
+	gboolean _tmp28_ = FALSE;
 	gint w = 0;
 	gint h = 0;
-	GtkWindow* _tmp31_;
+	GtkWindow* _tmp31_ = NULL;
 	gint _tmp32_ = 0;
 	gint _tmp33_ = 0;
 	gboolean _tmp34_ = FALSE;
-	gint _tmp35_;
-	gint _tmp36_;
-	GdkRectangle _tmp37_;
-	gint _tmp38_;
-	GdkRectangle _tmp39_;
-	gint _tmp40_;
-	gboolean _tmp47_;
+	gint _tmp35_ = 0;
+	gint _tmp36_ = 0;
+	GdkRectangle _tmp37_ = {0};
+	gint _tmp38_ = 0;
+	GdkRectangle _tmp39_ = {0};
+	gint _tmp40_ = 0;
+	gboolean _tmp47_ = FALSE;
 	gboolean _tmp53_ = FALSE;
-	gint _tmp54_;
-	gint _tmp55_;
-	GdkRectangle _tmp56_;
-	gint _tmp57_;
-	GdkRectangle _tmp58_;
-	gint _tmp59_;
-	gboolean _tmp66_;
-	GtkWindow* _tmp72_;
-	gint _tmp73_;
-	gint _tmp74_;
+	gint _tmp54_ = 0;
+	gint _tmp55_ = 0;
+	GdkRectangle _tmp56_ = {0};
+	gint _tmp57_ = 0;
+	GdkRectangle _tmp58_ = {0};
+	gint _tmp59_ = 0;
+	gboolean _tmp66_ = FALSE;
+	GtkWindow* _tmp72_ = NULL;
+	gint _tmp73_ = 0;
+	gint _tmp74_ = 0;
 	self = (Handle*) base;
 	g_return_val_if_fail (event != NULL, FALSE);
 	_tmp0_ = self->priv->m_move_begined;
@@ -614,9 +614,9 @@
 	_tmp13_ = self->priv->m_workarea;
 	_tmp14_ = _tmp13_.x;
 	if (_tmp12_ < _tmp14_) {
-		gint _tmp15_;
-		GdkRectangle _tmp16_;
-		gint _tmp17_;
+		gint _tmp15_ = 0;
+		GdkRectangle _tmp16_ = {0};
+		gint _tmp17_ = 0;
 		_tmp15_ = x;
 		_tmp16_ = self->priv->m_workarea;
 		_tmp17_ = _tmp16_.x;
@@ -626,8 +626,8 @@
 	}
 	_tmp18_ = _tmp11_;
 	if (_tmp18_) {
-		GdkRectangle _tmp19_;
-		gint _tmp20_;
+		GdkRectangle _tmp19_ = {0};
+		gint _tmp20_ = 0;
 		_tmp19_ = self->priv->m_workarea;
 		_tmp20_ = _tmp19_.x;
 		x = _tmp20_;
@@ -636,9 +636,9 @@
 	_tmp23_ = self->priv->m_workarea;
 	_tmp24_ = _tmp23_.y;
 	if (_tmp22_ < _tmp24_) {
-		gint _tmp25_;
-		GdkRectangle _tmp26_;
-		gint _tmp27_;
+		gint _tmp25_ = 0;
+		GdkRectangle _tmp26_ = {0};
+		gint _tmp27_ = 0;
 		_tmp25_ = y;
 		_tmp26_ = self->priv->m_workarea;
 		_tmp27_ = _tmp26_.y;
@@ -648,8 +648,8 @@
 	}
 	_tmp28_ = _tmp21_;
 	if (_tmp28_) {
-		GdkRectangle _tmp29_;
-		gint _tmp30_;
+		GdkRectangle _tmp29_ = {0};
+		gint _tmp30_ = 0;
 		_tmp29_ = self->priv->m_workarea;
 		_tmp30_ = _tmp29_.y;
 		y = _tmp30_;
@@ -665,12 +665,12 @@
 	_tmp39_ = self->priv->m_workarea;
 	_tmp40_ = _tmp39_.width;
 	if ((_tmp35_ + _tmp36_) > (_tmp38_ + _tmp40_)) {
-		gint _tmp41_;
-		gint _tmp42_;
-		GdkRectangle _tmp43_;
-		gint _tmp44_;
-		GdkRectangle _tmp45_;
-		gint _tmp46_;
+		gint _tmp41_ = 0;
+		gint _tmp42_ = 0;
+		GdkRectangle _tmp43_ = {0};
+		gint _tmp44_ = 0;
+		GdkRectangle _tmp45_ = {0};
+		gint _tmp46_ = 0;
 		_tmp41_ = x;
 		_tmp42_ = w;
 		_tmp43_ = self->priv->m_workarea;
@@ -683,11 +683,11 @@
 	}
 	_tmp47_ = _tmp34_;
 	if (_tmp47_) {
-		GdkRectangle _tmp48_;
-		gint _tmp49_;
-		GdkRectangle _tmp50_;
-		gint _tmp51_;
-		gint _tmp52_;
+		GdkRectangle _tmp48_ = {0};
+		gint _tmp49_ = 0;
+		GdkRectangle _tmp50_ = {0};
+		gint _tmp51_ = 0;
+		gint _tmp52_ = 0;
 		_tmp48_ = self->priv->m_workarea;
 		_tmp49_ = _tmp48_.x;
 		_tmp50_ = self->priv->m_workarea;
@@ -702,12 +702,12 @@
 	_tmp58_ = self->priv->m_workarea;
 	_tmp59_ = _tmp58_.height;
 	if ((_tmp54_ + _tmp55_) > (_tmp57_ + _tmp59_)) {
-		gint _tmp60_;
-		gint _tmp61_;
-		GdkRectangle _tmp62_;
-		gint _tmp63_;
-		GdkRectangle _tmp64_;
-		gint _tmp65_;
+		gint _tmp60_ = 0;
+		gint _tmp61_ = 0;
+		GdkRectangle _tmp62_ = {0};
+		gint _tmp63_ = 0;
+		GdkRectangle _tmp64_ = {0};
+		gint _tmp65_ = 0;
 		_tmp60_ = y;
 		_tmp61_ = h;
 		_tmp62_ = self->priv->m_workarea;
@@ -720,11 +720,11 @@
 	}
 	_tmp66_ = _tmp53_;
 	if (_tmp66_) {
-		GdkRectangle _tmp67_;
-		gint _tmp68_;
-		GdkRectangle _tmp69_;
-		gint _tmp70_;
-		gint _tmp71_;
+		GdkRectangle _tmp67_ = {0};
+		gint _tmp68_ = 0;
+		GdkRectangle _tmp69_ = {0};
+		gint _tmp70_ = 0;
+		gint _tmp71_ = 0;
 		_tmp67_ = self->priv->m_workarea;
 		_tmp68_ = _tmp67_.y;
 		_tmp69_ = self->priv->m_workarea;
@@ -745,7 +745,7 @@
 static gboolean handle_real_draw (GtkWidget* base, cairo_t* cr) {
 	Handle * self;
 	gboolean result = FALSE;
-	cairo_t* _tmp0_;
+	cairo_t* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	self = (Handle*) base;
@@ -754,21 +754,21 @@
 	_tmp1_ = gtk_widget_get_window ((GtkWidget*) self);
 	_tmp2_ = gtk_cairo_should_draw_window (_tmp0_, _tmp1_);
 	if (_tmp2_) {
+		GtkStyleContext* context = NULL;
 		GtkStyleContext* _tmp3_ = NULL;
-		GtkStyleContext* _tmp4_;
-		GtkStyleContext* context;
+		GtkStyleContext* _tmp4_ = NULL;
 		GtkAllocation allocation = {0};
 		GtkAllocation _tmp5_ = {0};
-		GtkStyleContext* _tmp6_;
-		cairo_t* _tmp7_;
-		GtkAllocation _tmp8_;
-		gint _tmp9_;
-		GtkAllocation _tmp10_;
-		gint _tmp11_;
-		GtkAllocation _tmp12_;
-		gint _tmp13_;
-		GtkAllocation _tmp14_;
-		gint _tmp15_;
+		GtkStyleContext* _tmp6_ = NULL;
+		cairo_t* _tmp7_ = NULL;
+		GtkAllocation _tmp8_ = {0};
+		gint _tmp9_ = 0;
+		GtkAllocation _tmp10_ = {0};
+		gint _tmp11_ = 0;
+		GtkAllocation _tmp12_ = {0};
+		gint _tmp13_ = 0;
+		GtkAllocation _tmp14_ = {0};
+		gint _tmp15_ = 0;
 		_tmp3_ = gtk_widget_get_style_context ((GtkWidget*) self);
 		_tmp4_ = _g_object_ref0 (_tmp3_);
 		context = _tmp4_;
diff -Nru ibus-1.5.4/ui/gtk3/iconwidget.c ibus-1.5.5/ui/gtk3/iconwidget.c
--- ibus-1.5.4/ui/gtk3/iconwidget.c	2013-09-20 12:21:58.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/iconwidget.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,4 +1,4 @@
-/* iconwidget.c generated by valac 0.20.1, the Vala compiler
+/* iconwidget.c generated by valac 0.22.0, the Vala compiler
  * generated from iconwidget.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
@@ -76,8 +76,8 @@
      */
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_;
-	gchar _tmp1_;
+	glong _tmp0_ = 0L;
+	gchar _tmp1_ = '\0';
 	g_return_val_if_fail (self != NULL, '\0');
 	_tmp0_ = index;
 	_tmp1_ = ((gchar*) self)[_tmp0_];
@@ -93,34 +93,34 @@
 
 IconWidget* icon_widget_construct (GType object_type, const gchar* icon_name_or_path, GtkIconSize size) {
 	IconWidget * self = NULL;
-	GdkPixbuf* pixbuf;
+	GdkPixbuf* pixbuf = NULL;
 	gint fixed_width = 0;
 	gint fixed_height = 0;
-	GtkIconSize _tmp0_;
+	GtkIconSize _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-	GdkPixbuf* _tmp22_;
-	GdkPixbuf* _tmp23_;
+	GdkPixbuf* _tmp22_ = NULL;
+	gfloat width = 0.0F;
+	GdkPixbuf* _tmp23_ = NULL;
 	gint _tmp24_ = 0;
-	gfloat width;
-	GdkPixbuf* _tmp25_;
+	gfloat height = 0.0F;
+	GdkPixbuf* _tmp25_ = NULL;
 	gint _tmp26_ = 0;
-	gfloat height;
 	gfloat _tmp27_ = 0.0F;
-	gfloat _tmp28_;
-	gfloat _tmp29_;
-	gint _tmp32_;
-	gfloat _tmp33_;
-	gfloat scale;
-	gfloat _tmp34_;
-	gfloat _tmp35_;
-	gfloat _tmp36_;
-	gfloat _tmp37_;
-	GdkPixbuf* _tmp38_;
-	gfloat _tmp39_;
-	gfloat _tmp40_;
+	gfloat _tmp28_ = 0.0F;
+	gfloat _tmp29_ = 0.0F;
+	gfloat scale = 0.0F;
+	gint _tmp32_ = 0;
+	gfloat _tmp33_ = 0.0F;
+	gfloat _tmp34_ = 0.0F;
+	gfloat _tmp35_ = 0.0F;
+	gfloat _tmp36_ = 0.0F;
+	gfloat _tmp37_ = 0.0F;
+	GdkPixbuf* _tmp38_ = NULL;
+	gfloat _tmp39_ = 0.0F;
+	gfloat _tmp40_ = 0.0F;
 	GdkPixbuf* _tmp41_ = NULL;
-	GdkPixbuf* _tmp42_;
+	GdkPixbuf* _tmp42_ = NULL;
 	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (icon_name_or_path != NULL, NULL);
 	self = (IconWidget*) g_object_new (object_type, NULL);
@@ -130,45 +130,45 @@
 	fixed_width = _tmp1_;
 	fixed_height = _tmp2_;
 	{
-		const gchar* _tmp3_;
+		const gchar* _tmp3_ = NULL;
 		gchar _tmp4_ = '\0';
 		_tmp3_ = icon_name_or_path;
 		_tmp4_ = string_get (_tmp3_, (glong) 0);
 		if (_tmp4_ == '/') {
-			const gchar* _tmp5_;
-			GdkPixbuf* _tmp6_;
-			GdkPixbuf* _tmp7_;
-			_tmp5_ = icon_name_or_path;
-			_tmp6_ = gdk_pixbuf_new_from_file (_tmp5_, &_inner_error_);
-			_tmp7_ = _tmp6_;
+			GdkPixbuf* _tmp5_ = NULL;
+			const gchar* _tmp6_ = NULL;
+			GdkPixbuf* _tmp7_ = NULL;
+			_tmp6_ = icon_name_or_path;
+			_tmp7_ = gdk_pixbuf_new_from_file (_tmp6_, &_inner_error_);
+			_tmp5_ = _tmp7_;
 			if (_inner_error_ != NULL) {
 				goto __catch0_g_error;
 			}
 			_g_object_unref0 (pixbuf);
-			pixbuf = _tmp7_;
+			pixbuf = _tmp5_;
 		} else {
+			GtkIconTheme* theme = NULL;
 			GtkIconTheme* _tmp8_ = NULL;
-			GtkIconTheme* _tmp9_;
-			GtkIconTheme* theme;
-			GtkIconTheme* _tmp10_;
-			const gchar* _tmp11_;
-			gint _tmp12_;
-			GdkPixbuf* _tmp13_ = NULL;
-			GdkPixbuf* _tmp14_;
+			GtkIconTheme* _tmp9_ = NULL;
+			GdkPixbuf* _tmp10_ = NULL;
+			GtkIconTheme* _tmp11_ = NULL;
+			const gchar* _tmp12_ = NULL;
+			gint _tmp13_ = 0;
+			GdkPixbuf* _tmp14_ = NULL;
 			_tmp8_ = gtk_icon_theme_get_default ();
 			_tmp9_ = _g_object_ref0 (_tmp8_);
 			theme = _tmp9_;
-			_tmp10_ = theme;
-			_tmp11_ = icon_name_or_path;
-			_tmp12_ = fixed_width;
-			_tmp13_ = gtk_icon_theme_load_icon (_tmp10_, _tmp11_, _tmp12_, 0, &_inner_error_);
-			_tmp14_ = _tmp13_;
+			_tmp11_ = theme;
+			_tmp12_ = icon_name_or_path;
+			_tmp13_ = fixed_width;
+			_tmp14_ = gtk_icon_theme_load_icon (_tmp11_, _tmp12_, _tmp13_, 0, &_inner_error_);
+			_tmp10_ = _tmp14_;
 			if (_inner_error_ != NULL) {
 				_g_object_unref0 (theme);
 				goto __catch0_g_error;
 			}
 			_g_object_unref0 (pixbuf);
-			pixbuf = _tmp14_;
+			pixbuf = _tmp10_;
 			_g_object_unref0 (theme);
 		}
 	}
@@ -179,33 +179,33 @@
 		e = _inner_error_;
 		_inner_error_ = NULL;
 		{
+			GtkIconTheme* theme = NULL;
 			GtkIconTheme* _tmp15_ = NULL;
-			GtkIconTheme* _tmp16_;
-			GtkIconTheme* theme;
-			GtkIconTheme* _tmp17_;
-			gint _tmp18_;
-			GdkPixbuf* _tmp19_ = NULL;
-			GdkPixbuf* _tmp20_;
+			GtkIconTheme* _tmp16_ = NULL;
+			GdkPixbuf* _tmp17_ = NULL;
+			GtkIconTheme* _tmp18_ = NULL;
+			gint _tmp19_ = 0;
+			GdkPixbuf* _tmp20_ = NULL;
 			_tmp15_ = gtk_icon_theme_get_default ();
 			_tmp16_ = _g_object_ref0 (_tmp15_);
 			theme = _tmp16_;
-			_tmp17_ = theme;
-			_tmp18_ = fixed_width;
-			_tmp19_ = gtk_icon_theme_load_icon (_tmp17_, "ibus-engine", _tmp18_, 0, &_inner_error_);
-			_tmp20_ = _tmp19_;
+			_tmp18_ = theme;
+			_tmp19_ = fixed_width;
+			_tmp20_ = gtk_icon_theme_load_icon (_tmp18_, "ibus-engine", _tmp19_, 0, &_inner_error_);
+			_tmp17_ = _tmp20_;
 			if (_inner_error_ != NULL) {
 				_g_object_unref0 (theme);
 				goto __catch1_g_error;
 			}
 			_g_object_unref0 (pixbuf);
-			pixbuf = _tmp20_;
+			pixbuf = _tmp17_;
 			_g_object_unref0 (theme);
 		}
 		goto __finally1;
 		__catch1_g_error:
 		{
 			GError* e = NULL;
-			GtkIconSize _tmp21_;
+			GtkIconSize _tmp21_ = 0;
 			e = _inner_error_;
 			_inner_error_ = NULL;
 			_tmp21_ = size;
@@ -247,11 +247,11 @@
 	_tmp28_ = width;
 	_tmp29_ = height;
 	if (_tmp28_ > _tmp29_) {
-		gfloat _tmp30_;
+		gfloat _tmp30_ = 0.0F;
 		_tmp30_ = width;
 		_tmp27_ = _tmp30_;
 	} else {
-		gfloat _tmp31_;
+		gfloat _tmp31_ = 0.0F;
 		_tmp31_ = height;
 		_tmp27_ = _tmp31_;
 	}
diff -Nru ibus-1.5.4/ui/gtk3/keybindingmanager.c ibus-1.5.5/ui/gtk3/keybindingmanager.c
--- ibus-1.5.4/ui/gtk3/keybindingmanager.c	2013-09-20 12:21:58.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/keybindingmanager.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,4 +1,4 @@
-/* keybindingmanager.c generated by valac 0.20.1, the Vala compiler
+/* keybindingmanager.c generated by valac 0.22.0, the Vala compiler
  * generated from keybindingmanager.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
@@ -8,11 +8,11 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -179,24 +179,24 @@
 
 gboolean keybinding_manager_bind (KeybindingManager* self, guint keysym, GdkModifierType modifiers, KeybindingManagerKeybindingHandlerFunc handler, void* handler_target) {
 	gboolean result = FALSE;
+	Display* display = NULL;
 	Display* _tmp0_ = NULL;
-	Display* display;
-	Display* _tmp1_;
-	guint _tmp2_;
+	gint keycode = 0;
+	Display* _tmp1_ = NULL;
+	guint _tmp2_ = 0U;
 	guchar _tmp3_ = '\0';
-	gint keycode;
-	gint _tmp4_;
+	gint _tmp4_ = 0;
 	GdkDisplay* _tmp5_ = NULL;
-	guint _tmp6_;
-	GdkModifierType _tmp7_;
-	guint _tmp8_;
-	GdkModifierType _tmp9_;
-	KeybindingManagerKeybindingHandlerFunc _tmp10_;
-	void* _tmp10__target;
-	KeybindingManagerKeybinding* _tmp11_;
-	KeybindingManagerKeybinding* binding;
-	KeybindingManagerKeybinding* _tmp12_;
-	KeybindingManagerKeybinding* _tmp13_;
+	guint _tmp6_ = 0U;
+	GdkModifierType _tmp7_ = 0;
+	KeybindingManagerKeybinding* binding = NULL;
+	guint _tmp8_ = 0U;
+	GdkModifierType _tmp9_ = 0;
+	KeybindingManagerKeybindingHandlerFunc _tmp10_ = NULL;
+	void* _tmp10__target = NULL;
+	KeybindingManagerKeybinding* _tmp11_ = NULL;
+	KeybindingManagerKeybinding* _tmp12_ = NULL;
+	KeybindingManagerKeybinding* _tmp13_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
 	_tmp0_ = gdk_x11_get_default_xdisplay ();
 	display = _tmp0_;
@@ -235,9 +235,9 @@
      * @param modifiers
      */
 void keybinding_manager_unbind (KeybindingManager* self, guint keysym, GdkModifierType modifiers) {
-	GList* remove_bindings;
-	GList* _tmp0_;
-	GList* _tmp21_;
+	GList* remove_bindings = NULL;
+	GList* _tmp0_ = NULL;
+	GList* _tmp21_ = NULL;
 	g_return_if_fail (self != NULL);
 	remove_bindings = NULL;
 	_tmp0_ = self->priv->m_bindings;
@@ -246,26 +246,26 @@
 		GList* binding_it = NULL;
 		binding_collection = _tmp0_;
 		for (binding_it = binding_collection; binding_it != NULL; binding_it = binding_it->next) {
-			KeybindingManagerKeybinding* _tmp1_;
+			KeybindingManagerKeybinding* _tmp1_ = NULL;
 			KeybindingManagerKeybinding* binding = NULL;
 			_tmp1_ = _keybinding_manager_keybinding_ref0 ((KeybindingManagerKeybinding*) binding_it->data);
 			binding = _tmp1_;
 			{
 				gboolean _tmp2_ = FALSE;
-				KeybindingManagerKeybinding* _tmp3_;
-				guint _tmp4_;
-				guint _tmp5_;
-				guint _tmp6_;
-				gboolean _tmp11_;
+				KeybindingManagerKeybinding* _tmp3_ = NULL;
+				guint _tmp4_ = 0U;
+				guint _tmp5_ = 0U;
+				guint _tmp6_ = 0U;
+				gboolean _tmp11_ = FALSE;
 				_tmp3_ = binding;
 				_tmp4_ = keybinding_manager_keybinding_get_keysym (_tmp3_);
 				_tmp5_ = _tmp4_;
 				_tmp6_ = keysym;
 				if (_tmp5_ == _tmp6_) {
-					KeybindingManagerKeybinding* _tmp7_;
-					GdkModifierType _tmp8_;
-					GdkModifierType _tmp9_;
-					GdkModifierType _tmp10_;
+					KeybindingManagerKeybinding* _tmp7_ = NULL;
+					GdkModifierType _tmp8_ = 0;
+					GdkModifierType _tmp9_ = 0;
+					GdkModifierType _tmp10_ = 0;
 					_tmp7_ = binding;
 					_tmp8_ = keybinding_manager_keybinding_get_modifiers (_tmp7_);
 					_tmp9_ = _tmp8_;
@@ -277,14 +277,14 @@
 				_tmp11_ = _tmp2_;
 				if (_tmp11_) {
 					GdkDisplay* _tmp12_ = NULL;
-					KeybindingManagerKeybinding* _tmp13_;
-					guint _tmp14_;
-					guint _tmp15_;
-					KeybindingManagerKeybinding* _tmp16_;
-					GdkModifierType _tmp17_;
-					GdkModifierType _tmp18_;
-					KeybindingManagerKeybinding* _tmp19_;
-					KeybindingManagerKeybinding* _tmp20_;
+					KeybindingManagerKeybinding* _tmp13_ = NULL;
+					guint _tmp14_ = 0U;
+					guint _tmp15_ = 0U;
+					KeybindingManagerKeybinding* _tmp16_ = NULL;
+					GdkModifierType _tmp17_ = 0;
+					GdkModifierType _tmp18_ = 0;
+					KeybindingManagerKeybinding* _tmp19_ = NULL;
+					KeybindingManagerKeybinding* _tmp20_ = NULL;
 					_tmp12_ = gdk_display_get_default ();
 					_tmp13_ = binding;
 					_tmp14_ = keybinding_manager_keybinding_get_keysym (_tmp13_);
@@ -307,12 +307,12 @@
 		GList* binding_it = NULL;
 		binding_collection = _tmp21_;
 		for (binding_it = binding_collection; binding_it != NULL; binding_it = binding_it->next) {
-			KeybindingManagerKeybinding* _tmp22_;
+			KeybindingManagerKeybinding* _tmp22_ = NULL;
 			KeybindingManagerKeybinding* binding = NULL;
 			_tmp22_ = _keybinding_manager_keybinding_ref0 ((KeybindingManagerKeybinding*) binding_it->data);
 			binding = _tmp22_;
 			{
-				KeybindingManagerKeybinding* _tmp23_;
+				KeybindingManagerKeybinding* _tmp23_ = NULL;
 				_tmp23_ = binding;
 				self->priv->m_bindings = g_list_remove (self->priv->m_bindings, _tmp23_);
 				_keybinding_manager_keybinding_unref0 (binding);
@@ -330,12 +330,12 @@
 
 KeybindingManager* keybinding_manager_get_instance (void) {
 	KeybindingManager* result = NULL;
-	KeybindingManager* _tmp0_;
-	KeybindingManager* _tmp2_;
-	KeybindingManager* _tmp3_;
+	KeybindingManager* _tmp0_ = NULL;
+	KeybindingManager* _tmp2_ = NULL;
+	KeybindingManager* _tmp3_ = NULL;
 	_tmp0_ = keybinding_manager_m_instance;
 	if (_tmp0_ == NULL) {
-		KeybindingManager* _tmp1_;
+		KeybindingManager* _tmp1_ = NULL;
 		_tmp1_ = keybinding_manager_new ();
 		_g_object_unref0 (keybinding_manager_m_instance);
 		keybinding_manager_m_instance = _tmp1_;
@@ -351,23 +351,23 @@
 	GdkModifierType result = 0;
 	static const GdkModifierType masks[] = {GDK_MOD5_MASK, GDK_MOD4_MASK, GDK_MOD3_MASK, GDK_MOD2_MASK, GDK_MOD1_MASK, GDK_CONTROL_MASK, GDK_SHIFT_MASK, GDK_LOCK_MASK};
 	{
-		gint i;
+		gint i = 0;
 		i = 0;
 		{
-			gboolean _tmp0_;
+			gboolean _tmp0_ = FALSE;
 			_tmp0_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp1_;
-				gint _tmp3_;
-				gint _tmp4_;
-				GdkModifierType _tmp5_;
-				GdkModifierType mask;
-				guint _tmp6_;
-				GdkModifierType _tmp7_;
-				GdkModifierType _tmp8_;
+				gboolean _tmp1_ = FALSE;
+				gint _tmp3_ = 0;
+				GdkModifierType mask = 0;
+				gint _tmp4_ = 0;
+				GdkModifierType _tmp5_ = 0;
+				guint _tmp6_ = 0U;
+				GdkModifierType _tmp7_ = 0;
+				GdkModifierType _tmp8_ = 0;
 				_tmp1_ = _tmp0_;
 				if (!_tmp1_) {
-					gint _tmp2_;
+					gint _tmp2_ = 0;
 					_tmp2_ = i;
 					i = _tmp2_ + 1;
 				}
@@ -396,25 +396,25 @@
 
 gboolean keybinding_manager_primary_modifier_still_pressed (GdkEvent* event, guint primary_modifier) {
 	gboolean result = FALSE;
-	GdkEvent* _tmp0_;
-	GdkEventKey _tmp1_;
-	GdkEventKey keyevent;
-	guint _tmp2_;
-	GdkEvent* _tmp3_;
+	GdkEventKey keyevent = {0};
+	GdkEvent* _tmp0_ = NULL;
+	GdkEventKey _tmp1_ = {0};
+	guint _tmp2_ = 0U;
+	GdkDevice* device = NULL;
+	GdkEvent* _tmp3_ = NULL;
 	GdkDevice* _tmp4_ = NULL;
-	GdkDevice* _tmp5_;
-	GdkDevice* device;
+	GdkDevice* _tmp5_ = NULL;
 	GdkDevice* pointer = NULL;
-	GdkDevice* _tmp6_;
+	GdkDevice* _tmp6_ = NULL;
 	GdkInputSource _tmp7_ = 0;
-	guint modifier;
-	GdkDevice* _tmp13_;
-	GdkEventKey _tmp14_;
-	GdkWindow* _tmp15_;
+	guint modifier = 0U;
+	GdkDevice* _tmp13_ = NULL;
+	GdkEventKey _tmp14_ = {0};
+	GdkWindow* _tmp15_ = NULL;
 	GdkModifierType _tmp16_ = 0;
-	guint _tmp17_;
-	guint _tmp18_;
-	guint _tmp19_;
+	guint _tmp17_ = 0U;
+	guint _tmp18_ = 0U;
+	guint _tmp19_ = 0U;
 	g_return_val_if_fail (event != NULL, FALSE);
 	_tmp0_ = event;
 	_tmp1_ = _tmp0_->key;
@@ -431,17 +431,17 @@
 	_tmp6_ = device;
 	_tmp7_ = gdk_device_get_source (_tmp6_);
 	if (_tmp7_ == GDK_SOURCE_KEYBOARD) {
-		GdkDevice* _tmp8_;
+		GdkDevice* _tmp8_ = NULL;
 		GdkDevice* _tmp9_ = NULL;
-		GdkDevice* _tmp10_;
+		GdkDevice* _tmp10_ = NULL;
 		_tmp8_ = device;
 		_tmp9_ = gdk_device_get_associated_device (_tmp8_);
 		_tmp10_ = _g_object_ref0 (_tmp9_);
 		_g_object_unref0 (pointer);
 		pointer = _tmp10_;
 	} else {
-		GdkDevice* _tmp11_;
-		GdkDevice* _tmp12_;
+		GdkDevice* _tmp11_ = NULL;
+		GdkDevice* _tmp12_ = NULL;
 		_tmp11_ = device;
 		_tmp12_ = _g_object_ref0 (_tmp11_);
 		_g_object_unref0 (pointer);
@@ -471,7 +471,7 @@
 
 guint keybinding_manager_keyval_to_modifier (guint keyval) {
 	guint result = 0U;
-	guint _tmp0_;
+	guint _tmp0_ = 0U;
 	_tmp0_ = keyval;
 	switch (_tmp0_) {
 		case 0xffe3:
@@ -525,20 +525,20 @@
 
 
 static void keybinding_manager_event_handler (KeybindingManager* self, GdkEvent* event) {
-	GdkEvent* _tmp29_;
+	GdkEvent* _tmp29_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (event != NULL);
 	{
-		gboolean _tmp0_;
+		gboolean _tmp0_ = FALSE;
 		_tmp0_ = TRUE;
 		while (TRUE) {
-			gboolean _tmp1_;
-			GdkEvent* _tmp2_;
-			GdkEventAny _tmp3_;
-			GdkWindow* _tmp4_;
+			gboolean _tmp1_ = FALSE;
+			GdkEvent* _tmp2_ = NULL;
+			GdkEventAny _tmp3_ = {0};
+			GdkWindow* _tmp4_ = NULL;
 			GdkWindow* _tmp5_ = NULL;
-			GdkEvent* _tmp6_;
-			GdkEventType _tmp7_;
+			GdkEvent* _tmp6_ = NULL;
+			GdkEventType _tmp7_ = 0;
 			_tmp1_ = _tmp0_;
 			if (!_tmp1_) {
 				if (!FALSE) {
@@ -556,11 +556,11 @@
 			_tmp6_ = event;
 			_tmp7_ = _tmp6_->type;
 			if (_tmp7_ == GDK_KEY_PRESS) {
-				GdkEvent* _tmp8_;
-				GdkEventKey _tmp9_;
-				GdkModifierType _tmp10_;
-				guint modifiers;
-				GList* _tmp11_;
+				guint modifiers = 0U;
+				GdkEvent* _tmp8_ = NULL;
+				GdkEventKey _tmp9_ = {0};
+				GdkModifierType _tmp10_ = 0;
+				GList* _tmp11_ = NULL;
 				_tmp8_ = event;
 				_tmp9_ = _tmp8_->key;
 				_tmp10_ = _tmp9_.state;
@@ -571,25 +571,25 @@
 					GList* binding_it = NULL;
 					binding_collection = _tmp11_;
 					for (binding_it = binding_collection; binding_it != NULL; binding_it = binding_it->next) {
-						KeybindingManagerKeybinding* _tmp12_;
+						KeybindingManagerKeybinding* _tmp12_ = NULL;
 						KeybindingManagerKeybinding* binding = NULL;
 						_tmp12_ = _keybinding_manager_keybinding_ref0 ((KeybindingManagerKeybinding*) binding_it->data);
 						binding = _tmp12_;
 						{
 							gboolean _tmp13_ = FALSE;
-							GdkEvent* _tmp14_;
-							GdkEventKey _tmp15_;
-							guint _tmp16_;
-							KeybindingManagerKeybinding* _tmp17_;
-							guint _tmp18_;
-							guint _tmp19_;
-							gboolean _tmp24_;
-							KeybindingManagerKeybinding* _tmp25_;
-							KeybindingManagerKeybindingHandlerFunc _tmp26_;
-							void* _tmp26__target;
-							KeybindingManagerKeybindingHandlerFunc _tmp27_;
-							void* _tmp27__target;
-							GdkEvent* _tmp28_;
+							GdkEvent* _tmp14_ = NULL;
+							GdkEventKey _tmp15_ = {0};
+							guint _tmp16_ = 0U;
+							KeybindingManagerKeybinding* _tmp17_ = NULL;
+							guint _tmp18_ = 0U;
+							guint _tmp19_ = 0U;
+							gboolean _tmp24_ = FALSE;
+							KeybindingManagerKeybinding* _tmp25_ = NULL;
+							KeybindingManagerKeybindingHandlerFunc _tmp26_ = NULL;
+							void* _tmp26__target = NULL;
+							KeybindingManagerKeybindingHandlerFunc _tmp27_ = NULL;
+							void* _tmp27__target = NULL;
+							GdkEvent* _tmp28_ = NULL;
 							_tmp14_ = event;
 							_tmp15_ = _tmp14_->key;
 							_tmp16_ = _tmp15_.keyval;
@@ -599,10 +599,10 @@
 							if (_tmp16_ != _tmp19_) {
 								_tmp13_ = TRUE;
 							} else {
-								guint _tmp20_;
-								KeybindingManagerKeybinding* _tmp21_;
-								GdkModifierType _tmp22_;
-								GdkModifierType _tmp23_;
+								guint _tmp20_ = 0U;
+								KeybindingManagerKeybinding* _tmp21_ = NULL;
+								GdkModifierType _tmp22_ = 0;
+								GdkModifierType _tmp23_ = 0;
 								_tmp20_ = modifiers;
 								_tmp21_ = binding;
 								_tmp22_ = keybinding_manager_keybinding_get_modifiers (_tmp21_);
@@ -683,46 +683,46 @@
 static XIGrabModifiers* keybinding_manager_get_grab_modifiers (KeybindingManager* self, guint modifiers, int* result_length1) {
 	XIGrabModifiers* result = NULL;
 	static const gint ignored_modifiers[] = {(gint) LockMask, (gint) Mod2Mask, (gint) Mod5Mask};
+	gint* masks = NULL;
 	gint* _tmp0_ = NULL;
-	gint* masks;
-	gint masks_length1;
-	gint _masks_size_;
-	gint* _tmp20_;
-	gint _tmp20__length1;
+	gint masks_length1 = 0;
+	gint _masks_size_ = 0;
+	gint* _tmp20_ = NULL;
+	gint _tmp20__length1 = 0;
+	XIGrabModifiers* ximodifiers = NULL;
 	XIGrabModifiers* _tmp21_ = NULL;
-	XIGrabModifiers* ximodifiers;
-	gint ximodifiers_length1;
-	gint _ximodifiers_size_;
-	gint* _tmp22_;
-	gint _tmp22__length1;
-	XIGrabModifiers* _tmp27_;
-	gint _tmp27__length1;
+	gint ximodifiers_length1 = 0;
+	gint _ximodifiers_size_ = 0;
+	gint* _tmp22_ = NULL;
+	gint _tmp22__length1 = 0;
+	XIGrabModifiers* _tmp27_ = NULL;
+	gint _tmp27__length1 = 0;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = g_new0 (gint, 0);
 	masks = _tmp0_;
 	masks_length1 = 0;
 	_masks_size_ = masks_length1;
 	{
-		gint i;
+		gint i = 0;
 		i = 0;
 		{
-			gboolean _tmp1_;
+			gboolean _tmp1_ = FALSE;
 			_tmp1_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp2_;
-				gint _tmp4_;
-				gint _tmp5_;
-				gint _tmp6_;
-				gint modifier;
-				gint* _tmp7_;
-				gint _tmp7__length1;
-				gint _tmp8_;
-				gint* _tmp9_;
-				gint _tmp9__length1;
-				gint length;
+				gboolean _tmp2_ = FALSE;
+				gint _tmp4_ = 0;
+				gint modifier = 0;
+				gint _tmp5_ = 0;
+				gint _tmp6_ = 0;
+				gint* _tmp7_ = NULL;
+				gint _tmp7__length1 = 0;
+				gint _tmp8_ = 0;
+				gint length = 0;
+				gint* _tmp9_ = NULL;
+				gint _tmp9__length1 = 0;
 				_tmp2_ = _tmp1_;
 				if (!_tmp2_) {
-					gint _tmp3_;
+					gint _tmp3_ = 0;
 					_tmp3_ = i;
 					i = _tmp3_ + 1;
 				}
@@ -742,25 +742,25 @@
 				_tmp9__length1 = masks_length1;
 				length = _tmp9__length1;
 				{
-					gint j;
+					gint j = 0;
 					j = 0;
 					{
-						gboolean _tmp10_;
+						gboolean _tmp10_ = FALSE;
 						_tmp10_ = TRUE;
 						while (TRUE) {
-							gboolean _tmp11_;
-							gint _tmp13_;
-							gint _tmp14_;
-							gint* _tmp15_;
-							gint _tmp15__length1;
-							gint* _tmp16_;
-							gint _tmp16__length1;
-							gint _tmp17_;
-							gint _tmp18_;
-							gint _tmp19_;
+							gboolean _tmp11_ = FALSE;
+							gint _tmp13_ = 0;
+							gint _tmp14_ = 0;
+							gint* _tmp15_ = NULL;
+							gint _tmp15__length1 = 0;
+							gint* _tmp16_ = NULL;
+							gint _tmp16__length1 = 0;
+							gint _tmp17_ = 0;
+							gint _tmp18_ = 0;
+							gint _tmp19_ = 0;
 							_tmp11_ = _tmp10_;
 							if (!_tmp11_) {
-								gint _tmp12_;
+								gint _tmp12_ = 0;
 								_tmp12_ = j;
 								j = _tmp12_ + 1;
 							}
@@ -804,10 +804,10 @@
 			gint mask = 0;
 			mask = mask_collection[mask_it];
 			{
-				XIGrabModifiers* _tmp23_;
-				gint _tmp23__length1;
-				gint _tmp24_;
-				guint _tmp25_;
+				XIGrabModifiers* _tmp23_ = NULL;
+				gint _tmp23__length1 = 0;
+				gint _tmp24_ = 0;
+				guint _tmp25_ = 0U;
 				XIGrabModifiers _tmp26_ = {0};
 				_tmp23_ = ximodifiers;
 				_tmp23__length1 = ximodifiers_length1;
@@ -833,37 +833,37 @@
 
 static gboolean keybinding_manager_grab_keycode (KeybindingManager* self, GdkDisplay* display, guint keyval, guint modifiers) {
 	gboolean result = FALSE;
-	GdkDisplay* _tmp0_;
+	Display* xdisplay = NULL;
+	GdkDisplay* _tmp0_ = NULL;
 	Display* _tmp1_ = NULL;
-	Display* xdisplay;
-	Display* _tmp2_;
-	guint _tmp3_;
+	gint keycode = 0;
+	Display* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
 	guchar _tmp4_ = '\0';
-	gint keycode;
-	gint _tmp5_;
+	gint _tmp5_ = 0;
+	XIEventMask evmask = {0};
 	guchar* _tmp7_ = NULL;
 	XIEventMask _tmp8_ = {0};
-	XIEventMask evmask;
-	XIEventMask _tmp9_;
-	guchar* _tmp10_;
-	gint _tmp10__length1;
-	XIEventMask _tmp11_;
-	guchar* _tmp12_;
-	gint _tmp12__length1;
-	Display* _tmp13_;
-	gint _tmp14_;
-	Display* _tmp15_;
+	XIEventMask _tmp9_ = {0};
+	guchar* _tmp10_ = NULL;
+	gint _tmp10__length1 = 0;
+	XIEventMask _tmp11_ = {0};
+	guchar* _tmp12_ = NULL;
+	gint _tmp12__length1 = 0;
+	gint retval = 0;
+	Display* _tmp13_ = NULL;
+	gint _tmp14_ = 0;
+	Display* _tmp15_ = NULL;
 	Window _tmp16_ = 0;
-	XIEventMask _tmp17_;
-	guint _tmp18_;
+	XIEventMask _tmp17_ = {0};
+	guint _tmp18_ = 0U;
 	gint _tmp19_ = 0;
 	XIGrabModifiers* _tmp20_ = NULL;
-	XIGrabModifiers* _tmp21_;
-	gint _tmp21__length1;
+	XIGrabModifiers* _tmp21_ = NULL;
+	gint _tmp21__length1 = 0;
 	gint _tmp22_ = 0;
-	gint _tmp23_;
-	gint retval;
-	gint _tmp24_;
+	gint _tmp23_ = 0;
+	gint _tmp24_ = 0;
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_return_val_if_fail (display != NULL, FALSE);
 	_tmp0_ = display;
@@ -875,7 +875,7 @@
 	keycode = (gint) _tmp4_;
 	_tmp5_ = keycode;
 	if (_tmp5_ == 0) {
-		guint _tmp6_;
+		guint _tmp6_ = 0U;
 		_tmp6_ = keyval;
 		g_warning ("keybindingmanager.vala:245: Can not convert keyval=%u to keycode!", _tmp6_);
 		result = FALSE;
@@ -918,27 +918,27 @@
 
 static gboolean keybinding_manager_ungrab_keycode (KeybindingManager* self, GdkDisplay* display, guint keyval, guint modifiers) {
 	gboolean result = FALSE;
-	GdkDisplay* _tmp0_;
+	Display* xdisplay = NULL;
+	GdkDisplay* _tmp0_ = NULL;
 	Display* _tmp1_ = NULL;
-	Display* xdisplay;
-	Display* _tmp2_;
-	guint _tmp3_;
+	gint keycode = 0;
+	Display* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
 	guchar _tmp4_ = '\0';
-	gint keycode;
-	gint _tmp5_;
-	Display* _tmp7_;
-	gint _tmp8_;
-	Display* _tmp9_;
+	gint _tmp5_ = 0;
+	gint retval = 0;
+	Display* _tmp7_ = NULL;
+	gint _tmp8_ = 0;
+	Display* _tmp9_ = NULL;
 	Window _tmp10_ = 0;
-	guint _tmp11_;
+	guint _tmp11_ = 0U;
 	gint _tmp12_ = 0;
 	XIGrabModifiers* _tmp13_ = NULL;
-	XIGrabModifiers* _tmp14_;
-	gint _tmp14__length1;
+	XIGrabModifiers* _tmp14_ = NULL;
+	gint _tmp14__length1 = 0;
 	gint _tmp15_ = 0;
-	gint _tmp16_;
-	gint retval;
-	gint _tmp17_;
+	gint _tmp16_ = 0;
+	gint _tmp17_ = 0;
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_return_val_if_fail (display != NULL, FALSE);
 	_tmp0_ = display;
@@ -950,7 +950,7 @@
 	keycode = (gint) _tmp4_;
 	_tmp5_ = keycode;
 	if (_tmp5_ == 0) {
-		guint _tmp6_;
+		guint _tmp6_ = 0U;
 		_tmp6_ = keyval;
 		g_warning ("keybindingmanager.vala:273: Can not convert keyval=%u to keycode!", _tmp6_);
 		result = FALSE;
@@ -976,10 +976,10 @@
 
 static KeybindingManagerKeybinding* keybinding_manager_keybinding_construct (GType object_type, guint keysym, GdkModifierType modifiers, KeybindingManagerKeybindingHandlerFunc handler, void* handler_target) {
 	KeybindingManagerKeybinding* self = NULL;
-	guint _tmp0_;
-	GdkModifierType _tmp1_;
-	KeybindingManagerKeybindingHandlerFunc _tmp2_;
-	void* _tmp2__target;
+	guint _tmp0_ = 0U;
+	GdkModifierType _tmp1_ = 0;
+	KeybindingManagerKeybindingHandlerFunc _tmp2_ = NULL;
+	void* _tmp2__target = NULL;
 	self = (KeybindingManagerKeybinding*) g_type_create_instance (object_type);
 	_tmp0_ = keysym;
 	keybinding_manager_keybinding_set_keysym (self, _tmp0_);
@@ -999,7 +999,7 @@
 
 static guint keybinding_manager_keybinding_get_keysym (KeybindingManagerKeybinding* self) {
 	guint result;
-	guint _tmp0_;
+	guint _tmp0_ = 0U;
 	g_return_val_if_fail (self != NULL, 0U);
 	_tmp0_ = self->priv->_keysym;
 	result = _tmp0_;
@@ -1008,7 +1008,7 @@
 
 
 static void keybinding_manager_keybinding_set_keysym (KeybindingManagerKeybinding* self, guint value) {
-	guint _tmp0_;
+	guint _tmp0_ = 0U;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	self->priv->_keysym = _tmp0_;
@@ -1017,7 +1017,7 @@
 
 static GdkModifierType keybinding_manager_keybinding_get_modifiers (KeybindingManagerKeybinding* self) {
 	GdkModifierType result;
-	GdkModifierType _tmp0_;
+	GdkModifierType _tmp0_ = 0;
 	g_return_val_if_fail (self != NULL, 0);
 	_tmp0_ = self->priv->_modifiers;
 	result = _tmp0_;
@@ -1026,7 +1026,7 @@
 
 
 static void keybinding_manager_keybinding_set_modifiers (KeybindingManagerKeybinding* self, GdkModifierType value) {
-	GdkModifierType _tmp0_;
+	GdkModifierType _tmp0_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	self->priv->_modifiers = _tmp0_;
@@ -1035,10 +1035,10 @@
 
 static KeybindingManagerKeybindingHandlerFunc keybinding_manager_keybinding_get_handler (KeybindingManagerKeybinding* self, gpointer* result_target) {
 	KeybindingManagerKeybindingHandlerFunc result;
-	KeybindingManagerKeybindingHandlerFunc _tmp0_;
-	void* _tmp0__target;
-	KeybindingManagerKeybindingHandlerFunc _tmp1_;
-	void* _tmp1__target;
+	KeybindingManagerKeybindingHandlerFunc _tmp0_ = NULL;
+	void* _tmp0__target = NULL;
+	KeybindingManagerKeybindingHandlerFunc _tmp1_ = NULL;
+	void* _tmp1__target = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = self->priv->_handler;
 	_tmp0__target = self->priv->_handler_target;
@@ -1051,8 +1051,8 @@
 
 
 static void keybinding_manager_keybinding_set_handler (KeybindingManagerKeybinding* self, KeybindingManagerKeybindingHandlerFunc value, gpointer value_target) {
-	KeybindingManagerKeybindingHandlerFunc _tmp0_;
-	void* _tmp0__target;
+	KeybindingManagerKeybindingHandlerFunc _tmp0_ = NULL;
+	void* _tmp0__target = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	_tmp0__target = value_target;
diff -Nru ibus-1.5.4/ui/gtk3/panel.c ibus-1.5.5/ui/gtk3/panel.c
--- ibus-1.5.4/ui/gtk3/panel.c	2013-09-20 12:21:59.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/panel.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,4 +1,4 @@
-/* panel.c generated by valac 0.20.1, the Vala compiler
+/* panel.c generated by valac 0.22.0, the Vala compiler
  * generated from panel.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
@@ -80,6 +80,16 @@
 typedef struct _PropertyManager PropertyManager;
 typedef struct _PropertyManagerClass PropertyManagerClass;
 
+#define TYPE_PROPERTY_PANEL (property_panel_get_type ())
+#define PROPERTY_PANEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROPERTY_PANEL, PropertyPanel))
+#define PROPERTY_PANEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROPERTY_PANEL, PropertyPanelClass))
+#define IS_PROPERTY_PANEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROPERTY_PANEL))
+#define IS_PROPERTY_PANEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROPERTY_PANEL))
+#define PROPERTY_PANEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROPERTY_PANEL, PropertyPanelClass))
+
+typedef struct _PropertyPanel PropertyPanel;
+typedef struct _PropertyPanelClass PropertyPanelClass;
+
 #define PANEL_TYPE_KEYBINDING (panel_keybinding_get_type ())
 #define PANEL_KEYBINDING(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_KEYBINDING, PanelKeybinding))
 #define PANEL_KEYBINDING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_KEYBINDING, PanelKeybindingClass))
@@ -150,6 +160,7 @@
 	Switcher* m_switcher;
 	gboolean m_switcher_is_running;
 	PropertyManager* m_property_manager;
+	PropertyPanel* m_property_panel;
 	GPid m_setup_pid;
 	GtkAboutDialog* m_about_dialog;
 	GtkCssProvider* m_css_provider;
@@ -200,6 +211,7 @@
 void value_take_property_manager (GValue* value, gpointer v_object);
 gpointer value_get_property_manager (const GValue* value);
 GType property_manager_get_type (void) G_GNUC_CONST;
+GType property_panel_get_type (void) G_GNUC_CONST;
 static gpointer panel_keybinding_ref (gpointer instance);
 static void panel_keybinding_unref (gpointer instance);
 static GParamSpec* panel_param_spec_keybinding (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
@@ -225,59 +237,75 @@
 static void _panel_status_icon_activate_cb_gtk_status_icon_activate (GtkStatusIcon* _sender, gpointer self);
 CandidatePanel* candidate_panel_new (void);
 CandidatePanel* candidate_panel_construct (GType object_type);
-static void __lambda34_ (Panel* self, CandidatePanel* w);
-static void ___lambda34__candidate_panel_page_up (CandidatePanel* _sender, gpointer self);
-static void __lambda35_ (Panel* self, CandidatePanel* w);
-static void ___lambda35__candidate_panel_page_down (CandidatePanel* _sender, gpointer self);
-static void __lambda36_ (Panel* self, CandidatePanel* w, guint i, guint b, guint s);
-static void ___lambda36__candidate_panel_candidate_clicked (CandidatePanel* _sender, guint index, guint button, guint state, gpointer self);
+static void __lambda43_ (Panel* self, CandidatePanel* w);
+static void ___lambda43__candidate_panel_page_up (CandidatePanel* _sender, gpointer self);
+static void __lambda44_ (Panel* self, CandidatePanel* w);
+static void ___lambda44__candidate_panel_page_down (CandidatePanel* _sender, gpointer self);
+static void __lambda45_ (Panel* self, CandidatePanel* w, guint i, guint b, guint s);
+static void ___lambda45__candidate_panel_candidate_clicked (CandidatePanel* _sender, guint index, guint button, guint state, gpointer self);
 Switcher* switcher_new (void);
 Switcher* switcher_construct (GType object_type);
 static void panel_bind_switch_shortcut (Panel* self);
 void switcher_set_popup_delay_time (Switcher* self, guint popup_delay_time);
 PropertyManager* property_manager_new (void);
 PropertyManager* property_manager_construct (GType object_type);
-static void __lambda37_ (Panel* self, const gchar* k, gint s);
-static void ___lambda37__property_manager_property_activate (PropertyManager* _sender, const gchar* key, gint state, gpointer self);
-static void __lambda17_ (Panel* self, const gchar* key);
+static void __lambda46_ (Panel* self, PropertyManager* w, const gchar* k, gint s);
+static void ___lambda46__property_manager_property_activate (PropertyManager* _sender, const gchar* key, gint state, gpointer self);
+PropertyPanel* property_panel_new (void);
+PropertyPanel* property_panel_construct (GType object_type);
+static void __lambda47_ (Panel* self, PropertyPanel* w, const gchar* k, gint s);
+static void ___lambda47__property_panel_property_activate (PropertyPanel* _sender, const gchar* key, gint state, gpointer self);
+static void __lambda23_ (Panel* self, const gchar* key);
 static void panel_update_engines (Panel* self, gchar** unowned_engine_names, int unowned_engine_names_length1, gchar** order_names, int order_names_length1);
-static void ___lambda17__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
-static void __lambda18_ (Panel* self, const gchar* key);
+static void ___lambda23__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
+static void __lambda24_ (Panel* self, const gchar* key);
 static void panel_set_switcher_delay_time (Panel* self);
-static void ___lambda18__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
-static void __lambda19_ (Panel* self, const gchar* key);
-static void panel_set_use_system_keyboard_layout (Panel* self);
-static void ___lambda19__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
-static void __lambda20_ (Panel* self, const gchar* key);
-static void panel_set_embed_preedit_text (Panel* self);
-static void ___lambda20__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
-static void __lambda21_ (Panel* self, const gchar* key);
-static void panel_set_use_global_engine (Panel* self);
-static void ___lambda21__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
-static void __lambda22_ (Panel* self, const gchar* key);
-static void ___lambda22__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
+static void ___lambda24__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
 static void __lambda25_ (Panel* self, const gchar* key);
-static void panel_set_custom_font (Panel* self);
+static void panel_set_use_system_keyboard_layout (Panel* self);
 static void ___lambda25__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
 static void __lambda26_ (Panel* self, const gchar* key);
+static void panel_set_embed_preedit_text (Panel* self);
 static void ___lambda26__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
 static void __lambda27_ (Panel* self, const gchar* key);
-static void panel_set_show_icon_on_systray (Panel* self);
+static void panel_set_use_global_engine (Panel* self);
 static void ___lambda27__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
+static void __lambda28_ (Panel* self, const gchar* key);
+static void ___lambda28__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
+static void __lambda31_ (Panel* self, const gchar* key);
+static void panel_set_custom_font (Panel* self);
+static void ___lambda31__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
+static void __lambda32_ (Panel* self, const gchar* key);
+static void ___lambda32__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
+static void __lambda33_ (Panel* self, const gchar* key);
+static void panel_set_show_icon_on_systray (Panel* self);
+static void ___lambda33__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
+static void __lambda34_ (Panel* self, const gchar* key);
+static void panel_set_lookup_table_orientation (Panel* self);
+static void ___lambda34__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
+static void __lambda35_ (Panel* self, const gchar* key);
+static void panel_set_show_property_panel (Panel* self);
+static void ___lambda35__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
+static void __lambda36_ (Panel* self, const gchar* key);
+static void panel_set_timeout_property_panel (Panel* self);
+static void ___lambda36__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self);
 GType keybinding_manager_get_type (void) G_GNUC_CONST;
 static void panel_keybinding_manager_bind (Panel* self, KeybindingManager* keybinding_manager, const gchar* accelerator);
 static PanelKeybinding* panel_keybinding_new (guint keysym, GdkModifierType modifiers, gboolean reverse);
 static PanelKeybinding* panel_keybinding_construct (GType object_type, guint keysym, GdkModifierType modifiers, gboolean reverse);
 gboolean keybinding_manager_bind (KeybindingManager* self, guint keysym, GdkModifierType modifiers, KeybindingManagerKeybindingHandlerFunc handler, void* handler_target);
-static void __lambda23_ (Panel* self, GdkEvent* e);
+static void __lambda29_ (Panel* self, GdkEvent* e);
 static void panel_handle_engine_switch (Panel* self, GdkEvent* event, gboolean revert);
-static void ___lambda23__keybinding_manager_keybinding_handler_func (GdkEvent* event, gpointer self);
-static void __lambda24_ (Panel* self, GdkEvent* e);
-static void ___lambda24__keybinding_manager_keybinding_handler_func (GdkEvent* event, gpointer self);
+static void ___lambda29__keybinding_manager_keybinding_handler_func (GdkEvent* event, gpointer self);
+static void __lambda30_ (Panel* self, GdkEvent* e);
+static void ___lambda30__keybinding_manager_keybinding_handler_func (GdkEvent* event, gpointer self);
 KeybindingManager* keybinding_manager_get_instance (void);
 void keybinding_manager_unbind (KeybindingManager* self, guint keysym, GdkModifierType modifiers);
 static guint panel_keybinding_get_keysym (PanelKeybinding* self);
 static GdkModifierType panel_keybinding_get_modifiers (PanelKeybinding* self);
+void candidate_panel_set_vertical (CandidatePanel* self, gboolean vertical);
+void property_panel_set_show (PropertyPanel* self, gint _show);
+void property_panel_set_auto_hide_timeout (PropertyPanel* self, guint timeout);
 static gint panel_compare_versions (Panel* self, const gchar* version1, const gchar* version2);
 static void panel_update_version_1_5_3 (Panel* self);
 static void panel_set_version (Panel* self);
@@ -306,43 +334,50 @@
 static IBusEngineDesc** _vala_array_dup3 (IBusEngineDesc** self, int length);
 static IBusEngineDesc** _vala_array_dup4 (IBusEngineDesc** self, int length);
 static void panel_show_setup_dialog (Panel* self);
-static void __lambda29_ (Panel* self, GPid pid, gint state);
-static void ___lambda29__gchild_watch_func (GPid pid, gint status, gpointer self);
+static void __lambda38_ (Panel* self, GPid pid, gint state);
+static void ___lambda38__gchild_watch_func (GPid pid, gint status, gpointer self);
 static void panel_show_about_dialog (Panel* self);
-static void ___lambda28_ (Panel* self, GtkMenuItem* i);
-static void ____lambda28__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void ___lambda30_ (Panel* self, GtkMenuItem* i);
-static void ____lambda30__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void ___lambda31_ (Panel* self, GtkMenuItem* i);
-static void ____lambda31__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void ___lambda32_ (Panel* self, GtkMenuItem* i);
-static void ____lambda32__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void ___lambda37_ (Panel* self, GtkMenuItem* i);
+static void ____lambda37__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void ___lambda39_ (Panel* self, GtkMenuItem* i);
+static void ____lambda39__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void ___lambda40_ (Panel* self, GtkMenuItem* i);
+static void ____lambda40__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void ___lambda41_ (Panel* self, GtkMenuItem* i);
+static void ____lambda41__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
 static void _gtk_status_icon_position_menu_gtk_menu_position_func (GtkMenu* menu, gint* x, gint* y, gboolean* push_in, gpointer self);
 gint property_manager_create_menu_items (PropertyManager* self, GtkMenu* menu);
 static Block4Data* block4_data_ref (Block4Data* _data4_);
 static void block4_data_unref (void * _userdata_);
+GType icon_widget_get_type (void) G_GNUC_CONST;
 IconWidget* icon_widget_new (const gchar* icon_name_or_path, GtkIconSize size);
 IconWidget* icon_widget_construct (GType object_type, const gchar* icon_name_or_path, GtkIconSize size);
-GType icon_widget_get_type (void) G_GNUC_CONST;
-static void ____lambda33_ (Block4Data* _data4_, GtkMenuItem* item);
-static void _____lambda33__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void ____lambda42_ (Block4Data* _data4_, GtkMenuItem* item);
+static void _____lambda42__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
 static void panel_real_set_cursor_location (IBusPanelService* base, gint x, gint y, gint width, gint height);
 void candidate_panel_set_cursor_location (CandidatePanel* self, gint x, gint y, gint width, gint height);
+void property_panel_set_cursor_location (PropertyPanel* self, gint x, gint y, gint width, gint height);
 static void panel_real_focus_in (IBusPanelService* base, const gchar* input_context_path);
+void property_panel_focus_in (PropertyPanel* self);
 static void panel_real_focus_out (IBusPanelService* base, const gchar* input_context_path);
 static void panel_real_destroy_context (IBusPanelService* base, const gchar* input_context_path);
 static void panel_real_register_properties (IBusPanelService* base, IBusPropList* props);
 void property_manager_set_properties (PropertyManager* self, IBusPropList* props);
+void property_panel_set_properties (PropertyPanel* self, IBusPropList* props);
 static void panel_real_update_property (IBusPanelService* base, IBusProperty* prop);
 void property_manager_update_property (PropertyManager* self, IBusProperty* prop);
+void property_panel_update_property (PropertyPanel* self, IBusProperty* prop);
 static void panel_real_update_preedit_text (IBusPanelService* base, IBusText* text, guint cursor_pos, gboolean visible);
 void candidate_panel_set_preedit_text (CandidatePanel* self, IBusText* text, guint cursor);
+void property_panel_set_preedit_text (PropertyPanel* self, IBusText* text, guint cursor);
 static void panel_real_hide_preedit_text (IBusPanelService* base);
 static void panel_real_update_auxiliary_text (IBusPanelService* base, IBusText* text, gboolean visible);
 void candidate_panel_set_auxiliary_text (CandidatePanel* self, IBusText* text);
+void property_panel_set_auxiliary_text (PropertyPanel* self, IBusText* text);
 static void panel_real_hide_auxiliary_text (IBusPanelService* base);
 static void panel_real_update_lookup_table (IBusPanelService* base, IBusLookupTable* table, gboolean visible);
 void candidate_panel_set_lookup_table (CandidatePanel* self, IBusLookupTable* table);
+void property_panel_set_lookup_table (PropertyPanel* self, IBusLookupTable* table);
 static void panel_real_hide_lookup_table (IBusPanelService* base);
 static void panel_real_state_changed (IBusPanelService* base);
 static void _vala_array_add24 (gchar*** array, int* length, int* size, gchar* value);
@@ -397,32 +432,32 @@
 }
 
 
-static void __lambda34_ (Panel* self, CandidatePanel* w) {
+static void __lambda43_ (Panel* self, CandidatePanel* w) {
 	g_return_if_fail (w != NULL);
 	ibus_panel_service_page_up ((IBusPanelService*) self);
 }
 
 
-static void ___lambda34__candidate_panel_page_up (CandidatePanel* _sender, gpointer self) {
-	__lambda34_ (self, _sender);
+static void ___lambda43__candidate_panel_page_up (CandidatePanel* _sender, gpointer self) {
+	__lambda43_ (self, _sender);
 }
 
 
-static void __lambda35_ (Panel* self, CandidatePanel* w) {
+static void __lambda44_ (Panel* self, CandidatePanel* w) {
 	g_return_if_fail (w != NULL);
 	ibus_panel_service_page_down ((IBusPanelService*) self);
 }
 
 
-static void ___lambda35__candidate_panel_page_down (CandidatePanel* _sender, gpointer self) {
-	__lambda35_ (self, _sender);
+static void ___lambda44__candidate_panel_page_down (CandidatePanel* _sender, gpointer self) {
+	__lambda44_ (self, _sender);
 }
 
 
-static void __lambda36_ (Panel* self, CandidatePanel* w, guint i, guint b, guint s) {
-	guint _tmp0_;
-	guint _tmp1_;
-	guint _tmp2_;
+static void __lambda45_ (Panel* self, CandidatePanel* w, guint i, guint b, guint s) {
+	guint _tmp0_ = 0U;
+	guint _tmp1_ = 0U;
+	guint _tmp2_ = 0U;
 	g_return_if_fail (w != NULL);
 	_tmp0_ = i;
 	_tmp1_ = b;
@@ -431,14 +466,31 @@
 }
 
 
-static void ___lambda36__candidate_panel_candidate_clicked (CandidatePanel* _sender, guint index, guint button, guint state, gpointer self) {
-	__lambda36_ (self, _sender, index, button, state);
+static void ___lambda45__candidate_panel_candidate_clicked (CandidatePanel* _sender, guint index, guint button, guint state, gpointer self) {
+	__lambda45_ (self, _sender, index, button, state);
+}
+
+
+static void __lambda46_ (Panel* self, PropertyManager* w, const gchar* k, gint s) {
+	const gchar* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	g_return_if_fail (w != NULL);
+	g_return_if_fail (k != NULL);
+	_tmp0_ = k;
+	_tmp1_ = s;
+	ibus_panel_service_property_activate ((IBusPanelService*) self, _tmp0_, (guint) _tmp1_);
+}
+
+
+static void ___lambda46__property_manager_property_activate (PropertyManager* _sender, const gchar* key, gint state, gpointer self) {
+	__lambda46_ (self, _sender, key, state);
 }
 
 
-static void __lambda37_ (Panel* self, const gchar* k, gint s) {
-	const gchar* _tmp0_;
-	gint _tmp1_;
+static void __lambda47_ (Panel* self, PropertyPanel* w, const gchar* k, gint s) {
+	const gchar* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	g_return_if_fail (w != NULL);
 	g_return_if_fail (k != NULL);
 	_tmp0_ = k;
 	_tmp1_ = s;
@@ -446,33 +498,35 @@
 }
 
 
-static void ___lambda37__property_manager_property_activate (PropertyManager* _sender, const gchar* key, gint state, gpointer self) {
-	__lambda37_ (self, key, state);
+static void ___lambda47__property_panel_property_activate (PropertyPanel* _sender, const gchar* key, gint state, gpointer self) {
+	__lambda47_ (self, _sender, key, state);
 }
 
 
 Panel* panel_construct (GType object_type, IBusBus* bus) {
 	Panel * self = NULL;
-	IBusBus* _tmp0_;
+	IBusBus* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-	IBusBus* _tmp2_;
+	IBusBus* _tmp2_ = NULL;
 	GDBusConnection* _tmp3_ = NULL;
-	IBusBus* _tmp4_;
-	IBusBus* _tmp5_;
-	GtkStatusIcon* _tmp6_;
-	GtkStatusIcon* _tmp7_;
-	GtkStatusIcon* _tmp8_;
-	GtkStatusIcon* _tmp9_;
-	GtkStatusIcon* _tmp10_;
-	GtkStatusIcon* _tmp11_;
-	CandidatePanel* _tmp12_;
-	CandidatePanel* _tmp13_;
-	CandidatePanel* _tmp14_;
-	CandidatePanel* _tmp15_;
-	Switcher* _tmp16_;
-	gint _tmp17_;
-	PropertyManager* _tmp20_;
-	PropertyManager* _tmp21_;
+	IBusBus* _tmp4_ = NULL;
+	IBusBus* _tmp5_ = NULL;
+	GtkStatusIcon* _tmp6_ = NULL;
+	GtkStatusIcon* _tmp7_ = NULL;
+	GtkStatusIcon* _tmp8_ = NULL;
+	GtkStatusIcon* _tmp9_ = NULL;
+	GtkStatusIcon* _tmp10_ = NULL;
+	GtkStatusIcon* _tmp11_ = NULL;
+	CandidatePanel* _tmp12_ = NULL;
+	CandidatePanel* _tmp13_ = NULL;
+	CandidatePanel* _tmp14_ = NULL;
+	CandidatePanel* _tmp15_ = NULL;
+	Switcher* _tmp16_ = NULL;
+	gint _tmp17_ = 0;
+	PropertyManager* _tmp20_ = NULL;
+	PropertyManager* _tmp21_ = NULL;
+	PropertyPanel* _tmp22_ = NULL;
+	PropertyPanel* _tmp23_ = NULL;
 	g_return_val_if_fail (bus != NULL, NULL);
 	_tmp0_ = bus;
 	_tmp1_ = ibus_bus_is_connected (_tmp0_);
@@ -503,11 +557,11 @@
 	_g_object_unref0 (self->priv->m_candidate_panel);
 	self->priv->m_candidate_panel = _tmp12_;
 	_tmp13_ = self->priv->m_candidate_panel;
-	g_signal_connect_object (_tmp13_, "page-up", (GCallback) ___lambda34__candidate_panel_page_up, self, 0);
+	g_signal_connect_object (_tmp13_, "page-up", (GCallback) ___lambda43__candidate_panel_page_up, self, 0);
 	_tmp14_ = self->priv->m_candidate_panel;
-	g_signal_connect_object (_tmp14_, "page-down", (GCallback) ___lambda35__candidate_panel_page_down, self, 0);
+	g_signal_connect_object (_tmp14_, "page-down", (GCallback) ___lambda44__candidate_panel_page_down, self, 0);
 	_tmp15_ = self->priv->m_candidate_panel;
-	g_signal_connect_object (_tmp15_, "candidate-clicked", (GCallback) ___lambda36__candidate_panel_candidate_clicked, self, 0);
+	g_signal_connect_object (_tmp15_, "candidate-clicked", (GCallback) ___lambda45__candidate_panel_candidate_clicked, self, 0);
 	_tmp16_ = switcher_new ();
 	g_object_ref_sink (_tmp16_);
 	_g_object_unref0 (self->priv->m_switcher);
@@ -515,8 +569,8 @@
 	panel_bind_switch_shortcut (self);
 	_tmp17_ = self->priv->m_switcher_delay_time;
 	if (_tmp17_ >= 0) {
-		Switcher* _tmp18_;
-		gint _tmp19_;
+		Switcher* _tmp18_ = NULL;
+		gint _tmp19_ = 0;
 		_tmp18_ = self->priv->m_switcher;
 		_tmp19_ = self->priv->m_switcher_delay_time;
 		switcher_set_popup_delay_time (_tmp18_, (guint) _tmp19_);
@@ -525,7 +579,13 @@
 	_property_manager_unref0 (self->priv->m_property_manager);
 	self->priv->m_property_manager = _tmp20_;
 	_tmp21_ = self->priv->m_property_manager;
-	g_signal_connect_object (_tmp21_, "property-activate", (GCallback) ___lambda37__property_manager_property_activate, self, 0);
+	g_signal_connect_object (_tmp21_, "property-activate", (GCallback) ___lambda46__property_manager_property_activate, self, 0);
+	_tmp22_ = property_panel_new ();
+	g_object_ref_sink (_tmp22_);
+	_g_object_unref0 (self->priv->m_property_panel);
+	self->priv->m_property_panel = _tmp22_;
+	_tmp23_ = self->priv->m_property_panel;
+	g_signal_connect_object (_tmp23_, "property-activate", (GCallback) ___lambda47__property_panel_property_activate, self, 0);
 	g_signal_emit_by_name ((IBusPanelService*) self, "state-changed");
 	return self;
 }
@@ -536,13 +596,13 @@
 }
 
 
-static void __lambda17_ (Panel* self, const gchar* key) {
-	GSettings* _tmp0_;
-	const gchar* _tmp1_;
-	gchar** _tmp2_;
+static void __lambda23_ (Panel* self, const gchar* key) {
+	GSettings* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	gchar** _tmp2_ = NULL;
 	gchar** _tmp3_ = NULL;
-	gchar** _tmp4_;
-	gint _tmp4__length1;
+	gchar** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
 	g_return_if_fail (key != NULL);
 	_tmp0_ = self->priv->m_settings_general;
 	_tmp1_ = key;
@@ -554,113 +614,149 @@
 }
 
 
-static void ___lambda17__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
-	__lambda17_ (self, key);
+static void ___lambda23__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda23_ (self, key);
 }
 
 
-static void __lambda18_ (Panel* self, const gchar* key) {
+static void __lambda24_ (Panel* self, const gchar* key) {
 	g_return_if_fail (key != NULL);
 	panel_set_switcher_delay_time (self);
 }
 
 
-static void ___lambda18__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
-	__lambda18_ (self, key);
+static void ___lambda24__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda24_ (self, key);
 }
 
 
-static void __lambda19_ (Panel* self, const gchar* key) {
+static void __lambda25_ (Panel* self, const gchar* key) {
 	g_return_if_fail (key != NULL);
 	panel_set_use_system_keyboard_layout (self);
 }
 
 
-static void ___lambda19__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
-	__lambda19_ (self, key);
+static void ___lambda25__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda25_ (self, key);
 }
 
 
-static void __lambda20_ (Panel* self, const gchar* key) {
+static void __lambda26_ (Panel* self, const gchar* key) {
 	g_return_if_fail (key != NULL);
 	panel_set_embed_preedit_text (self);
 }
 
 
-static void ___lambda20__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
-	__lambda20_ (self, key);
+static void ___lambda26__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda26_ (self, key);
 }
 
 
-static void __lambda21_ (Panel* self, const gchar* key) {
+static void __lambda27_ (Panel* self, const gchar* key) {
 	g_return_if_fail (key != NULL);
 	panel_set_use_global_engine (self);
 }
 
 
-static void ___lambda21__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
-	__lambda21_ (self, key);
+static void ___lambda27__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda27_ (self, key);
 }
 
 
-static void __lambda22_ (Panel* self, const gchar* key) {
+static void __lambda28_ (Panel* self, const gchar* key) {
 	g_return_if_fail (key != NULL);
 	panel_unbind_switch_shortcut (self);
 	panel_bind_switch_shortcut (self);
 }
 
 
-static void ___lambda22__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
-	__lambda22_ (self, key);
+static void ___lambda28__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda28_ (self, key);
 }
 
 
-static void __lambda25_ (Panel* self, const gchar* key) {
+static void __lambda31_ (Panel* self, const gchar* key) {
 	g_return_if_fail (key != NULL);
 	panel_set_custom_font (self);
 }
 
 
-static void ___lambda25__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
-	__lambda25_ (self, key);
+static void ___lambda31__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda31_ (self, key);
 }
 
 
-static void __lambda26_ (Panel* self, const gchar* key) {
+static void __lambda32_ (Panel* self, const gchar* key) {
 	g_return_if_fail (key != NULL);
 	panel_set_custom_font (self);
 }
 
 
-static void ___lambda26__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
-	__lambda26_ (self, key);
+static void ___lambda32__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda32_ (self, key);
 }
 
 
-static void __lambda27_ (Panel* self, const gchar* key) {
+static void __lambda33_ (Panel* self, const gchar* key) {
 	g_return_if_fail (key != NULL);
 	panel_set_show_icon_on_systray (self);
 }
 
 
-static void ___lambda27__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
-	__lambda27_ (self, key);
+static void ___lambda33__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda33_ (self, key);
+}
+
+
+static void __lambda34_ (Panel* self, const gchar* key) {
+	g_return_if_fail (key != NULL);
+	panel_set_lookup_table_orientation (self);
+}
+
+
+static void ___lambda34__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda34_ (self, key);
+}
+
+
+static void __lambda35_ (Panel* self, const gchar* key) {
+	g_return_if_fail (key != NULL);
+	panel_set_show_property_panel (self);
+}
+
+
+static void ___lambda35__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda35_ (self, key);
+}
+
+
+static void __lambda36_ (Panel* self, const gchar* key) {
+	g_return_if_fail (key != NULL);
+	panel_set_timeout_property_panel (self);
+}
+
+
+static void ___lambda36__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) {
+	__lambda36_ (self, key);
 }
 
 
 static void panel_init_settings (Panel* self) {
-	GSettings* _tmp0_;
-	GSettings* _tmp1_;
-	GSettings* _tmp2_;
-	GSettings* _tmp3_;
-	GSettings* _tmp4_;
-	GSettings* _tmp5_;
-	GSettings* _tmp6_;
-	GSettings* _tmp7_;
-	GSettings* _tmp8_;
-	GSettings* _tmp9_;
-	GSettings* _tmp10_;
-	GSettings* _tmp11_;
+	GSettings* _tmp0_ = NULL;
+	GSettings* _tmp1_ = NULL;
+	GSettings* _tmp2_ = NULL;
+	GSettings* _tmp3_ = NULL;
+	GSettings* _tmp4_ = NULL;
+	GSettings* _tmp5_ = NULL;
+	GSettings* _tmp6_ = NULL;
+	GSettings* _tmp7_ = NULL;
+	GSettings* _tmp8_ = NULL;
+	GSettings* _tmp9_ = NULL;
+	GSettings* _tmp10_ = NULL;
+	GSettings* _tmp11_ = NULL;
+	GSettings* _tmp12_ = NULL;
+	GSettings* _tmp13_ = NULL;
+	GSettings* _tmp14_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = g_settings_new ("org.freedesktop.ibus.general");
 	_g_object_unref0 (self->priv->m_settings_general);
@@ -672,23 +768,29 @@
 	_g_object_unref0 (self->priv->m_settings_panel);
 	self->priv->m_settings_panel = _tmp2_;
 	_tmp3_ = self->priv->m_settings_general;
-	g_signal_connect_object (_tmp3_, "changed::preload-engines", (GCallback) ___lambda17__g_settings_changed, self, 0);
+	g_signal_connect_object (_tmp3_, "changed::preload-engines", (GCallback) ___lambda23__g_settings_changed, self, 0);
 	_tmp4_ = self->priv->m_settings_general;
-	g_signal_connect_object (_tmp4_, "changed::switcher-delay-time", (GCallback) ___lambda18__g_settings_changed, self, 0);
+	g_signal_connect_object (_tmp4_, "changed::switcher-delay-time", (GCallback) ___lambda24__g_settings_changed, self, 0);
 	_tmp5_ = self->priv->m_settings_general;
-	g_signal_connect_object (_tmp5_, "changed::use-system-keyboard-layout", (GCallback) ___lambda19__g_settings_changed, self, 0);
+	g_signal_connect_object (_tmp5_, "changed::use-system-keyboard-layout", (GCallback) ___lambda25__g_settings_changed, self, 0);
 	_tmp6_ = self->priv->m_settings_general;
-	g_signal_connect_object (_tmp6_, "changed::embed-preedit-text", (GCallback) ___lambda20__g_settings_changed, self, 0);
+	g_signal_connect_object (_tmp6_, "changed::embed-preedit-text", (GCallback) ___lambda26__g_settings_changed, self, 0);
 	_tmp7_ = self->priv->m_settings_general;
-	g_signal_connect_object (_tmp7_, "changed::use-global-engine", (GCallback) ___lambda21__g_settings_changed, self, 0);
+	g_signal_connect_object (_tmp7_, "changed::use-global-engine", (GCallback) ___lambda27__g_settings_changed, self, 0);
 	_tmp8_ = self->priv->m_settings_hotkey;
-	g_signal_connect_object (_tmp8_, "changed::triggers", (GCallback) ___lambda22__g_settings_changed, self, 0);
+	g_signal_connect_object (_tmp8_, "changed::triggers", (GCallback) ___lambda28__g_settings_changed, self, 0);
 	_tmp9_ = self->priv->m_settings_panel;
-	g_signal_connect_object (_tmp9_, "changed::custom-font", (GCallback) ___lambda25__g_settings_changed, self, 0);
+	g_signal_connect_object (_tmp9_, "changed::custom-font", (GCallback) ___lambda31__g_settings_changed, self, 0);
 	_tmp10_ = self->priv->m_settings_panel;
-	g_signal_connect_object (_tmp10_, "changed::use-custom-font", (GCallback) ___lambda26__g_settings_changed, self, 0);
+	g_signal_connect_object (_tmp10_, "changed::use-custom-font", (GCallback) ___lambda32__g_settings_changed, self, 0);
 	_tmp11_ = self->priv->m_settings_panel;
-	g_signal_connect_object (_tmp11_, "changed::show-icon-on-systray", (GCallback) ___lambda27__g_settings_changed, self, 0);
+	g_signal_connect_object (_tmp11_, "changed::show-icon-on-systray", (GCallback) ___lambda33__g_settings_changed, self, 0);
+	_tmp12_ = self->priv->m_settings_panel;
+	g_signal_connect_object (_tmp12_, "changed::lookup-table-orientation", (GCallback) ___lambda34__g_settings_changed, self, 0);
+	_tmp13_ = self->priv->m_settings_panel;
+	g_signal_connect_object (_tmp13_, "changed::show", (GCallback) ___lambda35__g_settings_changed, self, 0);
+	_tmp14_ = self->priv->m_settings_panel;
+	g_signal_connect_object (_tmp14_, "changed::timeout", (GCallback) ___lambda36__g_settings_changed, self, 0);
 }
 
 
@@ -697,65 +799,65 @@
 }
 
 
-static void __lambda23_ (Panel* self, GdkEvent* e) {
-	GdkEvent* _tmp0_;
+static void __lambda29_ (Panel* self, GdkEvent* e) {
+	GdkEvent* _tmp0_ = NULL;
 	g_return_if_fail (e != NULL);
 	_tmp0_ = e;
 	panel_handle_engine_switch (self, _tmp0_, FALSE);
 }
 
 
-static void ___lambda23__keybinding_manager_keybinding_handler_func (GdkEvent* event, gpointer self) {
-	__lambda23_ (self, event);
+static void ___lambda29__keybinding_manager_keybinding_handler_func (GdkEvent* event, gpointer self) {
+	__lambda29_ (self, event);
 }
 
 
-static void __lambda24_ (Panel* self, GdkEvent* e) {
-	GdkEvent* _tmp0_;
+static void __lambda30_ (Panel* self, GdkEvent* e) {
+	GdkEvent* _tmp0_ = NULL;
 	g_return_if_fail (e != NULL);
 	_tmp0_ = e;
 	panel_handle_engine_switch (self, _tmp0_, TRUE);
 }
 
 
-static void ___lambda24__keybinding_manager_keybinding_handler_func (GdkEvent* event, gpointer self) {
-	__lambda24_ (self, event);
+static void ___lambda30__keybinding_manager_keybinding_handler_func (GdkEvent* event, gpointer self) {
+	__lambda30_ (self, event);
 }
 
 
 static void panel_keybinding_manager_bind (Panel* self, KeybindingManager* keybinding_manager, const gchar* accelerator) {
-	guint switch_keysym;
-	GdkModifierType switch_modifiers;
-	GdkModifierType reverse_modifier;
+	guint switch_keysym = 0U;
+	GdkModifierType switch_modifiers = 0;
+	GdkModifierType reverse_modifier = 0;
 	PanelKeybinding* keybinding = NULL;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
 	GdkModifierType _tmp2_ = 0;
 	static const GdkModifierType VIRTUAL_MODIFIERS = (GDK_SUPER_MASK | GDK_HYPER_MASK) | GDK_META_MASK;
-	GdkModifierType _tmp3_;
+	GdkModifierType _tmp3_ = 0;
 	gboolean _tmp6_ = FALSE;
-	guint _tmp7_;
-	gboolean _tmp9_;
-	guint _tmp11_;
-	GdkModifierType _tmp12_;
-	PanelKeybinding* _tmp13_;
-	PanelKeybinding* _tmp14_;
-	PanelKeybinding* _tmp15_;
-	KeybindingManager* _tmp16_;
-	guint _tmp17_;
-	GdkModifierType _tmp18_;
-	GdkModifierType _tmp19_;
-	GdkModifierType _tmp20_;
-	GdkModifierType _tmp21_;
-	GdkModifierType _tmp22_;
-	guint _tmp23_;
-	GdkModifierType _tmp24_;
-	PanelKeybinding* _tmp25_;
-	PanelKeybinding* _tmp26_;
-	PanelKeybinding* _tmp27_;
-	KeybindingManager* _tmp28_;
-	guint _tmp29_;
-	GdkModifierType _tmp30_;
+	guint _tmp7_ = 0U;
+	gboolean _tmp9_ = FALSE;
+	guint _tmp11_ = 0U;
+	GdkModifierType _tmp12_ = 0;
+	PanelKeybinding* _tmp13_ = NULL;
+	PanelKeybinding* _tmp14_ = NULL;
+	PanelKeybinding* _tmp15_ = NULL;
+	KeybindingManager* _tmp16_ = NULL;
+	guint _tmp17_ = 0U;
+	GdkModifierType _tmp18_ = 0;
+	GdkModifierType _tmp19_ = 0;
+	GdkModifierType _tmp20_ = 0;
+	GdkModifierType _tmp21_ = 0;
+	GdkModifierType _tmp22_ = 0;
+	guint _tmp23_ = 0U;
+	GdkModifierType _tmp24_ = 0;
+	PanelKeybinding* _tmp25_ = NULL;
+	PanelKeybinding* _tmp26_ = NULL;
+	PanelKeybinding* _tmp27_ = NULL;
+	KeybindingManager* _tmp28_ = NULL;
+	guint _tmp29_ = 0U;
+	GdkModifierType _tmp30_ = 0;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (keybinding_manager != NULL);
 	switch_keysym = (guint) 0;
@@ -768,7 +870,7 @@
 	_tmp3_ = switch_modifiers;
 	if ((_tmp3_ & VIRTUAL_MODIFIERS) != 0) {
 		GdkKeymap* _tmp4_ = NULL;
-		GdkModifierType _tmp5_;
+		GdkModifierType _tmp5_ = 0;
 		_tmp4_ = gdk_keymap_get_default ();
 		gdk_keymap_map_virtual_modifiers (_tmp4_, &switch_modifiers);
 		_tmp5_ = switch_modifiers;
@@ -776,7 +878,7 @@
 	}
 	_tmp7_ = switch_keysym;
 	if (_tmp7_ == ((guint) 0)) {
-		GdkModifierType _tmp8_;
+		GdkModifierType _tmp8_ = 0;
 		_tmp8_ = switch_modifiers;
 		_tmp6_ = _tmp8_ == 0;
 	} else {
@@ -784,9 +886,9 @@
 	}
 	_tmp9_ = _tmp6_;
 	if (_tmp9_) {
-		const gchar* _tmp10_;
+		const gchar* _tmp10_ = NULL;
 		_tmp10_ = accelerator;
-		g_warning ("panel.vala:184: Parse accelerator '%s' failed!", _tmp10_);
+		g_warning ("panel.vala:202: Parse accelerator '%s' failed!", _tmp10_);
 		_panel_keybinding_unref0 (keybinding);
 		return;
 	}
@@ -801,7 +903,7 @@
 	_tmp16_ = keybinding_manager;
 	_tmp17_ = switch_keysym;
 	_tmp18_ = switch_modifiers;
-	keybinding_manager_bind (_tmp16_, _tmp17_, _tmp18_, ___lambda23__keybinding_manager_keybinding_handler_func, self);
+	keybinding_manager_bind (_tmp16_, _tmp17_, _tmp18_, ___lambda29__keybinding_manager_keybinding_handler_func, self);
 	_tmp19_ = switch_modifiers;
 	_tmp20_ = reverse_modifier;
 	if ((_tmp19_ & _tmp20_) != 0) {
@@ -822,22 +924,22 @@
 	_tmp28_ = keybinding_manager;
 	_tmp29_ = switch_keysym;
 	_tmp30_ = switch_modifiers;
-	keybinding_manager_bind (_tmp28_, _tmp29_, _tmp30_, ___lambda24__keybinding_manager_keybinding_handler_func, self);
+	keybinding_manager_bind (_tmp28_, _tmp29_, _tmp30_, ___lambda30__keybinding_manager_keybinding_handler_func, self);
 	_panel_keybinding_unref0 (keybinding);
 }
 
 
 static void panel_bind_switch_shortcut (Panel* self) {
-	GSettings* _tmp0_;
-	gchar** _tmp1_;
+	gchar** accelerators = NULL;
+	GSettings* _tmp0_ = NULL;
+	gchar** _tmp1_ = NULL;
 	gchar** _tmp2_ = NULL;
-	gchar** accelerators;
-	gint accelerators_length1;
-	gint _accelerators_size_;
+	gint accelerators_length1 = 0;
+	gint _accelerators_size_ = 0;
+	KeybindingManager* keybinding_manager = NULL;
 	KeybindingManager* _tmp3_ = NULL;
-	KeybindingManager* keybinding_manager;
-	gchar** _tmp4_;
-	gint _tmp4__length1;
+	gchar** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_settings_hotkey;
 	_tmp2_ = _tmp1_ = g_settings_get_strv (_tmp0_, "triggers");
@@ -856,13 +958,13 @@
 		accelerator_collection = _tmp4_;
 		accelerator_collection_length1 = _tmp4__length1;
 		for (accelerator_it = 0; accelerator_it < _tmp4__length1; accelerator_it = accelerator_it + 1) {
-			gchar* _tmp5_;
+			gchar* _tmp5_ = NULL;
 			gchar* accelerator = NULL;
 			_tmp5_ = g_strdup (accelerator_collection[accelerator_it]);
 			accelerator = _tmp5_;
 			{
-				KeybindingManager* _tmp6_;
-				const gchar* _tmp7_;
+				KeybindingManager* _tmp6_ = NULL;
+				const gchar* _tmp7_ = NULL;
 				_tmp6_ = keybinding_manager;
 				_tmp7_ = accelerator;
 				panel_keybinding_manager_bind (self, _tmp6_, _tmp7_);
@@ -876,30 +978,30 @@
 
 
 static void panel_unbind_switch_shortcut (Panel* self) {
+	KeybindingManager* keybinding_manager = NULL;
 	KeybindingManager* _tmp0_ = NULL;
-	KeybindingManager* keybinding_manager;
-	GList* _tmp1_;
-	GList* keybindings;
+	GList* keybindings = NULL;
+	GList* _tmp1_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = keybinding_manager_get_instance ();
 	keybinding_manager = _tmp0_;
 	_tmp1_ = self->priv->m_keybindings;
 	keybindings = _tmp1_;
 	while (TRUE) {
-		GList* _tmp2_;
-		GList* _tmp3_;
-		gconstpointer _tmp4_;
-		PanelKeybinding* _tmp5_;
-		PanelKeybinding* keybinding;
-		KeybindingManager* _tmp6_;
-		PanelKeybinding* _tmp7_;
-		guint _tmp8_;
-		guint _tmp9_;
-		PanelKeybinding* _tmp10_;
-		GdkModifierType _tmp11_;
-		GdkModifierType _tmp12_;
-		GList* _tmp13_;
-		GList* _tmp14_;
+		GList* _tmp2_ = NULL;
+		PanelKeybinding* keybinding = NULL;
+		GList* _tmp3_ = NULL;
+		gconstpointer _tmp4_ = NULL;
+		PanelKeybinding* _tmp5_ = NULL;
+		KeybindingManager* _tmp6_ = NULL;
+		PanelKeybinding* _tmp7_ = NULL;
+		guint _tmp8_ = 0U;
+		guint _tmp9_ = 0U;
+		PanelKeybinding* _tmp10_ = NULL;
+		GdkModifierType _tmp11_ = 0;
+		GdkModifierType _tmp12_ = 0;
+		GList* _tmp13_ = NULL;
+		GList* _tmp14_ = NULL;
 		_tmp2_ = keybindings;
 		if (!(_tmp2_ != NULL)) {
 			break;
@@ -928,33 +1030,33 @@
 
 
 static void panel_set_custom_font (Panel* self) {
+	GdkDisplay* display = NULL;
 	GdkDisplay* _tmp0_ = NULL;
-	GdkDisplay* _tmp1_;
-	GdkDisplay* display;
+	GdkDisplay* _tmp1_ = NULL;
 	GdkScreen* _tmp2_ = NULL;
-	GdkDisplay* _tmp3_;
-	GdkScreen* _tmp6_;
-	GdkScreen* _tmp7_;
-	GdkScreen* screen;
-	GdkScreen* _tmp8_;
-	GSettings* _tmp9_;
+	GdkDisplay* _tmp3_ = NULL;
+	GdkScreen* screen = NULL;
+	GdkScreen* _tmp6_ = NULL;
+	GdkScreen* _tmp7_ = NULL;
+	GdkScreen* _tmp8_ = NULL;
+	gboolean use_custom_font = FALSE;
+	GSettings* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
-	gboolean use_custom_font;
-	GtkCssProvider* _tmp11_;
-	gboolean _tmp14_;
-	GSettings* _tmp15_;
+	GtkCssProvider* _tmp11_ = NULL;
+	gboolean _tmp14_ = FALSE;
+	gchar* font_name = NULL;
+	GSettings* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-	gchar* font_name;
-	const gchar* _tmp17_;
-	gchar* _tmp18_;
-	gchar* data_format;
-	const gchar* _tmp19_;
-	const gchar* _tmp20_;
+	const gchar* _tmp17_ = NULL;
+	gchar* data_format = NULL;
+	gchar* _tmp18_ = NULL;
+	gchar* data = NULL;
+	const gchar* _tmp19_ = NULL;
+	const gchar* _tmp20_ = NULL;
 	gchar* _tmp21_ = NULL;
-	gchar* data;
-	GtkCssProvider* _tmp22_;
-	GdkScreen* _tmp28_;
-	GtkCssProvider* _tmp29_;
+	GtkCssProvider* _tmp22_ = NULL;
+	GdkScreen* _tmp28_ = NULL;
+	GtkCssProvider* _tmp29_ = NULL;
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = gdk_display_get_default ();
@@ -962,7 +1064,7 @@
 	display = _tmp1_;
 	_tmp3_ = display;
 	if (_tmp3_ != NULL) {
-		GdkDisplay* _tmp4_;
+		GdkDisplay* _tmp4_ = NULL;
 		GdkScreen* _tmp5_ = NULL;
 		_tmp4_ = display;
 		_tmp5_ = gdk_display_get_default_screen (_tmp4_);
@@ -975,7 +1077,7 @@
 	screen = _tmp7_;
 	_tmp8_ = screen;
 	if (_tmp8_ == NULL) {
-		g_warning ("panel.vala:244: Could not open display.");
+		g_warning ("panel.vala:262: Could not open display.");
 		_g_object_unref0 (screen);
 		_g_object_unref0 (display);
 		return;
@@ -985,8 +1087,8 @@
 	use_custom_font = _tmp10_;
 	_tmp11_ = self->priv->m_css_provider;
 	if (_tmp11_ != NULL) {
-		GdkScreen* _tmp12_;
-		GtkCssProvider* _tmp13_;
+		GdkScreen* _tmp12_ = NULL;
+		GtkCssProvider* _tmp13_ = NULL;
 		_tmp12_ = screen;
 		_tmp13_ = self->priv->m_css_provider;
 		gtk_style_context_remove_provider_for_screen (_tmp12_, (GtkStyleProvider*) _tmp13_);
@@ -1004,7 +1106,7 @@
 	font_name = _tmp16_;
 	_tmp17_ = font_name;
 	if (_tmp17_ == NULL) {
-		g_warning ("panel.vala:263: No config panel:custom-font.");
+		g_warning ("panel.vala:281: No config panel:custom-font.");
 		_g_free0 (font_name);
 		_g_object_unref0 (screen);
 		_g_object_unref0 (display);
@@ -1020,8 +1122,8 @@
 	_g_object_unref0 (self->priv->m_css_provider);
 	self->priv->m_css_provider = _tmp22_;
 	{
-		GtkCssProvider* _tmp23_;
-		const gchar* _tmp24_;
+		GtkCssProvider* _tmp23_ = NULL;
+		const gchar* _tmp24_ = NULL;
 		_tmp23_ = self->priv->m_css_provider;
 		_tmp24_ = data;
 		gtk_css_provider_load_from_data (_tmp23_, _tmp24_, (gssize) (-1), &_inner_error_);
@@ -1033,15 +1135,15 @@
 	__catch2_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp25_;
-		GError* _tmp26_;
-		const gchar* _tmp27_;
+		const gchar* _tmp25_ = NULL;
+		GError* _tmp26_ = NULL;
+		const gchar* _tmp27_ = NULL;
 		e = _inner_error_;
 		_inner_error_ = NULL;
 		_tmp25_ = font_name;
 		_tmp26_ = e;
 		_tmp27_ = _tmp26_->message;
-		g_warning ("panel.vala:274: Failed css_provider_from_data: %s: %s", _tmp25_, _tmp27_);
+		g_warning ("panel.vala:292: Failed css_provider_from_data: %s: %s", _tmp25_, _tmp27_);
 		_g_error_free0 (e);
 		_g_free0 (data);
 		_g_free0 (data_format);
@@ -1073,26 +1175,36 @@
 
 
 static void panel_set_switcher_delay_time (Panel* self) {
-	GSettings* _tmp0_;
+	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-	gint _tmp2_;
+	gboolean _tmp2_ = FALSE;
+	Switcher* _tmp3_ = NULL;
+	gboolean _tmp5_ = FALSE;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_settings_general;
 	_tmp1_ = g_settings_get_int (_tmp0_, "switcher-delay-time");
 	self->priv->m_switcher_delay_time = _tmp1_;
-	_tmp2_ = self->priv->m_switcher_delay_time;
-	if (_tmp2_ >= 0) {
-		Switcher* _tmp3_;
-		gint _tmp4_;
-		_tmp3_ = self->priv->m_switcher;
+	_tmp3_ = self->priv->m_switcher;
+	if (_tmp3_ != NULL) {
+		gint _tmp4_ = 0;
 		_tmp4_ = self->priv->m_switcher_delay_time;
-		switcher_set_popup_delay_time (_tmp3_, (guint) _tmp4_);
+		_tmp2_ = _tmp4_ >= 0;
+	} else {
+		_tmp2_ = FALSE;
+	}
+	_tmp5_ = _tmp2_;
+	if (_tmp5_) {
+		Switcher* _tmp6_ = NULL;
+		gint _tmp7_ = 0;
+		_tmp6_ = self->priv->m_switcher;
+		_tmp7_ = self->priv->m_switcher_delay_time;
+		switcher_set_popup_delay_time (_tmp6_, (guint) _tmp7_);
 	}
 }
 
 
 static void panel_set_use_system_keyboard_layout (Panel* self) {
-	GSettings* _tmp0_;
+	GSettings* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_settings_general;
@@ -1102,12 +1214,12 @@
 
 
 static void panel_set_embed_preedit_text (Panel* self) {
-	GSettings* _tmp0_;
+	GVariant* variant = NULL;
+	GSettings* _tmp0_ = NULL;
 	GVariant* _tmp1_ = NULL;
-	GVariant* variant;
-	GVariant* _tmp2_;
-	IBusBus* _tmp3_;
-	GVariant* _tmp4_;
+	GVariant* _tmp2_ = NULL;
+	IBusBus* _tmp3_ = NULL;
+	GVariant* _tmp4_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_settings_general;
 	_tmp1_ = g_settings_get_value (_tmp0_, "embed-preedit-text");
@@ -1125,7 +1237,7 @@
 
 
 static void panel_set_use_global_engine (Panel* self) {
-	GSettings* _tmp0_;
+	GSettings* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_settings_general;
@@ -1135,81 +1247,137 @@
 
 
 static void panel_set_show_icon_on_systray (Panel* self) {
-	GtkStatusIcon* _tmp0_;
-	GSettings* _tmp1_;
-	gboolean _tmp2_ = FALSE;
+	GtkStatusIcon* _tmp0_ = NULL;
+	GtkStatusIcon* _tmp1_ = NULL;
+	GSettings* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_status_icon;
-	_tmp1_ = self->priv->m_settings_panel;
-	_tmp2_ = g_settings_get_boolean (_tmp1_, "show-icon-on-systray");
-	gtk_status_icon_set_visible (_tmp0_, _tmp2_);
+	if (_tmp0_ == NULL) {
+		return;
+	}
+	_tmp1_ = self->priv->m_status_icon;
+	_tmp2_ = self->priv->m_settings_panel;
+	_tmp3_ = g_settings_get_boolean (_tmp2_, "show-icon-on-systray");
+	gtk_status_icon_set_visible (_tmp1_, _tmp3_);
+}
+
+
+static void panel_set_lookup_table_orientation (Panel* self) {
+	CandidatePanel* _tmp0_ = NULL;
+	CandidatePanel* _tmp1_ = NULL;
+	GSettings* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = self->priv->m_candidate_panel;
+	if (_tmp0_ == NULL) {
+		return;
+	}
+	_tmp1_ = self->priv->m_candidate_panel;
+	_tmp2_ = self->priv->m_settings_panel;
+	_tmp3_ = g_settings_get_int (_tmp2_, "lookup-table-orientation");
+	candidate_panel_set_vertical (_tmp1_, _tmp3_ == ((gint) IBUS_ORIENTATION_VERTICAL));
+}
+
+
+static void panel_set_show_property_panel (Panel* self) {
+	PropertyPanel* _tmp0_ = NULL;
+	PropertyPanel* _tmp1_ = NULL;
+	GSettings* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = self->priv->m_property_panel;
+	if (_tmp0_ == NULL) {
+		return;
+	}
+	_tmp1_ = self->priv->m_property_panel;
+	_tmp2_ = self->priv->m_settings_panel;
+	_tmp3_ = g_settings_get_int (_tmp2_, "show");
+	property_panel_set_show (_tmp1_, _tmp3_);
+}
+
+
+static void panel_set_timeout_property_panel (Panel* self) {
+	PropertyPanel* _tmp0_ = NULL;
+	PropertyPanel* _tmp1_ = NULL;
+	GSettings* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = self->priv->m_property_panel;
+	if (_tmp0_ == NULL) {
+		return;
+	}
+	_tmp1_ = self->priv->m_property_panel;
+	_tmp2_ = self->priv->m_settings_panel;
+	_tmp3_ = g_settings_get_int (_tmp2_, "auto-hide-timeout");
+	property_panel_set_auto_hide_timeout (_tmp1_, (guint) _tmp3_);
 }
 
 
 static gint panel_compare_versions (Panel* self, const gchar* version1, const gchar* version2) {
 	gint result = 0;
-	const gchar* _tmp0_;
-	gchar** _tmp1_;
+	gchar** version1_list = NULL;
+	const gchar* _tmp0_ = NULL;
+	gchar** _tmp1_ = NULL;
 	gchar** _tmp2_ = NULL;
-	gchar** version1_list;
-	gint version1_list_length1;
-	gint _version1_list_size_;
-	const gchar* _tmp3_;
-	gchar** _tmp4_;
+	gint version1_list_length1 = 0;
+	gint _version1_list_size_ = 0;
+	gchar** version2_list = NULL;
+	const gchar* _tmp3_ = NULL;
+	gchar** _tmp4_ = NULL;
 	gchar** _tmp5_ = NULL;
-	gchar** version2_list;
-	gint version2_list_length1;
-	gint _version2_list_size_;
+	gint version2_list_length1 = 0;
+	gint _version2_list_size_ = 0;
 	gint major1 = 0;
 	gint minor1 = 0;
 	gint micro1 = 0;
 	gint major2 = 0;
 	gint minor2 = 0;
 	gint micro2 = 0;
-	const gchar* _tmp6_;
-	const gchar* _tmp7_;
-	const gchar* _tmp8_;
-	const gchar* _tmp9_;
-	gchar** _tmp10_;
-	gint _tmp10__length1;
-	gchar** _tmp11_;
-	gint _tmp11__length1;
-	gchar** _tmp12_;
-	gint _tmp12__length1;
-	const gchar* _tmp13_;
+	const gchar* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	gchar** _tmp10_ = NULL;
+	gint _tmp10__length1 = 0;
+	gchar** _tmp11_ = NULL;
+	gint _tmp11__length1 = 0;
+	gchar** _tmp12_ = NULL;
+	gint _tmp12__length1 = 0;
+	const gchar* _tmp13_ = NULL;
 	gint _tmp14_ = 0;
-	gchar** _tmp15_;
-	gint _tmp15__length1;
-	const gchar* _tmp16_;
+	gchar** _tmp15_ = NULL;
+	gint _tmp15__length1 = 0;
+	const gchar* _tmp16_ = NULL;
 	gint _tmp17_ = 0;
-	gchar** _tmp18_;
-	gint _tmp18__length1;
-	const gchar* _tmp19_;
+	gchar** _tmp18_ = NULL;
+	gint _tmp18__length1 = 0;
+	const gchar* _tmp19_ = NULL;
 	gint _tmp20_ = 0;
-	gchar** _tmp21_;
-	gint _tmp21__length1;
-	const gchar* _tmp22_;
+	gchar** _tmp21_ = NULL;
+	gint _tmp21__length1 = 0;
+	const gchar* _tmp22_ = NULL;
 	gint _tmp23_ = 0;
-	gchar** _tmp24_;
-	gint _tmp24__length1;
-	const gchar* _tmp25_;
+	gchar** _tmp24_ = NULL;
+	gint _tmp24__length1 = 0;
+	const gchar* _tmp25_ = NULL;
 	gint _tmp26_ = 0;
-	gchar** _tmp27_;
-	gint _tmp27__length1;
-	const gchar* _tmp28_;
+	gchar** _tmp27_ = NULL;
+	gint _tmp27__length1 = 0;
+	const gchar* _tmp28_ = NULL;
 	gint _tmp29_ = 0;
 	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
-	gint _tmp32_;
-	gint _tmp33_;
-	gboolean _tmp36_;
-	gboolean _tmp39_;
+	gint _tmp32_ = 0;
+	gint _tmp33_ = 0;
+	gboolean _tmp36_ = FALSE;
+	gboolean _tmp39_ = FALSE;
 	gboolean _tmp40_ = FALSE;
 	gboolean _tmp41_ = FALSE;
-	gint _tmp42_;
-	gint _tmp43_;
-	gboolean _tmp50_;
-	gboolean _tmp61_;
+	gint _tmp42_ = 0;
+	gint _tmp43_ = 0;
+	gboolean _tmp50_ = FALSE;
+	gboolean _tmp61_ = FALSE;
 	g_return_val_if_fail (self != NULL, 0);
 	g_return_val_if_fail (version1 != NULL, 0);
 	g_return_val_if_fail (version2 != NULL, 0);
@@ -1284,8 +1452,8 @@
 	_tmp32_ = major1;
 	_tmp33_ = minor1;
 	if (_tmp32_ == _tmp33_) {
-		gint _tmp34_;
-		gint _tmp35_;
+		gint _tmp34_ = 0;
+		gint _tmp35_ = 0;
 		_tmp34_ = minor1;
 		_tmp35_ = minor2;
 		_tmp31_ = _tmp34_ == _tmp35_;
@@ -1294,8 +1462,8 @@
 	}
 	_tmp36_ = _tmp31_;
 	if (_tmp36_) {
-		gint _tmp37_;
-		gint _tmp38_;
+		gint _tmp37_ = 0;
+		gint _tmp38_ = 0;
 		_tmp37_ = micro1;
 		_tmp38_ = micro2;
 		_tmp30_ = _tmp37_ == _tmp38_;
@@ -1315,14 +1483,14 @@
 		_tmp41_ = TRUE;
 	} else {
 		gboolean _tmp44_ = FALSE;
-		gint _tmp45_;
-		gint _tmp46_;
-		gboolean _tmp49_;
+		gint _tmp45_ = 0;
+		gint _tmp46_ = 0;
+		gboolean _tmp49_ = FALSE;
 		_tmp45_ = major1;
 		_tmp46_ = major2;
 		if (_tmp45_ == _tmp46_) {
-			gint _tmp47_;
-			gint _tmp48_;
+			gint _tmp47_ = 0;
+			gint _tmp48_ = 0;
 			_tmp47_ = minor1;
 			_tmp48_ = minor2;
 			_tmp44_ = _tmp47_ > _tmp48_;
@@ -1338,15 +1506,15 @@
 	} else {
 		gboolean _tmp51_ = FALSE;
 		gboolean _tmp52_ = FALSE;
-		gint _tmp53_;
-		gint _tmp54_;
-		gboolean _tmp57_;
-		gboolean _tmp60_;
+		gint _tmp53_ = 0;
+		gint _tmp54_ = 0;
+		gboolean _tmp57_ = FALSE;
+		gboolean _tmp60_ = FALSE;
 		_tmp53_ = major1;
 		_tmp54_ = major2;
 		if (_tmp53_ == _tmp54_) {
-			gint _tmp55_;
-			gint _tmp56_;
+			gint _tmp55_ = 0;
+			gint _tmp56_ = 0;
 			_tmp55_ = minor1;
 			_tmp56_ = minor2;
 			_tmp52_ = _tmp55_ == _tmp56_;
@@ -1355,8 +1523,8 @@
 		}
 		_tmp57_ = _tmp52_;
 		if (_tmp57_) {
-			gint _tmp58_;
-			gint _tmp59_;
+			gint _tmp58_ = 0;
+			gint _tmp59_ = 0;
 			_tmp58_ = micro1;
 			_tmp59_ = micro2;
 			_tmp51_ = _tmp58_ > _tmp59_;
@@ -1382,10 +1550,10 @@
 
 static void panel_update_version_1_5_3 (Panel* self) {
 	gboolean _tmp0_ = FALSE;
+	NotifyNotification* notification = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-	NotifyNotification* _tmp3_;
-	NotifyNotification* notification;
+	NotifyNotification* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = notify_is_initted ();
@@ -1408,13 +1576,13 @@
 	__catch3_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
+		GError* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
 		e = _inner_error_;
 		_inner_error_ = NULL;
 		_tmp4_ = e;
 		_tmp5_ = _tmp4_->message;
-		g_warning ("panel.vala:375: Notification is failed for IBus 1.5.3: %s", _tmp5_);
+		g_warning ("panel.vala:420: Notification is failed for IBus 1.5.3: %s", _tmp5_);
 		_g_error_free0 (e);
 	}
 	__finally3:
@@ -1429,17 +1597,17 @@
 
 
 static void panel_set_version (Panel* self) {
-	GSettings* _tmp0_;
+	gchar* prev_version = NULL;
+	GSettings* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-	gchar* prev_version;
-	gchar* current_version;
-	const gchar* _tmp2_;
+	gchar* current_version = NULL;
+	const gchar* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_;
-	const gchar* _tmp6_;
-	GSettings* _tmp7_;
-	const gchar* _tmp8_;
+	const gchar* _tmp5_ = NULL;
+	const gchar* _tmp6_ = NULL;
+	GSettings* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_settings_general;
 	_tmp1_ = g_settings_get_string (_tmp0_, "version");
@@ -1469,16 +1637,16 @@
 
 
 void panel_load_settings (Panel* self) {
-	GSettings* _tmp0_;
-	gchar** _tmp1_;
+	GSettings* _tmp0_ = NULL;
+	gchar** _tmp1_ = NULL;
 	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-	GSettings* _tmp4_;
-	gchar** _tmp5_;
+	gchar** _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+	GSettings* _tmp4_ = NULL;
+	gchar** _tmp5_ = NULL;
 	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_;
-	gint _tmp7__length1;
+	gchar** _tmp7_ = NULL;
+	gint _tmp7__length1 = 0;
 	g_return_if_fail (self != NULL);
 	panel_set_use_system_keyboard_layout (self);
 	panel_set_use_global_engine (self);
@@ -1499,6 +1667,9 @@
 	panel_set_embed_preedit_text (self);
 	panel_set_custom_font (self);
 	panel_set_show_icon_on_systray (self);
+	panel_set_lookup_table_orientation (self);
+	panel_set_show_property_panel (self);
+	panel_set_timeout_property_panel (self);
 	panel_set_version (self);
 }
 
@@ -1574,43 +1745,43 @@
 
 
 static void panel_exec_setxkbmap (Panel* self, IBusEngineDesc* engine) {
-	IBusEngineDesc* _tmp0_;
+	gchar* layout = NULL;
+	IBusEngineDesc* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_;
-	gchar* layout;
-	IBusEngineDesc* _tmp3_;
+	gchar* _tmp2_ = NULL;
+	gchar* variant = NULL;
+	IBusEngineDesc* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_;
-	gchar* variant;
-	IBusEngineDesc* _tmp6_;
+	gchar* _tmp5_ = NULL;
+	gchar* option = NULL;
+	IBusEngineDesc* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_;
-	gchar* option;
-	gchar* standard_error;
-	gint exit_status;
-	gchar* _tmp9_;
+	gchar* _tmp8_ = NULL;
+	gchar* standard_error = NULL;
+	gint exit_status = 0;
+	gchar** args = NULL;
+	gchar* _tmp9_ = NULL;
 	gchar** _tmp10_ = NULL;
-	gchar** args;
-	gint args_length1;
-	gint _args_size_;
+	gint args_length1 = 0;
+	gint _args_size_ = 0;
 	gboolean _tmp11_ = FALSE;
 	gboolean _tmp12_ = FALSE;
-	const gchar* _tmp13_;
-	gboolean _tmp15_;
-	gboolean _tmp17_;
+	const gchar* _tmp13_ = NULL;
+	gboolean _tmp15_ = FALSE;
+	gboolean _tmp17_ = FALSE;
 	gboolean _tmp23_ = FALSE;
 	gboolean _tmp24_ = FALSE;
-	const gchar* _tmp25_;
-	gboolean _tmp27_;
-	gboolean _tmp29_;
+	const gchar* _tmp25_ = NULL;
+	gboolean _tmp27_ = FALSE;
+	gboolean _tmp29_ = FALSE;
 	gboolean _tmp35_ = FALSE;
 	gboolean _tmp36_ = FALSE;
-	const gchar* _tmp37_;
-	gboolean _tmp39_;
-	gboolean _tmp41_;
-	gchar** _tmp49_;
-	gint _tmp49__length1;
-	gint _tmp59_;
+	const gchar* _tmp37_ = NULL;
+	gboolean _tmp39_ = FALSE;
+	gboolean _tmp41_ = FALSE;
+	gchar** _tmp49_ = NULL;
+	gint _tmp49__length1 = 0;
+	gint _tmp59_ = 0;
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (engine != NULL);
@@ -1636,7 +1807,7 @@
 	_args_size_ = args_length1;
 	_tmp13_ = layout;
 	if (_tmp13_ != NULL) {
-		const gchar* _tmp14_;
+		const gchar* _tmp14_ = NULL;
 		_tmp14_ = layout;
 		_tmp12_ = g_strcmp0 (_tmp14_, "") != 0;
 	} else {
@@ -1644,7 +1815,7 @@
 	}
 	_tmp15_ = _tmp12_;
 	if (_tmp15_) {
-		const gchar* _tmp16_;
+		const gchar* _tmp16_ = NULL;
 		_tmp16_ = layout;
 		_tmp11_ = g_strcmp0 (_tmp16_, "default") != 0;
 	} else {
@@ -1652,13 +1823,13 @@
 	}
 	_tmp17_ = _tmp11_;
 	if (_tmp17_) {
-		gchar** _tmp18_;
-		gint _tmp18__length1;
-		gchar* _tmp19_;
-		gchar** _tmp20_;
-		gint _tmp20__length1;
-		const gchar* _tmp21_;
-		gchar* _tmp22_;
+		gchar** _tmp18_ = NULL;
+		gint _tmp18__length1 = 0;
+		gchar* _tmp19_ = NULL;
+		gchar** _tmp20_ = NULL;
+		gint _tmp20__length1 = 0;
+		const gchar* _tmp21_ = NULL;
+		gchar* _tmp22_ = NULL;
 		_tmp18_ = args;
 		_tmp18__length1 = args_length1;
 		_tmp19_ = g_strdup ("-layout");
@@ -1671,7 +1842,7 @@
 	}
 	_tmp25_ = variant;
 	if (_tmp25_ != NULL) {
-		const gchar* _tmp26_;
+		const gchar* _tmp26_ = NULL;
 		_tmp26_ = variant;
 		_tmp24_ = g_strcmp0 (_tmp26_, "") != 0;
 	} else {
@@ -1679,7 +1850,7 @@
 	}
 	_tmp27_ = _tmp24_;
 	if (_tmp27_) {
-		const gchar* _tmp28_;
+		const gchar* _tmp28_ = NULL;
 		_tmp28_ = variant;
 		_tmp23_ = g_strcmp0 (_tmp28_, "default") != 0;
 	} else {
@@ -1687,13 +1858,13 @@
 	}
 	_tmp29_ = _tmp23_;
 	if (_tmp29_) {
-		gchar** _tmp30_;
-		gint _tmp30__length1;
-		gchar* _tmp31_;
-		gchar** _tmp32_;
-		gint _tmp32__length1;
-		const gchar* _tmp33_;
-		gchar* _tmp34_;
+		gchar** _tmp30_ = NULL;
+		gint _tmp30__length1 = 0;
+		gchar* _tmp31_ = NULL;
+		gchar** _tmp32_ = NULL;
+		gint _tmp32__length1 = 0;
+		const gchar* _tmp33_ = NULL;
+		gchar* _tmp34_ = NULL;
 		_tmp30_ = args;
 		_tmp30__length1 = args_length1;
 		_tmp31_ = g_strdup ("-variant");
@@ -1706,7 +1877,7 @@
 	}
 	_tmp37_ = option;
 	if (_tmp37_ != NULL) {
-		const gchar* _tmp38_;
+		const gchar* _tmp38_ = NULL;
 		_tmp38_ = option;
 		_tmp36_ = g_strcmp0 (_tmp38_, "") != 0;
 	} else {
@@ -1714,7 +1885,7 @@
 	}
 	_tmp39_ = _tmp36_;
 	if (_tmp39_) {
-		const gchar* _tmp40_;
+		const gchar* _tmp40_ = NULL;
 		_tmp40_ = option;
 		_tmp35_ = g_strcmp0 (_tmp40_, "default") != 0;
 	} else {
@@ -1722,16 +1893,16 @@
 	}
 	_tmp41_ = _tmp35_;
 	if (_tmp41_) {
-		gchar** _tmp42_;
-		gint _tmp42__length1;
-		gchar* _tmp43_;
-		gchar** _tmp44_;
-		gint _tmp44__length1;
-		gchar* _tmp45_;
-		gchar** _tmp46_;
-		gint _tmp46__length1;
-		const gchar* _tmp47_;
-		gchar* _tmp48_;
+		gchar** _tmp42_ = NULL;
+		gint _tmp42__length1 = 0;
+		gchar* _tmp43_ = NULL;
+		gchar** _tmp44_ = NULL;
+		gint _tmp44__length1 = 0;
+		gchar* _tmp45_ = NULL;
+		gchar** _tmp46_ = NULL;
+		gint _tmp46__length1 = 0;
+		const gchar* _tmp47_ = NULL;
+		gchar* _tmp48_ = NULL;
 		_tmp42_ = args;
 		_tmp42__length1 = args_length1;
 		_tmp43_ = g_strdup ("-option");
@@ -1757,19 +1928,19 @@
 		return;
 	}
 	{
-		gchar** _tmp50_;
-		gint _tmp50__length1;
-		gchar* _tmp51_ = NULL;
-		gint _tmp52_ = 0;
-		gboolean _tmp53_ = FALSE;
-		gboolean _tmp54_;
-		_tmp50_ = args;
-		_tmp50__length1 = args_length1;
-		_tmp53_ = g_spawn_sync (NULL, _tmp50_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &_tmp51_, &_tmp52_, &_inner_error_);
+		gboolean _tmp50_ = FALSE;
+		gchar** _tmp51_ = NULL;
+		gint _tmp51__length1 = 0;
+		gchar* _tmp52_ = NULL;
+		gint _tmp53_ = 0;
+		gboolean _tmp54_ = FALSE;
+		_tmp51_ = args;
+		_tmp51__length1 = args_length1;
+		_tmp54_ = g_spawn_sync (NULL, _tmp51_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &_tmp52_, &_tmp53_, &_inner_error_);
 		_g_free0 (standard_error);
-		standard_error = _tmp51_;
-		exit_status = _tmp52_;
-		_tmp54_ = _tmp53_;
+		standard_error = _tmp52_;
+		exit_status = _tmp53_;
+		_tmp50_ = _tmp54_;
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == G_SPAWN_ERROR) {
 				goto __catch4_g_spawn_error;
@@ -1783,25 +1954,25 @@
 			g_clear_error (&_inner_error_);
 			return;
 		}
-		if (!_tmp54_) {
-			IBusEngineDesc* _tmp55_;
+		if (!_tmp50_) {
+			IBusEngineDesc* _tmp55_ = NULL;
 			const gchar* _tmp56_ = NULL;
 			_tmp55_ = engine;
 			_tmp56_ = ibus_engine_desc_get_layout (_tmp55_);
-			g_warning ("panel.vala:451: Switch xkb layout to %s failed.", _tmp56_);
+			g_warning ("panel.vala:499: Switch xkb layout to %s failed.", _tmp56_);
 		}
 	}
 	goto __finally4;
 	__catch4_g_spawn_error:
 	{
 		GError* e = NULL;
-		GError* _tmp57_;
-		const gchar* _tmp58_;
+		GError* _tmp57_ = NULL;
+		const gchar* _tmp58_ = NULL;
 		e = _inner_error_;
 		_inner_error_ = NULL;
 		_tmp57_ = e;
 		_tmp58_ = _tmp57_->message;
-		g_warning ("panel.vala:455: Execute setxkbmap failed: %s", _tmp58_);
+		g_warning ("panel.vala:503: Execute setxkbmap failed: %s", _tmp58_);
 		_g_error_free0 (e);
 	}
 	__finally4:
@@ -1817,24 +1988,24 @@
 	}
 	_tmp59_ = exit_status;
 	if (_tmp59_ != 0) {
-		const gchar* _tmp60_;
-		gchar* _tmp61_;
-		gchar* _tmp62_;
-		const gchar* _tmp63_;
-		const gchar* _tmp65_;
-		_tmp60_ = standard_error;
-		_tmp61_ = g_strdup (_tmp60_);
-		_tmp62_ = _tmp61_;
-		_tmp63_ = _tmp62_;
+		gchar* _tmp60_ = NULL;
+		const gchar* _tmp61_ = NULL;
+		gchar* _tmp62_ = NULL;
+		const gchar* _tmp63_ = NULL;
+		const gchar* _tmp65_ = NULL;
+		_tmp61_ = standard_error;
+		_tmp62_ = g_strdup (_tmp61_);
+		_tmp60_ = _tmp62_;
+		_tmp63_ = _tmp60_;
 		if (_tmp63_ == NULL) {
-			gchar* _tmp64_;
+			gchar* _tmp64_ = NULL;
 			_tmp64_ = g_strdup ("(null)");
-			_g_free0 (_tmp62_);
-			_tmp62_ = _tmp64_;
+			_g_free0 (_tmp60_);
+			_tmp60_ = _tmp64_;
 		}
-		_tmp65_ = _tmp62_;
-		g_warning ("panel.vala:459: Execute setxkbmap failed: %s", _tmp65_);
-		_g_free0 (_tmp62_);
+		_tmp65_ = _tmp60_;
+		g_warning ("panel.vala:507: Execute setxkbmap failed: %s", _tmp65_);
+		_g_free0 (_tmp60_);
 	}
 	args = (_vala_array_free (args, args_length1, (GDestroyNotify) g_free), NULL);
 	_g_free0 (standard_error);
@@ -1845,14 +2016,14 @@
 
 
 static void panel_engine_contexts_insert (Panel* self, IBusEngineDesc* engine) {
-	gboolean _tmp0_;
-	GHashTable* _tmp1_;
+	gboolean _tmp0_ = FALSE;
+	GHashTable* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-	GHashTable* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	IBusEngineDesc* _tmp7_;
-	IBusEngineDesc* _tmp8_;
+	GHashTable* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	IBusEngineDesc* _tmp7_ = NULL;
+	IBusEngineDesc* _tmp8_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (engine != NULL);
 	_tmp0_ = self->priv->m_use_global_engine;
@@ -1862,8 +2033,8 @@
 	_tmp1_ = self->priv->m_engine_contexts;
 	_tmp2_ = g_hash_table_size (_tmp1_);
 	if (_tmp2_ >= ((guint) 200)) {
-		GHashTable* _tmp3_;
-		g_warning ("panel.vala:468: Contexts by windows are too much counted!");
+		GHashTable* _tmp3_ = NULL;
+		g_warning ("panel.vala:516: Contexts by windows are too much counted!");
 		_tmp3_ = self->priv->m_engine_contexts;
 		g_hash_table_remove_all (_tmp3_);
 	}
@@ -1877,12 +2048,12 @@
 
 
 static void panel_set_engine (Panel* self, IBusEngineDesc* engine) {
-	IBusBus* _tmp0_;
-	IBusEngineDesc* _tmp1_;
+	IBusBus* _tmp0_ = NULL;
+	IBusEngineDesc* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-	gboolean _tmp6_;
-	IBusEngineDesc* _tmp8_;
+	gboolean _tmp6_ = FALSE;
+	IBusEngineDesc* _tmp8_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (engine != NULL);
 	_tmp0_ = self->priv->m_bus;
@@ -1890,16 +2061,16 @@
 	_tmp2_ = ibus_engine_desc_get_name (_tmp1_);
 	_tmp3_ = ibus_bus_set_global_engine (_tmp0_, _tmp2_);
 	if (!_tmp3_) {
-		IBusEngineDesc* _tmp4_;
+		IBusEngineDesc* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
 		_tmp4_ = engine;
 		_tmp5_ = ibus_engine_desc_get_name (_tmp4_);
-		g_warning ("panel.vala:477: Switch engine to %s failed.", _tmp5_);
+		g_warning ("panel.vala:525: Switch engine to %s failed.", _tmp5_);
 		return;
 	}
 	_tmp6_ = self->priv->m_use_system_keyboard_layout;
 	if (!_tmp6_) {
-		IBusEngineDesc* _tmp7_;
+		IBusEngineDesc* _tmp7_ = NULL;
 		_tmp7_ = engine;
 		panel_exec_setxkbmap (self, _tmp7_);
 	}
@@ -1910,24 +2081,24 @@
 
 static void panel_switch_engine (Panel* self, gint i, gboolean force) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	gboolean _tmp4_;
+	gint _tmp1_ = 0;
+	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-	gint _tmp6_;
-	gboolean _tmp8_;
-	IBusEngineDesc** _tmp9_;
-	gint _tmp9__length1;
-	gint _tmp10_;
-	IBusEngineDesc* _tmp11_;
-	IBusEngineDesc* _tmp12_;
-	IBusEngineDesc* engine;
-	IBusEngineDesc* _tmp13_;
+	gint _tmp6_ = 0;
+	gboolean _tmp8_ = FALSE;
+	IBusEngineDesc* engine = NULL;
+	IBusEngineDesc** _tmp9_ = NULL;
+	gint _tmp9__length1 = 0;
+	gint _tmp10_ = 0;
+	IBusEngineDesc* _tmp11_ = NULL;
+	IBusEngineDesc* _tmp12_ = NULL;
+	IBusEngineDesc* _tmp13_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp1_ = i;
 	if (_tmp1_ >= 0) {
-		gint _tmp2_;
-		IBusEngineDesc** _tmp3_;
-		gint _tmp3__length1;
+		gint _tmp2_ = 0;
+		IBusEngineDesc** _tmp3_ = NULL;
+		gint _tmp3__length1 = 0;
 		_tmp2_ = i;
 		_tmp3_ = self->priv->m_engines;
 		_tmp3__length1 = self->priv->m_engines_length1;
@@ -1939,7 +2110,7 @@
 	_vala_assert (_tmp4_, "i >= 0 && i < m_engines.length");
 	_tmp6_ = i;
 	if (_tmp6_ == 0) {
-		gboolean _tmp7_;
+		gboolean _tmp7_ = FALSE;
 		_tmp7_ = force;
 		_tmp5_ = !_tmp7_;
 	} else {
@@ -1962,29 +2133,29 @@
 
 
 static void panel_handle_engine_switch (Panel* self, GdkEvent* event, gboolean revert) {
-	IBusEngineDesc** _tmp0_;
-	gint _tmp0__length1;
-	GdkEvent* _tmp1_;
-	GdkEventKey _tmp2_;
-	guint _tmp3_;
-	guint keyval;
-	GdkEvent* _tmp4_;
-	GdkEventKey _tmp5_;
-	GdkModifierType _tmp6_;
-	guint modifiers;
-	GdkEvent* _tmp7_;
-	GdkEventKey _tmp8_;
-	GdkModifierType _tmp9_;
+	IBusEngineDesc** _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
+	guint keyval = 0U;
+	GdkEvent* _tmp1_ = NULL;
+	GdkEventKey _tmp2_ = {0};
+	guint _tmp3_ = 0U;
+	guint modifiers = 0U;
+	GdkEvent* _tmp4_ = NULL;
+	GdkEventKey _tmp5_ = {0};
+	GdkModifierType _tmp6_ = 0;
+	guint primary_modifiers = 0U;
+	GdkEvent* _tmp7_ = NULL;
+	GdkEventKey _tmp8_ = {0};
+	GdkModifierType _tmp9_ = 0;
 	GdkModifierType _tmp10_ = 0;
-	guint primary_modifiers;
-	GdkEvent* _tmp11_;
-	guint _tmp12_;
+	gboolean pressed = FALSE;
+	GdkEvent* _tmp11_ = NULL;
+	guint _tmp12_ = 0U;
 	gboolean _tmp13_ = FALSE;
-	gboolean pressed;
-	gboolean _tmp14_;
+	gboolean _tmp14_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-	gboolean _tmp17_;
-	gboolean _tmp19_;
+	gboolean _tmp17_ = FALSE;
+	gboolean _tmp19_ = FALSE;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (event != NULL);
 	_tmp0_ = self->priv->m_engines;
@@ -2011,13 +2182,13 @@
 	pressed = _tmp13_;
 	_tmp14_ = revert;
 	if (_tmp14_) {
-		guint _tmp15_;
+		guint _tmp15_ = 0U;
 		_tmp15_ = modifiers;
 		modifiers = _tmp15_ & (~GDK_SHIFT_MASK);
 	}
 	_tmp17_ = pressed;
 	if (_tmp17_) {
-		gint _tmp18_;
+		gint _tmp18_ = 0;
 		_tmp18_ = self->priv->m_switcher_delay_time;
 		_tmp16_ = _tmp18_ >= 0;
 	} else {
@@ -2026,22 +2197,22 @@
 	_tmp19_ = _tmp16_;
 	if (_tmp19_) {
 		gint _tmp20_ = 0;
-		gboolean _tmp21_;
-		gint _tmp23_;
-		gint i;
-		Switcher* _tmp24_;
-		guint _tmp25_;
-		guint _tmp26_;
-		GdkEvent* _tmp27_;
-		IBusEngineDesc** _tmp28_;
-		gint _tmp28__length1;
-		gint _tmp29_;
+		gboolean _tmp21_ = FALSE;
+		gint i = 0;
+		gint _tmp23_ = 0;
+		Switcher* _tmp24_ = NULL;
+		guint _tmp25_ = 0U;
+		guint _tmp26_ = 0U;
+		GdkEvent* _tmp27_ = NULL;
+		IBusEngineDesc** _tmp28_ = NULL;
+		gint _tmp28__length1 = 0;
+		gint _tmp29_ = 0;
 		gint _tmp30_ = 0;
-		gint _tmp31_;
+		gint _tmp31_ = 0;
 		_tmp21_ = revert;
 		if (_tmp21_) {
-			IBusEngineDesc** _tmp22_;
-			gint _tmp22__length1;
+			IBusEngineDesc** _tmp22_ = NULL;
+			gint _tmp22__length1 = 0;
 			_tmp22_ = self->priv->m_engines;
 			_tmp22__length1 = self->priv->m_engines_length1;
 			_tmp20_ = _tmp22__length1 - 1;
@@ -2063,12 +2234,12 @@
 		self->priv->m_switcher_is_running = FALSE;
 		_tmp31_ = i;
 		if (_tmp31_ < 0) {
-			g_debug ("panel.vala:535: switch cancelled");
+			g_debug ("panel.vala:583: switch cancelled");
 		} else {
-			gint _tmp32_;
-			IBusEngineDesc** _tmp33_;
-			gint _tmp33__length1;
-			gint _tmp34_;
+			gint _tmp32_ = 0;
+			IBusEngineDesc** _tmp33_ = NULL;
+			gint _tmp33__length1 = 0;
+			gint _tmp34_ = 0;
 			_tmp32_ = i;
 			_tmp33_ = self->priv->m_engines;
 			_tmp33__length1 = self->priv->m_engines_length1;
@@ -2078,14 +2249,14 @@
 		}
 	} else {
 		gint _tmp35_ = 0;
-		gboolean _tmp36_;
-		gint _tmp38_;
-		gint i;
-		gint _tmp39_;
+		gboolean _tmp36_ = FALSE;
+		gint i = 0;
+		gint _tmp38_ = 0;
+		gint _tmp39_ = 0;
 		_tmp36_ = revert;
 		if (_tmp36_) {
-			IBusEngineDesc** _tmp37_;
-			gint _tmp37__length1;
+			IBusEngineDesc** _tmp37_ = NULL;
+			gint _tmp37__length1 = 0;
 			_tmp37_ = self->priv->m_engines;
 			_tmp37__length1 = self->priv->m_engines_length1;
 			_tmp35_ = _tmp37__length1 - 1;
@@ -2111,24 +2282,24 @@
 
 
 static void panel_run_preload_engines (Panel* self, IBusEngineDesc** engines, int engines_length1, gint index) {
+	gchar** names = NULL;
 	gchar** _tmp0_ = NULL;
-	gchar** names;
-	gint names_length1;
-	gint _names_size_;
-	IBusEngineDesc** _tmp1_;
-	gint _tmp1__length1;
-	gint _tmp2_;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-	IBusEngineDesc** _tmp4_;
-	gint _tmp4__length1;
-	gint _tmp5_;
-	IBusEngineDesc* _tmp6_;
+	gint names_length1 = 0;
+	gint _names_size_ = 0;
+	IBusEngineDesc** _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
+	gint _tmp2_ = 0;
+	gchar** _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+	IBusEngineDesc** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	gint _tmp5_ = 0;
+	IBusEngineDesc* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_;
-	IBusBus* _tmp9_;
-	gchar** _tmp10_;
-	gint _tmp10__length1;
+	gchar* _tmp8_ = NULL;
+	IBusBus* _tmp9_ = NULL;
+	gchar** _tmp10_ = NULL;
+	gint _tmp10__length1 = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
 	names = _tmp0_;
@@ -2163,7 +2334,7 @@
 	int i;
 	result = g_new0 (gchar*, length + 1);
 	for (i = 0; i < length; i++) {
-		gchar* _tmp0_;
+		gchar* _tmp0_ = NULL;
 		_tmp0_ = g_strdup (self[i]);
 		result[i] = _tmp0_;
 	}
@@ -2207,7 +2378,7 @@
 	int i;
 	result = g_new0 (IBusEngineDesc*, length + 1);
 	for (i = 0; i < length; i++) {
-		IBusEngineDesc* _tmp0_;
+		IBusEngineDesc* _tmp0_ = NULL;
 		_tmp0_ = _g_object_ref0 (self[i]);
 		result[i] = _tmp0_;
 	}
@@ -2220,7 +2391,7 @@
 	int i;
 	result = g_new0 (IBusEngineDesc*, length + 1);
 	for (i = 0; i < length; i++) {
-		IBusEngineDesc* _tmp0_;
+		IBusEngineDesc* _tmp0_ = NULL;
 		_tmp0_ = _g_object_ref0 (self[i]);
 		result[i] = _tmp0_;
 	}
@@ -2229,35 +2400,35 @@
 
 
 static void panel_update_engines (Panel* self, gchar** unowned_engine_names, int unowned_engine_names_length1, gchar** order_names, int order_names_length1) {
-	gchar** _tmp0_;
-	gint _tmp0__length1;
-	gchar** _tmp1_;
-	gint _tmp1__length1;
-	gchar** engine_names;
-	gint engine_names_length1;
-	gint _engine_names_size_;
+	gchar** engine_names = NULL;
+	gchar** _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
+	gchar** _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
+	gint engine_names_length1 = 0;
+	gint _engine_names_size_ = 0;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-	gboolean _tmp5_;
+	gchar** _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+	gboolean _tmp5_ = FALSE;
+	gchar** names = NULL;
 	gchar** _tmp8_ = NULL;
-	gchar** names;
-	gint names_length1;
-	gint _names_size_;
-	gchar** _tmp9_;
-	gint _tmp9__length1;
-	gchar** _tmp16_;
-	gint _tmp16__length1;
-	IBusBus* _tmp23_;
-	gchar** _tmp24_;
-	gint _tmp24__length1;
-	IBusEngineDesc** _tmp25_;
+	gint names_length1 = 0;
+	gint _names_size_ = 0;
+	gchar** _tmp9_ = NULL;
+	gint _tmp9__length1 = 0;
+	gchar** _tmp16_ = NULL;
+	gint _tmp16__length1 = 0;
+	IBusEngineDesc** engines = NULL;
+	IBusBus* _tmp23_ = NULL;
+	gchar** _tmp24_ = NULL;
+	gint _tmp24__length1 = 0;
+	IBusEngineDesc** _tmp25_ = NULL;
 	IBusEngineDesc** _tmp26_ = NULL;
-	IBusEngineDesc** engines;
-	gint engines_length1;
-	gint _engines_size_;
-	IBusEngineDesc** _tmp27_;
-	gint _tmp27__length1;
+	gint engines_length1 = 0;
+	gint _engines_size_ = 0;
+	IBusEngineDesc** _tmp27_ = NULL;
+	gint _tmp27__length1 = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = unowned_engine_names;
 	_tmp0__length1 = unowned_engine_names_length1;
@@ -2271,15 +2442,15 @@
 	if (_tmp3_ == NULL) {
 		_tmp2_ = TRUE;
 	} else {
-		gchar** _tmp4_;
-		gint _tmp4__length1;
+		gchar** _tmp4_ = NULL;
+		gint _tmp4__length1 = 0;
 		_tmp4_ = engine_names;
 		_tmp4__length1 = engine_names_length1;
 		_tmp2_ = _tmp4__length1 == 0;
 	}
 	_tmp5_ = _tmp2_;
 	if (_tmp5_) {
-		gchar* _tmp6_;
+		gchar* _tmp6_ = NULL;
 		gchar** _tmp7_ = NULL;
 		_tmp6_ = g_strdup ("xkb:us::eng");
 		_tmp7_ = g_new0 (gchar*, 1 + 1);
@@ -2303,22 +2474,22 @@
 		name_collection = _tmp9_;
 		name_collection_length1 = _tmp9__length1;
 		for (name_it = 0; name_it < _tmp9__length1; name_it = name_it + 1) {
-			gchar* _tmp10_;
+			gchar* _tmp10_ = NULL;
 			gchar* name = NULL;
 			_tmp10_ = g_strdup (name_collection[name_it]);
 			name = _tmp10_;
 			{
-				const gchar* _tmp11_;
-				gchar** _tmp12_;
-				gint _tmp12__length1;
+				const gchar* _tmp11_ = NULL;
+				gchar** _tmp12_ = NULL;
+				gint _tmp12__length1 = 0;
 				_tmp11_ = name;
 				_tmp12_ = engine_names;
 				_tmp12__length1 = engine_names_length1;
 				if (_vala_string_array_contains (_tmp12_, _tmp12__length1, _tmp11_)) {
-					gchar** _tmp13_;
-					gint _tmp13__length1;
-					const gchar* _tmp14_;
-					gchar* _tmp15_;
+					gchar** _tmp13_ = NULL;
+					gint _tmp13__length1 = 0;
+					const gchar* _tmp14_ = NULL;
+					gchar* _tmp15_ = NULL;
 					_tmp13_ = names;
 					_tmp13__length1 = names_length1;
 					_tmp14_ = name;
@@ -2339,18 +2510,18 @@
 		name_collection = _tmp16_;
 		name_collection_length1 = _tmp16__length1;
 		for (name_it = 0; name_it < _tmp16__length1; name_it = name_it + 1) {
-			gchar* _tmp17_;
+			gchar* _tmp17_ = NULL;
 			gchar* name = NULL;
 			_tmp17_ = g_strdup (name_collection[name_it]);
 			name = _tmp17_;
 			{
-				const gchar* _tmp18_;
-				gchar** _tmp19_;
-				gint _tmp19__length1;
-				gchar** _tmp20_;
-				gint _tmp20__length1;
-				const gchar* _tmp21_;
-				gchar* _tmp22_;
+				const gchar* _tmp18_ = NULL;
+				gchar** _tmp19_ = NULL;
+				gint _tmp19__length1 = 0;
+				gchar** _tmp20_ = NULL;
+				gint _tmp20__length1 = 0;
+				const gchar* _tmp21_ = NULL;
+				gchar* _tmp22_ = NULL;
 				_tmp18_ = name;
 				_tmp19_ = names;
 				_tmp19__length1 = names_length1;
@@ -2377,12 +2548,12 @@
 	_tmp27_ = self->priv->m_engines;
 	_tmp27__length1 = self->priv->m_engines_length1;
 	if (_tmp27__length1 == 0) {
-		IBusEngineDesc** _tmp28_;
-		gint _tmp28__length1;
-		IBusEngineDesc** _tmp29_;
-		gint _tmp29__length1;
-		IBusEngineDesc** _tmp30_;
-		gint _tmp30__length1;
+		IBusEngineDesc** _tmp28_ = NULL;
+		gint _tmp28__length1 = 0;
+		IBusEngineDesc** _tmp29_ = NULL;
+		gint _tmp29__length1 = 0;
+		IBusEngineDesc** _tmp30_ = NULL;
+		gint _tmp30__length1 = 0;
 		_tmp28_ = engines;
 		_tmp28__length1 = engines_length1;
 		_tmp29_ = (_tmp28_ != NULL) ? _vala_array_dup3 (_tmp28_, _tmp28__length1) : ((gpointer) _tmp28_);
@@ -2396,18 +2567,18 @@
 		_tmp30__length1 = engines_length1;
 		panel_run_preload_engines (self, _tmp30_, _tmp30__length1, 1);
 	} else {
-		IBusEngineDesc** _tmp31_;
-		gint _tmp31__length1;
-		IBusEngineDesc* _tmp32_;
-		IBusEngineDesc* _tmp33_;
-		IBusEngineDesc* current_engine;
-		IBusEngineDesc** _tmp34_;
-		gint _tmp34__length1;
-		IBusEngineDesc** _tmp35_;
-		gint _tmp35__length1;
+		IBusEngineDesc* current_engine = NULL;
+		IBusEngineDesc** _tmp31_ = NULL;
+		gint _tmp31__length1 = 0;
+		IBusEngineDesc* _tmp32_ = NULL;
+		IBusEngineDesc* _tmp33_ = NULL;
+		IBusEngineDesc** _tmp34_ = NULL;
+		gint _tmp34__length1 = 0;
+		IBusEngineDesc** _tmp35_ = NULL;
+		gint _tmp35__length1 = 0;
 		gint i = 0;
-		IBusEngineDesc** _tmp51_;
-		gint _tmp51__length1;
+		IBusEngineDesc** _tmp51_ = NULL;
+		gint _tmp51__length1 = 0;
 		_tmp31_ = self->priv->m_engines;
 		_tmp31__length1 = self->priv->m_engines_length1;
 		_tmp32_ = _tmp31_[0];
@@ -2422,24 +2593,24 @@
 		self->priv->m_engines_length1 = _tmp35__length1;
 		self->priv->_m_engines_size_ = self->priv->m_engines_length1;
 		{
-			gboolean _tmp36_;
+			gboolean _tmp36_ = FALSE;
 			i = 0;
 			_tmp36_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp37_;
-				gint _tmp39_;
-				IBusEngineDesc** _tmp40_;
-				gint _tmp40__length1;
-				IBusEngineDesc* _tmp41_;
+				gboolean _tmp37_ = FALSE;
+				gint _tmp39_ = 0;
+				IBusEngineDesc** _tmp40_ = NULL;
+				gint _tmp40__length1 = 0;
+				IBusEngineDesc* _tmp41_ = NULL;
 				const gchar* _tmp42_ = NULL;
-				IBusEngineDesc** _tmp43_;
-				gint _tmp43__length1;
-				gint _tmp44_;
-				IBusEngineDesc* _tmp45_;
+				IBusEngineDesc** _tmp43_ = NULL;
+				gint _tmp43__length1 = 0;
+				gint _tmp44_ = 0;
+				IBusEngineDesc* _tmp45_ = NULL;
 				const gchar* _tmp46_ = NULL;
 				_tmp37_ = _tmp36_;
 				if (!_tmp37_) {
-					gint _tmp38_;
+					gint _tmp38_ = 0;
 					_tmp38_ = i;
 					i = _tmp38_ + 1;
 				}
@@ -2458,20 +2629,20 @@
 				_tmp45_ = _tmp43_[_tmp44_];
 				_tmp46_ = ibus_engine_desc_get_name (_tmp45_);
 				if (g_strcmp0 (_tmp42_, _tmp46_) == 0) {
-					gint _tmp47_;
-					gint _tmp48_;
+					gint _tmp47_ = 0;
+					gint _tmp48_ = 0;
 					_tmp47_ = i;
 					panel_switch_engine (self, _tmp47_, FALSE);
 					_tmp48_ = i;
 					if (_tmp48_ != 0) {
-						IBusEngineDesc** _tmp49_;
-						gint _tmp49__length1;
+						IBusEngineDesc** _tmp49_ = NULL;
+						gint _tmp49__length1 = 0;
 						_tmp49_ = engines;
 						_tmp49__length1 = engines_length1;
 						panel_run_preload_engines (self, _tmp49_, _tmp49__length1, 0);
 					} else {
-						IBusEngineDesc** _tmp50_;
-						gint _tmp50__length1;
+						IBusEngineDesc** _tmp50_ = NULL;
+						gint _tmp50__length1 = 0;
 						_tmp50_ = engines;
 						_tmp50__length1 = engines_length1;
 						panel_run_preload_engines (self, _tmp50_, _tmp50__length1, 1);
@@ -2496,10 +2667,10 @@
 }
 
 
-static void __lambda29_ (Panel* self, GPid pid, gint state) {
-	GPid _tmp0_;
-	GPid _tmp1_;
-	GPid _tmp2_;
+static void __lambda38_ (Panel* self, GPid pid, gint state) {
+	GPid _tmp0_ = 0;
+	GPid _tmp1_ = 0;
+	GPid _tmp2_ = 0;
 	_tmp0_ = pid;
 	_tmp1_ = self->priv->m_setup_pid;
 	if (_tmp0_ != _tmp1_) {
@@ -2511,21 +2682,21 @@
 }
 
 
-static void ___lambda29__gchild_watch_func (GPid pid, gint status, gpointer self) {
-	__lambda29_ (self, pid, status);
+static void ___lambda38__gchild_watch_func (GPid pid, gint status, gpointer self) {
+	__lambda38_ (self, pid, status);
 }
 
 
 static void panel_show_setup_dialog (Panel* self) {
-	GPid _tmp0_;
+	GPid _tmp0_ = 0;
+	gchar* binary = NULL;
 	gchar* _tmp3_ = NULL;
-	gchar* binary;
-	GPid _tmp13_;
+	GPid _tmp13_ = 0;
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_setup_pid;
 	if (_tmp0_ != ((GPid) 0)) {
-		GPid _tmp1_;
+		GPid _tmp1_ = 0;
 		gint _tmp2_ = 0;
 		_tmp1_ = self->priv->m_setup_pid;
 		_tmp2_ = kill ((pid_t) _tmp1_, SIGUSR1);
@@ -2537,12 +2708,12 @@
 	_tmp3_ = g_build_filename (BINDIR, "ibus-setup", NULL);
 	binary = _tmp3_;
 	{
-		const gchar* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
+		const gchar* _tmp4_ = NULL;
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
 		gchar** _tmp7_ = NULL;
-		gchar** _tmp8_;
-		gint _tmp8__length1;
+		gchar** _tmp8_ = NULL;
+		gint _tmp8__length1 = 0;
 		GPid _tmp9_ = 0;
 		_tmp4_ = binary;
 		_tmp5_ = g_strdup (_tmp4_);
@@ -2569,15 +2740,15 @@
 	__catch5_g_spawn_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp10_;
-		GError* _tmp11_;
-		const gchar* _tmp12_;
+		const gchar* _tmp10_ = NULL;
+		GError* _tmp11_ = NULL;
+		const gchar* _tmp12_ = NULL;
 		e = _inner_error_;
 		_inner_error_ = NULL;
 		_tmp10_ = binary;
 		_tmp11_ = e;
 		_tmp12_ = _tmp11_->message;
-		g_warning ("panel.vala:620: Execute %s failed! %s", _tmp10_, _tmp12_);
+		g_warning ("panel.vala:668: Execute %s failed! %s", _tmp10_, _tmp12_);
 		self->priv->m_setup_pid = (GPid) 0;
 		_g_error_free0 (e);
 	}
@@ -2589,44 +2760,43 @@
 		return;
 	}
 	_tmp13_ = self->priv->m_setup_pid;
-	g_child_watch_add_full (G_PRIORITY_DEFAULT_IDLE, _tmp13_, ___lambda29__gchild_watch_func, g_object_ref (self), g_object_unref);
+	g_child_watch_add_full (G_PRIORITY_DEFAULT_IDLE, _tmp13_, ___lambda38__gchild_watch_func, g_object_ref (self), g_object_unref);
 	_g_free0 (binary);
 }
 
 
 static void panel_show_about_dialog (Panel* self) {
-	GtkAboutDialog* _tmp0_;
-	GtkAboutDialog* _tmp24_;
-	gboolean _tmp25_ = FALSE;
+	GtkAboutDialog* _tmp0_ = NULL;
+	GtkAboutDialog* _tmp23_ = NULL;
+	gboolean _tmp24_ = FALSE;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_about_dialog;
 	if (_tmp0_ == NULL) {
-		GtkAboutDialog* _tmp1_;
-		GtkAboutDialog* _tmp2_;
-		GtkAboutDialog* _tmp3_;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_;
-		gchar* copyright;
-		GtkAboutDialog* _tmp6_;
-		const gchar* _tmp7_;
-		GtkAboutDialog* _tmp8_;
-		GtkAboutDialog* _tmp9_;
-		const gchar* _tmp10_ = NULL;
-		GtkAboutDialog* _tmp11_;
-		GtkAboutDialog* _tmp12_;
-		gchar* _tmp13_;
+		GtkAboutDialog* _tmp1_ = NULL;
+		GtkAboutDialog* _tmp2_ = NULL;
+		GtkAboutDialog* _tmp3_ = NULL;
+		gchar* copyright = NULL;
+		gchar* _tmp4_ = NULL;
+		GtkAboutDialog* _tmp5_ = NULL;
+		const gchar* _tmp6_ = NULL;
+		GtkAboutDialog* _tmp7_ = NULL;
+		GtkAboutDialog* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+		GtkAboutDialog* _tmp10_ = NULL;
+		GtkAboutDialog* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
+		gchar** _tmp13_ = NULL;
 		gchar** _tmp14_ = NULL;
-		gchar** _tmp15_;
-		gint _tmp15__length1;
-		GtkAboutDialog* _tmp16_;
-		gchar* _tmp17_;
+		gint _tmp14__length1 = 0;
+		GtkAboutDialog* _tmp15_ = NULL;
+		gchar* _tmp16_ = NULL;
+		gchar** _tmp17_ = NULL;
 		gchar** _tmp18_ = NULL;
-		gchar** _tmp19_;
-		gint _tmp19__length1;
-		GtkAboutDialog* _tmp20_;
-		const gchar* _tmp21_ = NULL;
-		GtkAboutDialog* _tmp22_;
-		GtkAboutDialog* _tmp23_;
+		gint _tmp18__length1 = 0;
+		GtkAboutDialog* _tmp19_ = NULL;
+		const gchar* _tmp20_ = NULL;
+		GtkAboutDialog* _tmp21_ = NULL;
+		GtkAboutDialog* _tmp22_ = NULL;
 		_tmp1_ = (GtkAboutDialog*) gtk_about_dialog_new ();
 		g_object_ref_sink (_tmp1_);
 		_g_object_unref0 (self->priv->m_about_dialog);
@@ -2635,106 +2805,105 @@
 		gtk_about_dialog_set_program_name (_tmp2_, "IBus");
 		_tmp3_ = self->priv->m_about_dialog;
 		gtk_about_dialog_set_version (_tmp3_, PACKAGE_VERSION);
-		_tmp4_ = _ ("Copyright (c) 2007-2012 Peng Huang\n" "Copyright (c) 2007-2010 Red Hat, Inc.\n");
-		_tmp5_ = g_strdup (_tmp4_);
-		copyright = _tmp5_;
-		_tmp6_ = self->priv->m_about_dialog;
-		_tmp7_ = copyright;
-		gtk_about_dialog_set_copyright (_tmp6_, _tmp7_);
+		_tmp4_ = g_strdup ("Copyright © 2007-2013 Peng Huang\n" "Copyright © 2007-2013 Red Hat, Inc.\n");
+		copyright = _tmp4_;
+		_tmp5_ = self->priv->m_about_dialog;
+		_tmp6_ = copyright;
+		gtk_about_dialog_set_copyright (_tmp5_, _tmp6_);
+		_tmp7_ = self->priv->m_about_dialog;
+		gtk_about_dialog_set_license (_tmp7_, "LGPL");
 		_tmp8_ = self->priv->m_about_dialog;
-		gtk_about_dialog_set_license (_tmp8_, "LGPL");
-		_tmp9_ = self->priv->m_about_dialog;
-		_tmp10_ = _ ("IBus is an intelligent input bus for Linux/Unix.");
-		gtk_about_dialog_set_comments (_tmp9_, _tmp10_);
+		_tmp9_ = _ ("IBus is an intelligent input bus for Linux/Unix.");
+		gtk_about_dialog_set_comments (_tmp8_, _tmp9_);
+		_tmp10_ = self->priv->m_about_dialog;
+		gtk_about_dialog_set_website (_tmp10_, "http://code.google.com/p/ibus");
 		_tmp11_ = self->priv->m_about_dialog;
-		gtk_about_dialog_set_website (_tmp11_, "http://code.google.com/p/ibus");
-		_tmp12_ = self->priv->m_about_dialog;
-		_tmp13_ = g_strdup ("Peng Huang ");
-		_tmp14_ = g_new0 (gchar*, 1 + 1);
-		_tmp14_[0] = _tmp13_;
-		_tmp15_ = _tmp14_;
-		_tmp15__length1 = 1;
-		gtk_about_dialog_set_authors (_tmp12_, _tmp15_);
-		_tmp15_ = (_vala_array_free (_tmp15_, _tmp15__length1, (GDestroyNotify) g_free), NULL);
-		_tmp16_ = self->priv->m_about_dialog;
-		_tmp17_ = g_strdup ("Peng Huang ");
-		_tmp18_ = g_new0 (gchar*, 1 + 1);
-		_tmp18_[0] = _tmp17_;
-		_tmp19_ = _tmp18_;
-		_tmp19__length1 = 1;
-		gtk_about_dialog_set_documenters (_tmp16_, _tmp19_);
-		_tmp19_ = (_vala_array_free (_tmp19_, _tmp19__length1, (GDestroyNotify) g_free), NULL);
-		_tmp20_ = self->priv->m_about_dialog;
-		_tmp21_ = _ ("translator-credits");
-		gtk_about_dialog_set_translator_credits (_tmp20_, _tmp21_);
+		_tmp12_ = g_strdup ("Peng Huang ");
+		_tmp13_ = g_new0 (gchar*, 1 + 1);
+		_tmp13_[0] = _tmp12_;
+		_tmp14_ = _tmp13_;
+		_tmp14__length1 = 1;
+		gtk_about_dialog_set_authors (_tmp11_, _tmp14_);
+		_tmp14_ = (_vala_array_free (_tmp14_, _tmp14__length1, (GDestroyNotify) g_free), NULL);
+		_tmp15_ = self->priv->m_about_dialog;
+		_tmp16_ = g_strdup ("Peng Huang ");
+		_tmp17_ = g_new0 (gchar*, 1 + 1);
+		_tmp17_[0] = _tmp16_;
+		_tmp18_ = _tmp17_;
+		_tmp18__length1 = 1;
+		gtk_about_dialog_set_documenters (_tmp15_, _tmp18_);
+		_tmp18_ = (_vala_array_free (_tmp18_, _tmp18__length1, (GDestroyNotify) g_free), NULL);
+		_tmp19_ = self->priv->m_about_dialog;
+		_tmp20_ = _ ("translator-credits");
+		gtk_about_dialog_set_translator_credits (_tmp19_, _tmp20_);
+		_tmp21_ = self->priv->m_about_dialog;
+		gtk_about_dialog_set_logo_icon_name (_tmp21_, "ibus");
 		_tmp22_ = self->priv->m_about_dialog;
-		gtk_about_dialog_set_logo_icon_name (_tmp22_, "ibus");
-		_tmp23_ = self->priv->m_about_dialog;
-		gtk_window_set_icon_name ((GtkWindow*) _tmp23_, "ibus");
+		gtk_window_set_icon_name ((GtkWindow*) _tmp22_, "ibus");
 		_g_free0 (copyright);
 	}
-	_tmp24_ = self->priv->m_about_dialog;
-	_tmp25_ = gtk_widget_get_visible ((GtkWidget*) _tmp24_);
-	if (!_tmp25_) {
-		GtkAboutDialog* _tmp26_;
-		GtkAboutDialog* _tmp27_;
+	_tmp23_ = self->priv->m_about_dialog;
+	_tmp24_ = gtk_widget_get_visible ((GtkWidget*) _tmp23_);
+	if (!_tmp24_) {
+		GtkAboutDialog* _tmp25_ = NULL;
+		GtkAboutDialog* _tmp26_ = NULL;
+		_tmp25_ = self->priv->m_about_dialog;
+		gtk_dialog_run ((GtkDialog*) _tmp25_);
 		_tmp26_ = self->priv->m_about_dialog;
-		gtk_dialog_run ((GtkDialog*) _tmp26_);
-		_tmp27_ = self->priv->m_about_dialog;
-		gtk_widget_hide ((GtkWidget*) _tmp27_);
+		gtk_widget_hide ((GtkWidget*) _tmp26_);
 	} else {
-		GtkAboutDialog* _tmp28_;
-		_tmp28_ = self->priv->m_about_dialog;
-		gtk_window_present ((GtkWindow*) _tmp28_);
+		GtkAboutDialog* _tmp27_ = NULL;
+		_tmp27_ = self->priv->m_about_dialog;
+		gtk_window_present ((GtkWindow*) _tmp27_);
 	}
 }
 
 
-static void ___lambda28_ (Panel* self, GtkMenuItem* i) {
+static void ___lambda37_ (Panel* self, GtkMenuItem* i) {
 	g_return_if_fail (i != NULL);
 	panel_show_setup_dialog (self);
 }
 
 
-static void ____lambda28__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-	___lambda28_ (self, _sender);
+static void ____lambda37__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+	___lambda37_ (self, _sender);
 }
 
 
-static void ___lambda30_ (Panel* self, GtkMenuItem* i) {
+static void ___lambda39_ (Panel* self, GtkMenuItem* i) {
 	g_return_if_fail (i != NULL);
 	panel_show_about_dialog (self);
 }
 
 
-static void ____lambda30__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-	___lambda30_ (self, _sender);
+static void ____lambda39__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+	___lambda39_ (self, _sender);
 }
 
 
-static void ___lambda31_ (Panel* self, GtkMenuItem* i) {
-	IBusBus* _tmp0_;
+static void ___lambda40_ (Panel* self, GtkMenuItem* i) {
+	IBusBus* _tmp0_ = NULL;
 	g_return_if_fail (i != NULL);
 	_tmp0_ = self->priv->m_bus;
 	ibus_bus_exit (_tmp0_, TRUE);
 }
 
 
-static void ____lambda31__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-	___lambda31_ (self, _sender);
+static void ____lambda40__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+	___lambda40_ (self, _sender);
 }
 
 
-static void ___lambda32_ (Panel* self, GtkMenuItem* i) {
-	IBusBus* _tmp0_;
+static void ___lambda41_ (Panel* self, GtkMenuItem* i) {
+	IBusBus* _tmp0_ = NULL;
 	g_return_if_fail (i != NULL);
 	_tmp0_ = self->priv->m_bus;
 	ibus_bus_exit (_tmp0_, FALSE);
 }
 
 
-static void ____lambda32__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-	___lambda32_ (self, _sender);
+static void ____lambda41__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+	___lambda41_ (self, _sender);
 }
 
 
@@ -2744,38 +2913,38 @@
 
 
 static void panel_status_icon_popup_menu_cb (Panel* self, GtkStatusIcon* status_icon, guint button, guint activate_time) {
-	GtkMenu* _tmp0_;
-	GtkMenu* _tmp24_;
-	GtkStatusIcon* _tmp25_;
+	GtkMenu* _tmp0_ = NULL;
+	GtkMenu* _tmp24_ = NULL;
+	GtkStatusIcon* _tmp25_ = NULL;
 	guint32 _tmp26_ = 0U;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (status_icon != NULL);
 	_tmp0_ = self->priv->m_sys_menu;
 	if (_tmp0_ == NULL) {
 		GtkImageMenuItem* item = NULL;
-		GtkMenu* _tmp1_;
-		GtkImageMenuItem* _tmp2_;
-		GtkImageMenuItem* _tmp3_;
-		GtkMenu* _tmp4_;
-		GtkImageMenuItem* _tmp5_;
-		GtkImageMenuItem* _tmp6_;
-		GtkImageMenuItem* _tmp7_;
-		GtkMenu* _tmp8_;
-		GtkImageMenuItem* _tmp9_;
-		GtkMenu* _tmp10_;
-		GtkSeparatorMenuItem* _tmp11_;
-		GtkSeparatorMenuItem* _tmp12_;
-		GtkImageMenuItem* _tmp13_;
-		GtkImageMenuItem* _tmp14_;
+		GtkMenu* _tmp1_ = NULL;
+		GtkImageMenuItem* _tmp2_ = NULL;
+		GtkImageMenuItem* _tmp3_ = NULL;
+		GtkMenu* _tmp4_ = NULL;
+		GtkImageMenuItem* _tmp5_ = NULL;
+		GtkImageMenuItem* _tmp6_ = NULL;
+		GtkImageMenuItem* _tmp7_ = NULL;
+		GtkMenu* _tmp8_ = NULL;
+		GtkImageMenuItem* _tmp9_ = NULL;
+		GtkMenu* _tmp10_ = NULL;
+		GtkSeparatorMenuItem* _tmp11_ = NULL;
+		GtkSeparatorMenuItem* _tmp12_ = NULL;
+		GtkImageMenuItem* _tmp13_ = NULL;
+		GtkImageMenuItem* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
-		GtkImageMenuItem* _tmp16_;
-		GtkMenu* _tmp17_;
-		GtkImageMenuItem* _tmp18_;
-		GtkImageMenuItem* _tmp19_;
-		GtkImageMenuItem* _tmp20_;
-		GtkMenu* _tmp21_;
-		GtkImageMenuItem* _tmp22_;
-		GtkMenu* _tmp23_;
+		GtkImageMenuItem* _tmp16_ = NULL;
+		GtkMenu* _tmp17_ = NULL;
+		GtkImageMenuItem* _tmp18_ = NULL;
+		GtkImageMenuItem* _tmp19_ = NULL;
+		GtkImageMenuItem* _tmp20_ = NULL;
+		GtkMenu* _tmp21_ = NULL;
+		GtkImageMenuItem* _tmp22_ = NULL;
+		GtkMenu* _tmp23_ = NULL;
 		_tmp1_ = (GtkMenu*) gtk_menu_new ();
 		g_object_ref_sink (_tmp1_);
 		_g_object_unref0 (self->priv->m_sys_menu);
@@ -2785,7 +2954,7 @@
 		_g_object_unref0 (item);
 		item = _tmp2_;
 		_tmp3_ = item;
-		g_signal_connect_object ((GtkMenuItem*) _tmp3_, "activate", (GCallback) ____lambda28__gtk_menu_item_activate, self, 0);
+		g_signal_connect_object ((GtkMenuItem*) _tmp3_, "activate", (GCallback) ____lambda37__gtk_menu_item_activate, self, 0);
 		_tmp4_ = self->priv->m_sys_menu;
 		_tmp5_ = item;
 		gtk_menu_shell_append ((GtkMenuShell*) _tmp4_, (GtkWidget*) ((GtkMenuItem*) _tmp5_));
@@ -2794,7 +2963,7 @@
 		_g_object_unref0 (item);
 		item = _tmp6_;
 		_tmp7_ = item;
-		g_signal_connect_object ((GtkMenuItem*) _tmp7_, "activate", (GCallback) ____lambda30__gtk_menu_item_activate, self, 0);
+		g_signal_connect_object ((GtkMenuItem*) _tmp7_, "activate", (GCallback) ____lambda39__gtk_menu_item_activate, self, 0);
 		_tmp8_ = self->priv->m_sys_menu;
 		_tmp9_ = item;
 		gtk_menu_shell_append ((GtkMenuShell*) _tmp8_, (GtkWidget*) ((GtkMenuItem*) _tmp9_));
@@ -2812,7 +2981,7 @@
 		_tmp15_ = _ ("Restart");
 		gtk_menu_item_set_label ((GtkMenuItem*) _tmp14_, _tmp15_);
 		_tmp16_ = item;
-		g_signal_connect_object ((GtkMenuItem*) _tmp16_, "activate", (GCallback) ____lambda31__gtk_menu_item_activate, self, 0);
+		g_signal_connect_object ((GtkMenuItem*) _tmp16_, "activate", (GCallback) ____lambda40__gtk_menu_item_activate, self, 0);
 		_tmp17_ = self->priv->m_sys_menu;
 		_tmp18_ = item;
 		gtk_menu_shell_append ((GtkMenuShell*) _tmp17_, (GtkWidget*) ((GtkMenuItem*) _tmp18_));
@@ -2821,7 +2990,7 @@
 		_g_object_unref0 (item);
 		item = _tmp19_;
 		_tmp20_ = item;
-		g_signal_connect_object ((GtkMenuItem*) _tmp20_, "activate", (GCallback) ____lambda32__gtk_menu_item_activate, self, 0);
+		g_signal_connect_object ((GtkMenuItem*) _tmp20_, "activate", (GCallback) ____lambda41__gtk_menu_item_activate, self, 0);
 		_tmp21_ = self->priv->m_sys_menu;
 		_tmp22_ = item;
 		gtk_menu_shell_append ((GtkMenuShell*) _tmp21_, (GtkWidget*) ((GtkMenuItem*) _tmp22_));
@@ -2855,29 +3024,29 @@
 }
 
 
-static void ____lambda33_ (Block4Data* _data4_, GtkMenuItem* item) {
+static void ____lambda42_ (Block4Data* _data4_, GtkMenuItem* item) {
 	Panel * self;
 	self = _data4_->self;
 	g_return_if_fail (item != NULL);
 	{
-		gint i;
+		gint i = 0;
 		i = 0;
 		{
-			gboolean _tmp0_;
+			gboolean _tmp0_ = FALSE;
 			_tmp0_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp1_;
-				gint _tmp3_;
-				IBusEngineDesc** _tmp4_;
-				gint _tmp4__length1;
-				IBusEngineDesc* _tmp5_;
-				IBusEngineDesc** _tmp6_;
-				gint _tmp6__length1;
-				gint _tmp7_;
-				IBusEngineDesc* _tmp8_;
+				gboolean _tmp1_ = FALSE;
+				gint _tmp3_ = 0;
+				IBusEngineDesc** _tmp4_ = NULL;
+				gint _tmp4__length1 = 0;
+				IBusEngineDesc* _tmp5_ = NULL;
+				IBusEngineDesc** _tmp6_ = NULL;
+				gint _tmp6__length1 = 0;
+				gint _tmp7_ = 0;
+				IBusEngineDesc* _tmp8_ = NULL;
 				_tmp1_ = _tmp0_;
 				if (!_tmp1_) {
-					gint _tmp2_;
+					gint _tmp2_ = 0;
 					_tmp2_ = i;
 					i = _tmp2_ + 1;
 				}
@@ -2894,7 +3063,7 @@
 				_tmp7_ = i;
 				_tmp8_ = _tmp6_[_tmp7_];
 				if (_tmp5_ == _tmp8_) {
-					gint _tmp9_;
+					gint _tmp9_ = 0;
 					_tmp9_ = i;
 					panel_switch_engine (self, _tmp9_, FALSE);
 					break;
@@ -2905,24 +3074,24 @@
 }
 
 
-static void _____lambda33__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-	____lambda33_ (self, _sender);
+static void _____lambda42__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+	____lambda42_ (self, _sender);
 }
 
 
 static void panel_status_icon_activate_cb (Panel* self, GtkStatusIcon* status_icon) {
-	GtkMenu* _tmp0_;
-	PropertyManager* _tmp1_;
-	GtkMenu* _tmp2_;
-	GtkMenu* _tmp3_;
-	GtkSeparatorMenuItem* _tmp4_;
-	GtkSeparatorMenuItem* _tmp5_;
-	IBusEngineDesc** _tmp6_;
-	gint _tmp6__length1;
-	GtkMenu* _tmp33_;
-	GtkMenu* _tmp34_;
-	GtkMenu* _tmp35_;
-	GtkStatusIcon* _tmp36_;
+	GtkMenu* _tmp0_ = NULL;
+	PropertyManager* _tmp1_ = NULL;
+	GtkMenu* _tmp2_ = NULL;
+	GtkMenu* _tmp3_ = NULL;
+	GtkSeparatorMenuItem* _tmp4_ = NULL;
+	GtkSeparatorMenuItem* _tmp5_ = NULL;
+	IBusEngineDesc** _tmp6_ = NULL;
+	gint _tmp6__length1 = 0;
+	GtkMenu* _tmp33_ = NULL;
+	GtkMenu* _tmp34_ = NULL;
+	GtkMenu* _tmp35_ = NULL;
+	GtkStatusIcon* _tmp36_ = NULL;
 	guint32 _tmp37_ = 0U;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (status_icon != NULL);
@@ -2949,35 +3118,35 @@
 		engine_collection = _tmp6_;
 		engine_collection_length1 = _tmp6__length1;
 		for (engine_it = 0; engine_it < _tmp6__length1; engine_it = engine_it + 1) {
-			IBusEngineDesc* _tmp7_;
+			IBusEngineDesc* _tmp7_ = NULL;
 			IBusEngineDesc* engine = NULL;
 			_tmp7_ = _g_object_ref0 (engine_collection[engine_it]);
 			engine = _tmp7_;
 			{
 				Block4Data* _data4_;
-				IBusEngineDesc* _tmp8_;
+				gchar* language = NULL;
+				IBusEngineDesc* _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
-				gchar* _tmp10_;
-				gchar* language;
-				IBusEngineDesc* _tmp11_;
+				gchar* _tmp10_ = NULL;
+				gchar* longname = NULL;
+				IBusEngineDesc* _tmp11_ = NULL;
 				const gchar* _tmp12_ = NULL;
-				gchar* _tmp13_;
-				gchar* longname;
-				const gchar* _tmp14_;
+				gchar* _tmp13_ = NULL;
+				GtkImageMenuItem* item = NULL;
+				const gchar* _tmp14_ = NULL;
 				const gchar* _tmp15_ = NULL;
-				const gchar* _tmp16_;
+				const gchar* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
-				gchar* _tmp18_;
-				GtkImageMenuItem* _tmp19_;
-				GtkImageMenuItem* _tmp20_;
-				GtkImageMenuItem* item;
-				IBusEngineDesc* _tmp21_;
+				gchar* _tmp18_ = NULL;
+				GtkImageMenuItem* _tmp19_ = NULL;
+				GtkImageMenuItem* _tmp20_ = NULL;
+				IBusEngineDesc* _tmp21_ = NULL;
 				const gchar* _tmp22_ = NULL;
-				IBusEngineDesc* _tmp28_;
-				IBusEngineDesc* _tmp29_;
-				GtkImageMenuItem* _tmp30_;
-				GtkMenu* _tmp31_;
-				GtkImageMenuItem* _tmp32_;
+				IBusEngineDesc* _tmp28_ = NULL;
+				IBusEngineDesc* _tmp29_ = NULL;
+				GtkImageMenuItem* _tmp30_ = NULL;
+				GtkMenu* _tmp31_ = NULL;
+				GtkImageMenuItem* _tmp32_ = NULL;
 				_data4_ = g_slice_new0 (Block4Data);
 				_data4_->_ref_count_ = 1;
 				_data4_->self = g_object_ref (self);
@@ -3002,12 +3171,12 @@
 				_tmp21_ = engine;
 				_tmp22_ = ibus_engine_desc_get_icon (_tmp21_);
 				if (g_strcmp0 (_tmp22_, "") != 0) {
-					IBusEngineDesc* _tmp23_;
+					IconWidget* icon = NULL;
+					IBusEngineDesc* _tmp23_ = NULL;
 					const gchar* _tmp24_ = NULL;
-					IconWidget* _tmp25_;
-					IconWidget* icon;
-					GtkImageMenuItem* _tmp26_;
-					IconWidget* _tmp27_;
+					IconWidget* _tmp25_ = NULL;
+					GtkImageMenuItem* _tmp26_ = NULL;
+					IconWidget* _tmp27_ = NULL;
 					_tmp23_ = engine;
 					_tmp24_ = ibus_engine_desc_get_icon (_tmp23_);
 					_tmp25_ = icon_widget_new (_tmp24_, GTK_ICON_SIZE_MENU);
@@ -3022,7 +3191,7 @@
 				_tmp29_ = _g_object_ref0 (_tmp28_);
 				_data4_->e = _tmp29_;
 				_tmp30_ = item;
-				g_signal_connect_data ((GtkMenuItem*) _tmp30_, "activate", (GCallback) _____lambda33__gtk_menu_item_activate, block4_data_ref (_data4_), (GClosureNotify) block4_data_unref, 0);
+				g_signal_connect_data ((GtkMenuItem*) _tmp30_, "activate", (GCallback) _____lambda42__gtk_menu_item_activate, block4_data_ref (_data4_), (GClosureNotify) block4_data_unref, 0);
 				_tmp31_ = self->priv->m_ime_menu;
 				_tmp32_ = item;
 				gtk_container_add ((GtkContainer*) _tmp31_, (GtkWidget*) _tmp32_);
@@ -3048,11 +3217,16 @@
 
 static void panel_real_set_cursor_location (IBusPanelService* base, gint x, gint y, gint width, gint height) {
 	Panel * self;
-	CandidatePanel* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
-	gint _tmp4_;
+	CandidatePanel* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
+	gint _tmp4_ = 0;
+	PropertyPanel* _tmp5_ = NULL;
+	gint _tmp6_ = 0;
+	gint _tmp7_ = 0;
+	gint _tmp8_ = 0;
+	gint _tmp9_ = 0;
 	self = (Panel*) base;
 	_tmp0_ = self->priv->m_candidate_panel;
 	_tmp1_ = x;
@@ -3060,101 +3234,110 @@
 	_tmp3_ = width;
 	_tmp4_ = height;
 	candidate_panel_set_cursor_location (_tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
+	_tmp5_ = self->priv->m_property_panel;
+	_tmp6_ = x;
+	_tmp7_ = y;
+	_tmp8_ = width;
+	_tmp9_ = height;
+	property_panel_set_cursor_location (_tmp5_, _tmp6_, _tmp7_, _tmp8_, _tmp9_);
 }
 
 
 static void panel_real_focus_in (IBusPanelService* base, const gchar* input_context_path) {
 	Panel * self;
-	gboolean _tmp0_;
-	gboolean _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	GHashTable* _tmp4_;
-	const gchar* _tmp5_;
-	gconstpointer _tmp6_ = NULL;
-	IBusEngineDesc* _tmp7_;
-	IBusEngineDesc* engine;
-	IBusEngineDesc* _tmp8_;
-	IBusEngineDesc* _tmp23_;
+	PropertyPanel* _tmp0_ = NULL;
+	gboolean _tmp1_ = FALSE;
+	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	IBusEngineDesc* engine = NULL;
+	GHashTable* _tmp5_ = NULL;
+	const gchar* _tmp6_ = NULL;
+	gconstpointer _tmp7_ = NULL;
+	IBusEngineDesc* _tmp8_ = NULL;
+	IBusEngineDesc* _tmp9_ = NULL;
+	IBusEngineDesc* _tmp24_ = NULL;
 	self = (Panel*) base;
 	g_return_if_fail (input_context_path != NULL);
-	_tmp0_ = self->priv->m_use_global_engine;
-	if (_tmp0_) {
+	_tmp0_ = self->priv->m_property_panel;
+	property_panel_focus_in (_tmp0_);
+	_tmp1_ = self->priv->m_use_global_engine;
+	if (_tmp1_) {
 		return;
 	}
-	_tmp1_ = self->priv->m_switcher_is_running;
-	if (_tmp1_) {
+	_tmp2_ = self->priv->m_switcher_is_running;
+	if (_tmp2_) {
 		return;
 	}
-	_tmp2_ = input_context_path;
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp3_ = input_context_path;
+	_tmp4_ = g_strdup (_tmp3_);
 	_g_free0 (self->priv->m_current_context_path);
-	self->priv->m_current_context_path = _tmp3_;
-	_tmp4_ = self->priv->m_engine_contexts;
-	_tmp5_ = self->priv->m_current_context_path;
-	_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
-	_tmp7_ = _g_object_ref0 ((IBusEngineDesc*) _tmp6_);
-	engine = _tmp7_;
-	_tmp8_ = engine;
-	if (_tmp8_ == NULL) {
-		IBusEngineDesc* _tmp9_ = NULL;
-		IBusEngineDesc** _tmp10_;
-		gint _tmp10__length1;
-		IBusEngineDesc* _tmp13_;
-		IBusEngineDesc* _tmp14_;
-		IBusEngineDesc* _tmp15_;
-		_tmp10_ = self->priv->m_engines;
-		_tmp10__length1 = self->priv->m_engines_length1;
-		if (_tmp10__length1 > 0) {
-			IBusEngineDesc** _tmp11_;
-			gint _tmp11__length1;
-			IBusEngineDesc* _tmp12_;
-			_tmp11_ = self->priv->m_engines;
-			_tmp11__length1 = self->priv->m_engines_length1;
-			_tmp12_ = _tmp11_[0];
-			_tmp9_ = _tmp12_;
+	self->priv->m_current_context_path = _tmp4_;
+	_tmp5_ = self->priv->m_engine_contexts;
+	_tmp6_ = self->priv->m_current_context_path;
+	_tmp7_ = g_hash_table_lookup (_tmp5_, _tmp6_);
+	_tmp8_ = _g_object_ref0 ((IBusEngineDesc*) _tmp7_);
+	engine = _tmp8_;
+	_tmp9_ = engine;
+	if (_tmp9_ == NULL) {
+		IBusEngineDesc* _tmp10_ = NULL;
+		IBusEngineDesc** _tmp11_ = NULL;
+		gint _tmp11__length1 = 0;
+		IBusEngineDesc* _tmp14_ = NULL;
+		IBusEngineDesc* _tmp15_ = NULL;
+		IBusEngineDesc* _tmp16_ = NULL;
+		_tmp11_ = self->priv->m_engines;
+		_tmp11__length1 = self->priv->m_engines_length1;
+		if (_tmp11__length1 > 0) {
+			IBusEngineDesc** _tmp12_ = NULL;
+			gint _tmp12__length1 = 0;
+			IBusEngineDesc* _tmp13_ = NULL;
+			_tmp12_ = self->priv->m_engines;
+			_tmp12__length1 = self->priv->m_engines_length1;
+			_tmp13_ = _tmp12_[0];
+			_tmp10_ = _tmp13_;
 		} else {
-			_tmp9_ = NULL;
+			_tmp10_ = NULL;
 		}
-		_tmp13_ = _tmp9_;
-		_tmp14_ = _g_object_ref0 (_tmp13_);
+		_tmp14_ = _tmp10_;
+		_tmp15_ = _g_object_ref0 (_tmp14_);
 		_g_object_unref0 (engine);
-		engine = _tmp14_;
-		_tmp15_ = engine;
-		if (_tmp15_ == NULL) {
+		engine = _tmp15_;
+		_tmp16_ = engine;
+		if (_tmp16_ == NULL) {
 			_g_object_unref0 (engine);
 			return;
 		}
 	} else {
-		gboolean in_engines;
-		IBusEngineDesc** _tmp16_;
-		gint _tmp16__length1;
-		gboolean _tmp22_;
+		gboolean in_engines = FALSE;
+		IBusEngineDesc** _tmp17_ = NULL;
+		gint _tmp17__length1 = 0;
+		gboolean _tmp23_ = FALSE;
 		in_engines = FALSE;
-		_tmp16_ = self->priv->m_engines;
-		_tmp16__length1 = self->priv->m_engines_length1;
+		_tmp17_ = self->priv->m_engines;
+		_tmp17__length1 = self->priv->m_engines_length1;
 		{
 			IBusEngineDesc** e_collection = NULL;
 			gint e_collection_length1 = 0;
 			gint _e_collection_size_ = 0;
 			gint e_it = 0;
-			e_collection = _tmp16_;
-			e_collection_length1 = _tmp16__length1;
-			for (e_it = 0; e_it < _tmp16__length1; e_it = e_it + 1) {
-				IBusEngineDesc* _tmp17_;
+			e_collection = _tmp17_;
+			e_collection_length1 = _tmp17__length1;
+			for (e_it = 0; e_it < _tmp17__length1; e_it = e_it + 1) {
+				IBusEngineDesc* _tmp18_ = NULL;
 				IBusEngineDesc* e = NULL;
-				_tmp17_ = _g_object_ref0 (e_collection[e_it]);
-				e = _tmp17_;
+				_tmp18_ = _g_object_ref0 (e_collection[e_it]);
+				e = _tmp18_;
 				{
-					IBusEngineDesc* _tmp18_;
-					const gchar* _tmp19_ = NULL;
-					IBusEngineDesc* _tmp20_;
-					const gchar* _tmp21_ = NULL;
-					_tmp18_ = engine;
-					_tmp19_ = ibus_engine_desc_get_name (_tmp18_);
-					_tmp20_ = e;
-					_tmp21_ = ibus_engine_desc_get_name (_tmp20_);
-					if (g_strcmp0 (_tmp19_, _tmp21_) == 0) {
+					IBusEngineDesc* _tmp19_ = NULL;
+					const gchar* _tmp20_ = NULL;
+					IBusEngineDesc* _tmp21_ = NULL;
+					const gchar* _tmp22_ = NULL;
+					_tmp19_ = engine;
+					_tmp20_ = ibus_engine_desc_get_name (_tmp19_);
+					_tmp21_ = e;
+					_tmp22_ = ibus_engine_desc_get_name (_tmp21_);
+					if (g_strcmp0 (_tmp20_, _tmp22_) == 0) {
 						in_engines = TRUE;
 						_g_object_unref0 (e);
 						break;
@@ -3163,23 +3346,23 @@
 				}
 			}
 		}
-		_tmp22_ = in_engines;
-		if (!_tmp22_) {
+		_tmp23_ = in_engines;
+		if (!_tmp23_) {
 			_g_object_unref0 (engine);
 			return;
 		}
 	}
-	_tmp23_ = engine;
-	panel_set_engine (self, _tmp23_);
+	_tmp24_ = engine;
+	panel_set_engine (self, _tmp24_);
 	_g_object_unref0 (engine);
 }
 
 
 static void panel_real_focus_out (IBusPanelService* base, const gchar* input_context_path) {
 	Panel * self;
-	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gchar* _tmp2_;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	gchar* _tmp2_ = NULL;
 	self = (Panel*) base;
 	g_return_if_fail (input_context_path != NULL);
 	_tmp0_ = self->priv->m_use_global_engine;
@@ -3198,9 +3381,9 @@
 
 static void panel_real_destroy_context (IBusPanelService* base, const gchar* input_context_path) {
 	Panel * self;
-	gboolean _tmp0_;
-	GHashTable* _tmp1_;
-	const gchar* _tmp2_;
+	gboolean _tmp0_ = FALSE;
+	GHashTable* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
 	self = (Panel*) base;
 	g_return_if_fail (input_context_path != NULL);
 	_tmp0_ = self->priv->m_use_global_engine;
@@ -3215,53 +3398,73 @@
 
 static void panel_real_register_properties (IBusPanelService* base, IBusPropList* props) {
 	Panel * self;
-	PropertyManager* _tmp0_;
-	IBusPropList* _tmp1_;
+	PropertyManager* _tmp0_ = NULL;
+	IBusPropList* _tmp1_ = NULL;
+	PropertyPanel* _tmp2_ = NULL;
+	IBusPropList* _tmp3_ = NULL;
 	self = (Panel*) base;
 	g_return_if_fail (props != NULL);
 	_tmp0_ = self->priv->m_property_manager;
 	_tmp1_ = props;
 	property_manager_set_properties (_tmp0_, _tmp1_);
+	_tmp2_ = self->priv->m_property_panel;
+	_tmp3_ = props;
+	property_panel_set_properties (_tmp2_, _tmp3_);
 }
 
 
 static void panel_real_update_property (IBusPanelService* base, IBusProperty* prop) {
 	Panel * self;
-	PropertyManager* _tmp0_;
-	IBusProperty* _tmp1_;
+	PropertyManager* _tmp0_ = NULL;
+	IBusProperty* _tmp1_ = NULL;
+	PropertyPanel* _tmp2_ = NULL;
+	IBusProperty* _tmp3_ = NULL;
 	self = (Panel*) base;
 	g_return_if_fail (prop != NULL);
 	_tmp0_ = self->priv->m_property_manager;
 	_tmp1_ = prop;
 	property_manager_update_property (_tmp0_, _tmp1_);
+	_tmp2_ = self->priv->m_property_panel;
+	_tmp3_ = prop;
+	property_panel_update_property (_tmp2_, _tmp3_);
 }
 
 
 static void panel_real_update_preedit_text (IBusPanelService* base, IBusText* text, guint cursor_pos, gboolean visible) {
 	Panel * self;
-	gboolean _tmp0_;
+	gboolean _tmp0_ = FALSE;
 	self = (Panel*) base;
 	g_return_if_fail (text != NULL);
 	_tmp0_ = visible;
 	if (_tmp0_) {
-		CandidatePanel* _tmp1_;
-		IBusText* _tmp2_;
-		guint _tmp3_;
+		CandidatePanel* _tmp1_ = NULL;
+		IBusText* _tmp2_ = NULL;
+		guint _tmp3_ = 0U;
+		PropertyPanel* _tmp4_ = NULL;
+		IBusText* _tmp5_ = NULL;
+		guint _tmp6_ = 0U;
 		_tmp1_ = self->priv->m_candidate_panel;
 		_tmp2_ = text;
 		_tmp3_ = cursor_pos;
 		candidate_panel_set_preedit_text (_tmp1_, _tmp2_, _tmp3_);
+		_tmp4_ = self->priv->m_property_panel;
+		_tmp5_ = text;
+		_tmp6_ = cursor_pos;
+		property_panel_set_preedit_text (_tmp4_, _tmp5_, _tmp6_);
 	} else {
-		CandidatePanel* _tmp4_;
-		_tmp4_ = self->priv->m_candidate_panel;
-		candidate_panel_set_preedit_text (_tmp4_, NULL, (guint) 0);
+		CandidatePanel* _tmp7_ = NULL;
+		PropertyPanel* _tmp8_ = NULL;
+		_tmp7_ = self->priv->m_candidate_panel;
+		candidate_panel_set_preedit_text (_tmp7_, NULL, (guint) 0);
+		_tmp8_ = self->priv->m_property_panel;
+		property_panel_set_preedit_text (_tmp8_, NULL, (guint) 0);
 	}
 }
 
 
 static void panel_real_hide_preedit_text (IBusPanelService* base) {
 	Panel * self;
-	CandidatePanel* _tmp0_;
+	CandidatePanel* _tmp0_ = NULL;
 	self = (Panel*) base;
 	_tmp0_ = self->priv->m_candidate_panel;
 	candidate_panel_set_preedit_text (_tmp0_, NULL, (guint) 0);
@@ -3271,14 +3474,18 @@
 static void panel_real_update_auxiliary_text (IBusPanelService* base, IBusText* text, gboolean visible) {
 	Panel * self;
 	IBusText* _tmp0_ = NULL;
-	gboolean _tmp1_;
-	CandidatePanel* _tmp3_;
-	IBusText* _tmp4_;
+	gboolean _tmp1_ = FALSE;
+	CandidatePanel* _tmp3_ = NULL;
+	IBusText* _tmp4_ = NULL;
+	IBusText* _tmp5_ = NULL;
+	gboolean _tmp6_ = FALSE;
+	PropertyPanel* _tmp8_ = NULL;
+	IBusText* _tmp9_ = NULL;
 	self = (Panel*) base;
 	g_return_if_fail (text != NULL);
 	_tmp1_ = visible;
 	if (_tmp1_) {
-		IBusText* _tmp2_;
+		IBusText* _tmp2_ = NULL;
 		_tmp2_ = text;
 		_tmp0_ = _tmp2_;
 	} else {
@@ -3287,12 +3494,23 @@
 	_tmp3_ = self->priv->m_candidate_panel;
 	_tmp4_ = _tmp0_;
 	candidate_panel_set_auxiliary_text (_tmp3_, _tmp4_);
+	_tmp6_ = visible;
+	if (_tmp6_) {
+		IBusText* _tmp7_ = NULL;
+		_tmp7_ = text;
+		_tmp5_ = _tmp7_;
+	} else {
+		_tmp5_ = NULL;
+	}
+	_tmp8_ = self->priv->m_property_panel;
+	_tmp9_ = _tmp5_;
+	property_panel_set_auxiliary_text (_tmp8_, _tmp9_);
 }
 
 
 static void panel_real_hide_auxiliary_text (IBusPanelService* base) {
 	Panel * self;
-	CandidatePanel* _tmp0_;
+	CandidatePanel* _tmp0_ = NULL;
 	self = (Panel*) base;
 	_tmp0_ = self->priv->m_candidate_panel;
 	candidate_panel_set_auxiliary_text (_tmp0_, NULL);
@@ -3302,14 +3520,18 @@
 static void panel_real_update_lookup_table (IBusPanelService* base, IBusLookupTable* table, gboolean visible) {
 	Panel * self;
 	IBusLookupTable* _tmp0_ = NULL;
-	gboolean _tmp1_;
-	CandidatePanel* _tmp3_;
-	IBusLookupTable* _tmp4_;
+	gboolean _tmp1_ = FALSE;
+	CandidatePanel* _tmp3_ = NULL;
+	IBusLookupTable* _tmp4_ = NULL;
+	IBusLookupTable* _tmp5_ = NULL;
+	gboolean _tmp6_ = FALSE;
+	PropertyPanel* _tmp8_ = NULL;
+	IBusLookupTable* _tmp9_ = NULL;
 	self = (Panel*) base;
 	g_return_if_fail (table != NULL);
 	_tmp1_ = visible;
 	if (_tmp1_) {
-		IBusLookupTable* _tmp2_;
+		IBusLookupTable* _tmp2_ = NULL;
 		_tmp2_ = table;
 		_tmp0_ = _tmp2_;
 	} else {
@@ -3318,12 +3540,23 @@
 	_tmp3_ = self->priv->m_candidate_panel;
 	_tmp4_ = _tmp0_;
 	candidate_panel_set_lookup_table (_tmp3_, _tmp4_);
+	_tmp6_ = visible;
+	if (_tmp6_) {
+		IBusLookupTable* _tmp7_ = NULL;
+		_tmp7_ = table;
+		_tmp5_ = _tmp7_;
+	} else {
+		_tmp5_ = NULL;
+	}
+	_tmp8_ = self->priv->m_property_panel;
+	_tmp9_ = _tmp5_;
+	property_panel_set_lookup_table (_tmp8_, _tmp9_);
 }
 
 
 static void panel_real_hide_lookup_table (IBusPanelService* base) {
 	Panel * self;
-	CandidatePanel* _tmp0_;
+	CandidatePanel* _tmp0_ = NULL;
 	self = (Panel*) base;
 	_tmp0_ = self->priv->m_candidate_panel;
 	candidate_panel_set_lookup_table (_tmp0_, NULL);
@@ -3332,8 +3565,8 @@
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_;
-	gchar _tmp1_;
+	glong _tmp0_ = 0L;
+	gchar _tmp1_ = '\0';
 	g_return_val_if_fail (self != NULL, '\0');
 	_tmp0_ = index;
 	_tmp1_ = ((gchar*) self)[_tmp0_];
@@ -3354,36 +3587,36 @@
 
 static void panel_real_state_changed (IBusPanelService* base) {
 	Panel * self;
-	gboolean _tmp0_;
-	gchar* _tmp1_;
-	gchar* icon_name;
-	IBusBus* _tmp2_;
+	gboolean _tmp0_ = FALSE;
+	gchar* icon_name = NULL;
+	gchar* _tmp1_ = NULL;
+	IBusEngineDesc* engine = NULL;
+	IBusBus* _tmp2_ = NULL;
 	IBusEngineDesc* _tmp3_ = NULL;
-	IBusEngineDesc* _tmp4_;
-	IBusEngineDesc* engine;
-	IBusEngineDesc* _tmp5_;
-	const gchar* _tmp9_;
+	IBusEngineDesc* _tmp4_ = NULL;
+	IBusEngineDesc* _tmp5_ = NULL;
+	const gchar* _tmp9_ = NULL;
 	gchar _tmp10_ = '\0';
-	IBusEngineDesc* _tmp23_;
+	IBusEngineDesc* _tmp23_ = NULL;
 	gint i = 0;
-	gint _tmp35_;
-	gint _tmp36_;
-	IBusEngineDesc** _tmp37_;
-	gint _tmp37__length1;
-	IBusEngineDesc** _tmp50_;
-	gint _tmp50__length1;
-	IBusEngineDesc* _tmp51_;
-	IBusEngineDesc* _tmp52_;
-	IBusEngineDesc* _tmp53_;
+	gint _tmp35_ = 0;
+	gint _tmp36_ = 0;
+	IBusEngineDesc** _tmp37_ = NULL;
+	gint _tmp37__length1 = 0;
+	IBusEngineDesc** _tmp50_ = NULL;
+	gint _tmp50__length1 = 0;
+	IBusEngineDesc* _tmp51_ = NULL;
+	IBusEngineDesc* _tmp52_ = NULL;
+	IBusEngineDesc* _tmp53_ = NULL;
+	gchar** names = NULL;
 	gchar** _tmp54_ = NULL;
-	gchar** names;
-	gint names_length1;
-	gint _names_size_;
-	IBusEngineDesc** _tmp55_;
-	gint _tmp55__length1;
-	GSettings* _tmp61_;
-	gchar** _tmp62_;
-	gint _tmp62__length1;
+	gint names_length1 = 0;
+	gint _names_size_ = 0;
+	IBusEngineDesc** _tmp55_ = NULL;
+	gint _tmp55__length1 = 0;
+	GSettings* _tmp61_ = NULL;
+	gchar** _tmp62_ = NULL;
+	gint _tmp62__length1 = 0;
 	self = (Panel*) base;
 	_tmp0_ = self->priv->m_switcher_is_running;
 	if (_tmp0_) {
@@ -3397,9 +3630,9 @@
 	engine = _tmp4_;
 	_tmp5_ = engine;
 	if (_tmp5_ != NULL) {
-		IBusEngineDesc* _tmp6_;
+		IBusEngineDesc* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_;
+		gchar* _tmp8_ = NULL;
 		_tmp6_ = engine;
 		_tmp7_ = ibus_engine_desc_get_icon (_tmp6_);
 		_tmp8_ = g_strdup (_tmp7_);
@@ -3409,20 +3642,20 @@
 	_tmp9_ = icon_name;
 	_tmp10_ = string_get (_tmp9_, (glong) 0);
 	if (_tmp10_ == '/') {
-		GtkStatusIcon* _tmp11_;
-		const gchar* _tmp12_;
+		GtkStatusIcon* _tmp11_ = NULL;
+		const gchar* _tmp12_ = NULL;
 		_tmp11_ = self->priv->m_status_icon;
 		_tmp12_ = icon_name;
 		gtk_status_icon_set_from_file (_tmp11_, _tmp12_);
 	} else {
+		GtkIconTheme* theme = NULL;
 		GtkIconTheme* _tmp13_ = NULL;
-		GtkIconTheme* _tmp14_;
-		GtkIconTheme* theme;
-		GtkIconTheme* _tmp15_;
-		const gchar* _tmp16_;
+		GtkIconTheme* _tmp14_ = NULL;
+		GtkIconTheme* _tmp15_ = NULL;
+		const gchar* _tmp16_ = NULL;
 		GtkIconInfo* _tmp17_ = NULL;
-		GtkIconInfo* _tmp18_;
-		gboolean _tmp19_;
+		GtkIconInfo* _tmp18_ = NULL;
+		gboolean _tmp19_ = FALSE;
 		_tmp13_ = gtk_icon_theme_get_default ();
 		_tmp14_ = _g_object_ref0 (_tmp13_);
 		theme = _tmp14_;
@@ -3433,13 +3666,13 @@
 		_tmp19_ = _tmp18_ != NULL;
 		_gtk_icon_info_free0 (_tmp18_);
 		if (_tmp19_) {
-			GtkStatusIcon* _tmp20_;
-			const gchar* _tmp21_;
+			GtkStatusIcon* _tmp20_ = NULL;
+			const gchar* _tmp21_ = NULL;
 			_tmp20_ = self->priv->m_status_icon;
 			_tmp21_ = icon_name;
 			gtk_status_icon_set_from_icon_name (_tmp20_, _tmp21_);
 		} else {
-			GtkStatusIcon* _tmp22_;
+			GtkStatusIcon* _tmp22_ = NULL;
 			_tmp22_ = self->priv->m_status_icon;
 			gtk_status_icon_set_from_icon_name (_tmp22_, "ibus-engine");
 		}
@@ -3452,24 +3685,24 @@
 		return;
 	}
 	{
-		gboolean _tmp24_;
+		gboolean _tmp24_ = FALSE;
 		i = 0;
 		_tmp24_ = TRUE;
 		while (TRUE) {
-			gboolean _tmp25_;
-			gint _tmp27_;
-			IBusEngineDesc** _tmp28_;
-			gint _tmp28__length1;
-			IBusEngineDesc** _tmp29_;
-			gint _tmp29__length1;
-			gint _tmp30_;
-			IBusEngineDesc* _tmp31_;
+			gboolean _tmp25_ = FALSE;
+			gint _tmp27_ = 0;
+			IBusEngineDesc** _tmp28_ = NULL;
+			gint _tmp28__length1 = 0;
+			IBusEngineDesc** _tmp29_ = NULL;
+			gint _tmp29__length1 = 0;
+			gint _tmp30_ = 0;
+			IBusEngineDesc* _tmp31_ = NULL;
 			const gchar* _tmp32_ = NULL;
-			IBusEngineDesc* _tmp33_;
+			IBusEngineDesc* _tmp33_ = NULL;
 			const gchar* _tmp34_ = NULL;
 			_tmp25_ = _tmp24_;
 			if (!_tmp25_) {
-				gint _tmp26_;
+				gint _tmp26_ = 0;
 				_tmp26_ = i;
 				i = _tmp26_ + 1;
 			}
@@ -3507,28 +3740,28 @@
 		return;
 	}
 	{
-		gint _tmp38_;
-		gint j;
+		gint j = 0;
+		gint _tmp38_ = 0;
 		_tmp38_ = i;
 		j = _tmp38_;
 		{
-			gboolean _tmp39_;
+			gboolean _tmp39_ = FALSE;
 			_tmp39_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp40_;
-				gint _tmp42_;
-				IBusEngineDesc** _tmp43_;
-				gint _tmp43__length1;
-				gint _tmp44_;
-				IBusEngineDesc** _tmp45_;
-				gint _tmp45__length1;
-				gint _tmp46_;
-				IBusEngineDesc* _tmp47_;
-				IBusEngineDesc* _tmp48_;
-				IBusEngineDesc* _tmp49_;
+				gboolean _tmp40_ = FALSE;
+				gint _tmp42_ = 0;
+				IBusEngineDesc** _tmp43_ = NULL;
+				gint _tmp43__length1 = 0;
+				gint _tmp44_ = 0;
+				IBusEngineDesc** _tmp45_ = NULL;
+				gint _tmp45__length1 = 0;
+				gint _tmp46_ = 0;
+				IBusEngineDesc* _tmp47_ = NULL;
+				IBusEngineDesc* _tmp48_ = NULL;
+				IBusEngineDesc* _tmp49_ = NULL;
 				_tmp40_ = _tmp39_;
 				if (!_tmp40_) {
-					gint _tmp41_;
+					gint _tmp41_ = 0;
 					_tmp41_ = j;
 					j = _tmp41_ - 1;
 				}
@@ -3572,16 +3805,16 @@
 		desc_collection = _tmp55_;
 		desc_collection_length1 = _tmp55__length1;
 		for (desc_it = 0; desc_it < _tmp55__length1; desc_it = desc_it + 1) {
-			IBusEngineDesc* _tmp56_;
+			IBusEngineDesc* _tmp56_ = NULL;
 			IBusEngineDesc* desc = NULL;
 			_tmp56_ = _g_object_ref0 (desc_collection[desc_it]);
 			desc = _tmp56_;
 			{
-				gchar** _tmp57_;
-				gint _tmp57__length1;
-				IBusEngineDesc* _tmp58_;
+				gchar** _tmp57_ = NULL;
+				gint _tmp57__length1 = 0;
+				IBusEngineDesc* _tmp58_ = NULL;
 				const gchar* _tmp59_ = NULL;
-				gchar* _tmp60_;
+				gchar* _tmp60_ = NULL;
 				_tmp57_ = names;
 				_tmp57__length1 = names_length1;
 				_tmp58_ = desc;
@@ -3604,9 +3837,9 @@
 
 static PanelKeybinding* panel_keybinding_construct (GType object_type, guint keysym, GdkModifierType modifiers, gboolean reverse) {
 	PanelKeybinding* self = NULL;
-	guint _tmp0_;
-	GdkModifierType _tmp1_;
-	gboolean _tmp2_;
+	guint _tmp0_ = 0U;
+	GdkModifierType _tmp1_ = 0;
+	gboolean _tmp2_ = FALSE;
 	self = (PanelKeybinding*) g_type_create_instance (object_type);
 	_tmp0_ = keysym;
 	panel_keybinding_set_keysym (self, _tmp0_);
@@ -3625,7 +3858,7 @@
 
 static guint panel_keybinding_get_keysym (PanelKeybinding* self) {
 	guint result;
-	guint _tmp0_;
+	guint _tmp0_ = 0U;
 	g_return_val_if_fail (self != NULL, 0U);
 	_tmp0_ = self->priv->_keysym;
 	result = _tmp0_;
@@ -3634,7 +3867,7 @@
 
 
 static void panel_keybinding_set_keysym (PanelKeybinding* self, guint value) {
-	guint _tmp0_;
+	guint _tmp0_ = 0U;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	self->priv->_keysym = _tmp0_;
@@ -3643,7 +3876,7 @@
 
 static GdkModifierType panel_keybinding_get_modifiers (PanelKeybinding* self) {
 	GdkModifierType result;
-	GdkModifierType _tmp0_;
+	GdkModifierType _tmp0_ = 0;
 	g_return_val_if_fail (self != NULL, 0);
 	_tmp0_ = self->priv->_modifiers;
 	result = _tmp0_;
@@ -3652,7 +3885,7 @@
 
 
 static void panel_keybinding_set_modifiers (PanelKeybinding* self, GdkModifierType value) {
-	GdkModifierType _tmp0_;
+	GdkModifierType _tmp0_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	self->priv->_modifiers = _tmp0_;
@@ -3661,7 +3894,7 @@
 
 static gboolean panel_keybinding_get_reverse (PanelKeybinding* self) {
 	gboolean result;
-	gboolean _tmp0_;
+	gboolean _tmp0_ = FALSE;
 	g_return_val_if_fail (self != NULL, FALSE);
 	_tmp0_ = self->priv->_reverse;
 	result = _tmp0_;
@@ -3670,7 +3903,7 @@
 
 
 static void panel_keybinding_set_reverse (PanelKeybinding* self, gboolean value) {
-	gboolean _tmp0_;
+	gboolean _tmp0_ = FALSE;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	self->priv->_reverse = _tmp0_;
@@ -3860,10 +4093,10 @@
 
 static void panel_instance_init (Panel * self) {
 	IBusEngineDesc** _tmp0_ = NULL;
-	GHashFunc _tmp1_;
-	GEqualFunc _tmp2_;
-	GHashTable* _tmp3_;
-	gchar* _tmp4_;
+	GHashFunc _tmp1_ = NULL;
+	GEqualFunc _tmp2_ = NULL;
+	GHashTable* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
 	self->priv = PANEL_GET_PRIVATE (self);
 	self->priv->m_settings_general = NULL;
 	self->priv->m_settings_hotkey = NULL;
@@ -3904,6 +4137,7 @@
 	_g_object_unref0 (self->priv->m_candidate_panel);
 	_g_object_unref0 (self->priv->m_switcher);
 	_property_manager_unref0 (self->priv->m_property_manager);
+	_g_object_unref0 (self->priv->m_property_panel);
 	_g_object_unref0 (self->priv->m_about_dialog);
 	_g_object_unref0 (self->priv->m_css_provider);
 	__g_list_free__panel_keybinding_unref0_0 (self->priv->m_keybindings);
diff -Nru ibus-1.5.4/ui/gtk3/panel.vala ibus-1.5.5/ui/gtk3/panel.vala
--- ibus-1.5.4/ui/gtk3/panel.vala	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/panel.vala	2014-01-14 12:59:14.000000000 +0900
@@ -52,6 +52,7 @@
     private Switcher m_switcher;
     private bool m_switcher_is_running = false;
     private PropertyManager m_property_manager;
+    private PropertyPanel m_property_panel;
     private GLib.Pid m_setup_pid = 0;
     private Gtk.AboutDialog m_about_dialog;
     private Gtk.CssProvider m_css_provider;
@@ -93,7 +94,12 @@
         }
 
         m_property_manager = new PropertyManager();
-        m_property_manager.property_activate.connect((k, s) => {
+        m_property_manager.property_activate.connect((w, k, s) => {
+            property_activate(k, s);
+        });
+
+        m_property_panel = new PropertyPanel();
+        m_property_panel.property_activate.connect((w, k, s) => {
             property_activate(k, s);
         });
 
@@ -148,6 +154,18 @@
         m_settings_panel.changed["show-icon-on-systray"].connect((key) => {
                 set_show_icon_on_systray();
         });
+
+        m_settings_panel.changed["lookup-table-orientation"].connect((key) => {
+                set_lookup_table_orientation();
+        });
+
+        m_settings_panel.changed["show"].connect((key) => {
+                set_show_property_panel();
+        });
+
+        m_settings_panel.changed["timeout"].connect((key) => {
+                set_timeout_property_panel();
+        });
     }
 
     private void keybinding_manager_bind(KeybindingManager keybinding_manager,
@@ -285,7 +303,7 @@
         m_switcher_delay_time =
                 m_settings_general.get_int("switcher-delay-time");
 
-        if (m_switcher_delay_time >= 0) {
+        if (m_switcher != null && m_switcher_delay_time >= 0) {
             m_switcher.set_popup_delay_time((uint) m_switcher_delay_time);
         }
     }
@@ -312,10 +330,37 @@
     }
 
     private void set_show_icon_on_systray() {
+        if (m_status_icon == null)
+            return;
+
         m_status_icon.set_visible(
                 m_settings_panel.get_boolean("show-icon-on-systray"));
     }
 
+    private void set_lookup_table_orientation() {
+        if (m_candidate_panel == null)
+            return;
+
+        m_candidate_panel.set_vertical(
+                m_settings_panel.get_int("lookup-table-orientation")
+                == IBus.Orientation.VERTICAL);
+    }
+
+    private void set_show_property_panel() {
+        if (m_property_panel == null)
+            return;
+
+        m_property_panel.set_show(m_settings_panel.get_int("show"));
+    }
+
+    private void set_timeout_property_panel() {
+        if (m_property_panel == null)
+            return;
+
+        m_property_panel.set_auto_hide_timeout(
+                (uint) m_settings_panel.get_int("auto-hide-timeout"));
+    }
+
     private int compare_versions(string version1, string version2) {
         string[] version1_list = version1.split(".");
         string[] version2_list = version2.split(".");
@@ -411,6 +456,9 @@
         set_embed_preedit_text();
         set_custom_font();
         set_show_icon_on_systray();
+        set_lookup_table_orientation();
+        set_show_property_panel();
+        set_timeout_property_panel();
 
         set_version();
     }
@@ -551,7 +599,7 @@
         }
 
         names += engines[index].get_name();
-        m_bus.preload_engines_async(names, -1, null);
+        m_bus.preload_engines_async.begin(names, -1, null);
     }
 
     private void update_engines(string[]? unowned_engine_names,
@@ -635,9 +683,9 @@
             m_about_dialog.set_program_name("IBus");
             m_about_dialog.set_version(Config.PACKAGE_VERSION);
 
-            string copyright = _(
-                "Copyright (c) 2007-2012 Peng Huang\n" +
-                "Copyright (c) 2007-2010 Red Hat, Inc.\n");
+            string copyright =
+                "Copyright © 2007-2013 Peng Huang\n" +
+                "Copyright © 2007-2013 Red Hat, Inc.\n";
 
             m_about_dialog.set_copyright(copyright);
             m_about_dialog.set_license("LGPL");
@@ -742,9 +790,12 @@
     public override void set_cursor_location(int x, int y,
                                              int width, int height) {
         m_candidate_panel.set_cursor_location(x, y, width, height);
+        m_property_panel.set_cursor_location(x, y, width, height);
     }
 
     public override void focus_in(string input_context_path) {
+        m_property_panel.focus_in();
+
         if (m_use_global_engine)
             return;
 
@@ -811,19 +862,24 @@
 
     public override void register_properties(IBus.PropList props) {
         m_property_manager.set_properties(props);
+        m_property_panel.set_properties(props);
     }
 
     public override void update_property(IBus.Property prop) {
         m_property_manager.update_property(prop);
+        m_property_panel.update_property(prop);
     }
 
     public override void update_preedit_text(IBus.Text text,
                                              uint cursor_pos,
                                              bool visible) {
-        if (visible)
+        if (visible) {
             m_candidate_panel.set_preedit_text(text, cursor_pos);
-        else
+            m_property_panel.set_preedit_text(text, cursor_pos);
+        } else {
             m_candidate_panel.set_preedit_text(null, 0);
+            m_property_panel.set_preedit_text(null, 0);
+        }
     }
 
     public override void hide_preedit_text() {
@@ -833,6 +889,7 @@
     public override void update_auxiliary_text(IBus.Text text,
                                                bool visible) {
         m_candidate_panel.set_auxiliary_text(visible ? text : null);
+        m_property_panel.set_auxiliary_text(visible ? text : null);
     }
 
     public override void hide_auxiliary_text() {
@@ -842,6 +899,7 @@
     public override void update_lookup_table(IBus.LookupTable table,
                                              bool visible) {
         m_candidate_panel.set_lookup_table(visible ? table : null);
+        m_property_panel.set_lookup_table(visible ? table : null);
     }
 
     public override void hide_lookup_table() {
diff -Nru ibus-1.5.4/ui/gtk3/pango.c ibus-1.5.5/ui/gtk3/pango.c
--- ibus-1.5.4/ui/gtk3/pango.c	2013-09-20 12:21:59.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/pango.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,4 +1,4 @@
-/* pango.c generated by valac 0.20.1, the Vala compiler
+/* pango.c generated by valac 0.22.0, the Vala compiler
  * generated from pango.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
@@ -32,17 +32,16 @@
 
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _pango_attribute_destroy0(var) ((var == NULL) ? NULL : (var = (pango_attribute_destroy (var), NULL)))
-#define __vala_PangoAttrList_free0(var) ((var == NULL) ? NULL : (var = (_vala_PangoAttrList_free (var), NULL)))
+#define _pango_attr_list_unref0(var) ((var == NULL) ? NULL : (var = (pango_attr_list_unref (var), NULL)))
 
 
 
 PangoAttrList* get_pango_attr_list_from_ibus_text (IBusText* text);
-static void _vala_PangoAttrList_free (PangoAttrList* self);
 
 
 static gint string_index_of_nth_char (const gchar* self, glong c) {
 	gint result = 0;
-	glong _tmp0_;
+	glong _tmp0_ = 0L;
 	gchar* _tmp1_ = NULL;
 	g_return_val_if_fail (self != NULL, 0);
 	_tmp0_ = c;
@@ -57,32 +56,27 @@
 }
 
 
-static void _vala_PangoAttrList_free (PangoAttrList* self) {
-	g_boxed_free (pango_attr_list_get_type (), self);
-}
-
-
 PangoAttrList* get_pango_attr_list_from_ibus_text (IBusText* text) {
 	PangoAttrList* result = NULL;
-	PangoAttrList* _tmp0_;
-	PangoAttrList* pango_attrs;
-	IBusText* _tmp1_;
+	PangoAttrList* pango_attrs = NULL;
+	PangoAttrList* _tmp0_ = NULL;
+	IBusAttrList* attrs = NULL;
+	IBusText* _tmp1_ = NULL;
 	IBusAttrList* _tmp2_ = NULL;
-	IBusAttrList* attrs;
-	IBusAttrList* _tmp3_;
-	IBusText* _tmp4_;
+	IBusAttrList* _tmp3_ = NULL;
+	const gchar* str = NULL;
+	IBusText* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-	const gchar* str;
-	const gchar* _tmp6_;
+	glong nchars = 0L;
+	const gchar* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-	glong nchars;
-	glong _tmp8_;
+	glong* offsets = NULL;
+	glong _tmp8_ = 0L;
 	glong* _tmp9_ = NULL;
-	glong* offsets;
-	gint offsets_length1;
-	gint _offsets_size_;
+	gint offsets_length1 = 0;
+	gint _offsets_size_ = 0;
 	IBusAttribute* attr = NULL;
-	gint i;
+	gint i = 0;
 	g_return_val_if_fail (text != NULL, NULL);
 	_tmp0_ = pango_attr_list_new ();
 	pango_attrs = _tmp0_;
@@ -106,25 +100,25 @@
 	offsets_length1 = _tmp8_ + 1;
 	_offsets_size_ = offsets_length1;
 	{
-		gint i;
+		gint i = 0;
 		i = 0;
 		{
-			gboolean _tmp10_;
+			gboolean _tmp10_ = FALSE;
 			_tmp10_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp11_;
-				gint _tmp13_;
-				glong _tmp14_;
-				glong* _tmp15_;
-				gint _tmp15__length1;
-				gint _tmp16_;
-				const gchar* _tmp17_;
-				gint _tmp18_;
+				gboolean _tmp11_ = FALSE;
+				gint _tmp13_ = 0;
+				glong _tmp14_ = 0L;
+				glong* _tmp15_ = NULL;
+				gint _tmp15__length1 = 0;
+				gint _tmp16_ = 0;
+				const gchar* _tmp17_ = NULL;
+				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
-				glong _tmp20_;
+				glong _tmp20_ = 0L;
 				_tmp11_ = _tmp10_;
 				if (!_tmp11_) {
-					gint _tmp12_;
+					gint _tmp12_ = 0;
 					_tmp12_ = i;
 					i = _tmp12_ + 1;
 				}
@@ -147,36 +141,36 @@
 	}
 	i = 0;
 	while (TRUE) {
-		IBusAttrList* _tmp21_;
-		gint _tmp22_;
+		IBusAttrList* _tmp21_ = NULL;
+		gint _tmp22_ = 0;
 		IBusAttribute* _tmp23_ = NULL;
-		IBusAttribute* _tmp24_;
-		IBusAttribute* _tmp25_;
-		IBusAttribute* _tmp26_;
-		guint _tmp27_;
-		glong start_index;
-		glong _tmp28_;
+		IBusAttribute* _tmp24_ = NULL;
+		IBusAttribute* _tmp25_ = NULL;
+		glong start_index = 0L;
+		IBusAttribute* _tmp26_ = NULL;
+		guint _tmp27_ = 0U;
+		glong _tmp28_ = 0L;
 		glong _tmp29_ = 0L;
-		glong _tmp30_;
-		glong _tmp31_;
-		glong _tmp37_;
-		IBusAttribute* _tmp38_;
-		guint _tmp39_;
-		glong end_index;
-		glong _tmp40_;
+		glong _tmp30_ = 0L;
+		glong _tmp31_ = 0L;
+		glong _tmp37_ = 0L;
+		glong end_index = 0L;
+		IBusAttribute* _tmp38_ = NULL;
+		guint _tmp39_ = 0U;
+		glong _tmp40_ = 0L;
 		glong _tmp41_ = 0L;
-		glong _tmp42_;
-		glong _tmp43_;
-		glong _tmp49_;
-		PangoAttribute* pango_attr;
-		IBusAttribute* _tmp50_;
-		guint _tmp51_;
-		PangoAttribute* _tmp75_;
-		glong _tmp76_;
-		PangoAttribute* _tmp77_;
-		glong _tmp78_;
-		PangoAttrList* _tmp79_;
-		PangoAttribute* _tmp80_;
+		glong _tmp42_ = 0L;
+		glong _tmp43_ = 0L;
+		glong _tmp49_ = 0L;
+		PangoAttribute* pango_attr = NULL;
+		IBusAttribute* _tmp50_ = NULL;
+		guint _tmp51_ = 0U;
+		PangoAttribute* _tmp75_ = NULL;
+		glong _tmp76_ = 0L;
+		PangoAttribute* _tmp77_ = NULL;
+		glong _tmp78_ = 0L;
+		PangoAttrList* _tmp79_ = NULL;
+		PangoAttribute* _tmp80_ = NULL;
 		_tmp21_ = attrs;
 		_tmp22_ = i;
 		i = _tmp22_ + 1;
@@ -198,19 +192,19 @@
 		_tmp30_ = start_index;
 		_tmp31_ = nchars;
 		if (_tmp30_ <= _tmp31_) {
-			glong* _tmp32_;
-			gint _tmp32__length1;
-			glong _tmp33_;
-			glong _tmp34_;
+			glong* _tmp32_ = NULL;
+			gint _tmp32__length1 = 0;
+			glong _tmp33_ = 0L;
+			glong _tmp34_ = 0L;
 			_tmp32_ = offsets;
 			_tmp32__length1 = offsets_length1;
 			_tmp33_ = start_index;
 			_tmp34_ = _tmp32_[_tmp33_];
 			_tmp29_ = _tmp34_;
 		} else {
-			glong* _tmp35_;
-			gint _tmp35__length1;
-			glong _tmp36_;
+			glong* _tmp35_ = NULL;
+			gint _tmp35__length1 = 0;
+			glong _tmp36_ = 0L;
 			_tmp35_ = offsets;
 			_tmp35__length1 = offsets_length1;
 			_tmp36_ = _tmp35_[-1];
@@ -228,19 +222,19 @@
 		_tmp42_ = end_index;
 		_tmp43_ = nchars;
 		if (_tmp42_ <= _tmp43_) {
-			glong* _tmp44_;
-			gint _tmp44__length1;
-			glong _tmp45_;
-			glong _tmp46_;
+			glong* _tmp44_ = NULL;
+			gint _tmp44__length1 = 0;
+			glong _tmp45_ = 0L;
+			glong _tmp46_ = 0L;
 			_tmp44_ = offsets;
 			_tmp44__length1 = offsets_length1;
 			_tmp45_ = end_index;
 			_tmp46_ = _tmp44_[_tmp45_];
 			_tmp41_ = _tmp46_;
 		} else {
-			glong* _tmp47_;
-			gint _tmp47__length1;
-			glong _tmp48_;
+			glong* _tmp47_ = NULL;
+			gint _tmp47__length1 = 0;
+			glong _tmp48_ = 0L;
 			_tmp47_ = offsets;
 			_tmp47__length1 = offsets_length1;
 			_tmp48_ = _tmp47_[-1];
@@ -255,18 +249,18 @@
 			case IBUS_ATTR_TYPE_FOREGROUND:
 			{
 				{
-					IBusAttribute* _tmp52_;
-					guint _tmp53_;
-					guint16 r;
-					IBusAttribute* _tmp54_;
-					guint _tmp55_;
-					guint16 g;
-					IBusAttribute* _tmp56_;
-					guint _tmp57_;
-					guint16 b;
-					guint16 _tmp58_;
-					guint16 _tmp59_;
-					guint16 _tmp60_;
+					guint16 r = 0U;
+					IBusAttribute* _tmp52_ = NULL;
+					guint _tmp53_ = 0U;
+					guint16 g = 0U;
+					IBusAttribute* _tmp54_ = NULL;
+					guint _tmp55_ = 0U;
+					guint16 b = 0U;
+					IBusAttribute* _tmp56_ = NULL;
+					guint _tmp57_ = 0U;
+					guint16 _tmp58_ = 0U;
+					guint16 _tmp59_ = 0U;
+					guint16 _tmp60_ = 0U;
 					PangoAttribute* _tmp61_ = NULL;
 					_tmp52_ = attr;
 					_tmp53_ = _tmp52_->value;
@@ -289,18 +283,18 @@
 			case IBUS_ATTR_TYPE_BACKGROUND:
 			{
 				{
-					IBusAttribute* _tmp62_;
-					guint _tmp63_;
-					guint16 r;
-					IBusAttribute* _tmp64_;
-					guint _tmp65_;
-					guint16 g;
-					IBusAttribute* _tmp66_;
-					guint _tmp67_;
-					guint16 b;
-					guint16 _tmp68_;
-					guint16 _tmp69_;
-					guint16 _tmp70_;
+					guint16 r = 0U;
+					IBusAttribute* _tmp62_ = NULL;
+					guint _tmp63_ = 0U;
+					guint16 g = 0U;
+					IBusAttribute* _tmp64_ = NULL;
+					guint _tmp65_ = 0U;
+					guint16 b = 0U;
+					IBusAttribute* _tmp66_ = NULL;
+					guint _tmp67_ = 0U;
+					guint16 _tmp68_ = 0U;
+					guint16 _tmp69_ = 0U;
+					guint16 _tmp70_ = 0U;
 					PangoAttribute* _tmp71_ = NULL;
 					_tmp62_ = attr;
 					_tmp63_ = _tmp62_->value;
@@ -323,8 +317,8 @@
 			case IBUS_ATTR_TYPE_UNDERLINE:
 			{
 				{
-					IBusAttribute* _tmp72_;
-					guint _tmp73_;
+					IBusAttribute* _tmp72_ = NULL;
+					guint _tmp73_ = 0U;
 					PangoAttribute* _tmp74_ = NULL;
 					_tmp72_ = attr;
 					_tmp73_ = _tmp72_->value;
diff -Nru ibus-1.5.4/ui/gtk3/property.c ibus-1.5.5/ui/gtk3/property.c
--- ibus-1.5.4/ui/gtk3/property.c	2013-09-20 12:21:59.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/property.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,11 +1,11 @@
-/* property.c generated by valac 0.20.1, the Vala compiler
+/* property.c generated by valac 0.22.0, the Vala compiler
  * generated from property.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang 
+ * Copyright(c) 2011-2013 Peng Huang 
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -218,8 +218,8 @@
 PropSeparatorMenuItem* prop_separator_menu_item_new (IBusProperty* property);
 PropSeparatorMenuItem* prop_separator_menu_item_construct (GType object_type, IBusProperty* property);
 GType prop_separator_menu_item_get_type (void) G_GNUC_CONST;
-static void ____lambda16_ (PropertyManager* self, const gchar* k, gint s);
-static void _____lambda16__iprop_item_property_activate (IPropItem* _sender, const gchar* key, gint state, gpointer self);
+static void ____lambda17_ (PropertyManager* self, const gchar* k, gint s);
+static void _____lambda17__iprop_item_property_activate (IPropItem* _sender, const gchar* key, gint state, gpointer self);
 void property_manager_update_property (PropertyManager* self, IBusProperty* prop);
 PropertyManager* property_manager_new (void);
 PropertyManager* property_manager_construct (GType object_type);
@@ -268,8 +268,8 @@
 
 
 void property_manager_set_properties (PropertyManager* self, IBusPropList* props) {
-	IBusPropList* _tmp0_;
-	IBusPropList* _tmp1_;
+	IBusPropList* _tmp0_ = NULL;
+	IBusPropList* _tmp1_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (props != NULL);
 	_tmp0_ = props;
@@ -281,8 +281,8 @@
 
 gint property_manager_create_menu_items (PropertyManager* self, GtkMenu* menu) {
 	gint result = 0;
-	IBusPropList* _tmp0_;
-	GtkMenu* _tmp1_;
+	IBusPropList* _tmp0_ = NULL;
+	GtkMenu* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	g_return_val_if_fail (self != NULL, 0);
 	g_return_val_if_fail (menu != NULL, 0);
@@ -294,9 +294,9 @@
 }
 
 
-static void ____lambda16_ (PropertyManager* self, const gchar* k, gint s) {
-	const gchar* _tmp0_;
-	gint _tmp1_;
+static void ____lambda17_ (PropertyManager* self, const gchar* k, gint s) {
+	const gchar* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
 	g_return_if_fail (k != NULL);
 	_tmp0_ = k;
 	_tmp1_ = s;
@@ -304,36 +304,36 @@
 }
 
 
-static void _____lambda16__iprop_item_property_activate (IPropItem* _sender, const gchar* key, gint state, gpointer self) {
-	____lambda16_ (self, key, state);
+static void _____lambda17__iprop_item_property_activate (IPropItem* _sender, const gchar* key, gint state, gpointer self) {
+	____lambda17_ (self, key, state);
 }
 
 
 static gint property_manager_create_menu_items_internal (PropertyManager* self, IBusPropList* props, GtkMenu* menu) {
 	gint result = 0;
-	gint i;
-	PropRadioMenuItem* last_radio;
+	gint i = 0;
+	PropRadioMenuItem* last_radio = NULL;
 	g_return_val_if_fail (self != NULL, 0);
 	g_return_val_if_fail (props != NULL, 0);
 	g_return_val_if_fail (menu != NULL, 0);
 	i = 0;
 	last_radio = NULL;
 	while (TRUE) {
-		IBusPropList* _tmp0_;
-		gint _tmp1_;
+		IBusProperty* prop = NULL;
+		IBusPropList* _tmp0_ = NULL;
+		gint _tmp1_ = 0;
 		IBusProperty* _tmp2_ = NULL;
-		IBusProperty* _tmp3_;
-		IBusProperty* prop;
-		IBusProperty* _tmp4_;
-		IBusProperty* _tmp5_;
+		IBusProperty* _tmp3_ = NULL;
+		IBusProperty* _tmp4_ = NULL;
+		IBusProperty* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-		gint _tmp7_;
-		IPropItem* item;
-		IBusProperty* _tmp8_;
+		gint _tmp7_ = 0;
+		IPropItem* item = NULL;
+		IBusProperty* _tmp8_ = NULL;
 		IBusPropType _tmp9_ = 0;
-		IBusProperty* _tmp36_;
+		IBusProperty* _tmp36_ = NULL;
 		IBusPropType _tmp37_ = 0;
-		IPropItem* _tmp38_;
+		IPropItem* _tmp38_ = NULL;
 		_tmp0_ = props;
 		_tmp1_ = i;
 		_tmp2_ = ibus_prop_list_get (_tmp0_, (guint) _tmp1_);
@@ -355,8 +355,8 @@
 		switch (_tmp9_) {
 			case PROP_TYPE_NORMAL:
 			{
-				IBusProperty* _tmp10_;
-				PropImageMenuItem* _tmp11_;
+				IBusProperty* _tmp10_ = NULL;
+				PropImageMenuItem* _tmp11_ = NULL;
 				_tmp10_ = prop;
 				_tmp11_ = prop_image_menu_item_new (_tmp10_);
 				g_object_ref_sink (_tmp11_);
@@ -366,8 +366,8 @@
 			}
 			case PROP_TYPE_TOGGLE:
 			{
-				IBusProperty* _tmp12_;
-				PropCheckMenuItem* _tmp13_;
+				IBusProperty* _tmp12_ = NULL;
+				PropCheckMenuItem* _tmp13_ = NULL;
 				_tmp12_ = prop;
 				_tmp13_ = prop_check_menu_item_new (_tmp12_);
 				g_object_ref_sink (_tmp13_);
@@ -378,14 +378,14 @@
 			case PROP_TYPE_RADIO:
 			{
 				{
-					IBusProperty* _tmp14_;
-					PropRadioMenuItem* _tmp15_;
-					PropRadioMenuItem* _tmp16_;
-					PropRadioMenuItem* radio;
-					PropRadioMenuItem* _tmp17_;
-					IPropItem* _tmp18_;
-					PropRadioMenuItem* _tmp19_;
-					PropRadioMenuItem* _tmp20_;
+					PropRadioMenuItem* radio = NULL;
+					IBusProperty* _tmp14_ = NULL;
+					PropRadioMenuItem* _tmp15_ = NULL;
+					PropRadioMenuItem* _tmp16_ = NULL;
+					PropRadioMenuItem* _tmp17_ = NULL;
+					IPropItem* _tmp18_ = NULL;
+					PropRadioMenuItem* _tmp19_ = NULL;
+					PropRadioMenuItem* _tmp20_ = NULL;
 					_tmp14_ = prop;
 					_tmp15_ = last_radio;
 					_tmp16_ = prop_radio_menu_item_new (_tmp14_, _tmp15_);
@@ -406,16 +406,16 @@
 			case PROP_TYPE_MENU:
 			{
 				{
-					IBusProperty* _tmp21_;
-					PropImageMenuItem* _tmp22_;
-					PropImageMenuItem* menuitem;
-					PropImageMenuItem* _tmp23_;
-					IPropItem* _tmp24_;
-					GtkMenu* _tmp25_;
-					GtkMenu* submenu;
-					IBusProperty* _tmp26_;
+					PropImageMenuItem* menuitem = NULL;
+					IBusProperty* _tmp21_ = NULL;
+					PropImageMenuItem* _tmp22_ = NULL;
+					PropImageMenuItem* _tmp23_ = NULL;
+					IPropItem* _tmp24_ = NULL;
+					GtkMenu* submenu = NULL;
+					GtkMenu* _tmp25_ = NULL;
+					IBusProperty* _tmp26_ = NULL;
 					IBusPropList* _tmp27_ = NULL;
-					GtkMenu* _tmp28_;
+					GtkMenu* _tmp28_ = NULL;
 					gint _tmp29_ = 0;
 					_tmp21_ = prop;
 					_tmp22_ = prop_image_menu_item_new (_tmp21_);
@@ -433,8 +433,8 @@
 					_tmp28_ = submenu;
 					_tmp29_ = property_manager_create_menu_items_internal (self, _tmp27_, _tmp28_);
 					if (_tmp29_ > 0) {
-						PropImageMenuItem* _tmp30_;
-						GtkMenu* _tmp31_;
+						PropImageMenuItem* _tmp30_ = NULL;
+						GtkMenu* _tmp31_ = NULL;
 						_tmp30_ = menuitem;
 						_tmp31_ = submenu;
 						gtk_menu_item_set_submenu ((GtkMenuItem*) _tmp30_, (GtkWidget*) _tmp31_);
@@ -446,8 +446,8 @@
 			}
 			case PROP_TYPE_SEPARATOR:
 			{
-				IBusProperty* _tmp32_;
-				PropSeparatorMenuItem* _tmp33_;
+				IBusProperty* _tmp32_ = NULL;
+				PropSeparatorMenuItem* _tmp33_ = NULL;
 				_tmp32_ = prop;
 				_tmp33_ = prop_separator_menu_item_new (_tmp32_);
 				g_object_ref_sink (_tmp33_);
@@ -457,7 +457,7 @@
 			}
 			default:
 			{
-				IBusProperty* _tmp34_;
+				IBusProperty* _tmp34_ = NULL;
 				IBusPropType _tmp35_ = 0;
 				_tmp34_ = prop;
 				_tmp35_ = ibus_property_get_prop_type (_tmp34_);
@@ -473,14 +473,14 @@
 		}
 		_tmp38_ = item;
 		if (_tmp38_ != NULL) {
-			GtkMenu* _tmp39_;
-			IPropItem* _tmp40_;
-			IPropItem* _tmp41_;
+			GtkMenu* _tmp39_ = NULL;
+			IPropItem* _tmp40_ = NULL;
+			IPropItem* _tmp41_ = NULL;
 			_tmp39_ = menu;
 			_tmp40_ = item;
 			gtk_menu_shell_append ((GtkMenuShell*) _tmp39_, (GtkWidget*) (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, GTK_TYPE_MENU_ITEM) ? ((GtkMenuItem*) _tmp40_) : NULL));
 			_tmp41_ = item;
-			g_signal_connect (_tmp41_, "property-activate", (GCallback) _____lambda16__iprop_item_property_activate, self);
+			g_signal_connect (_tmp41_, "property-activate", (GCallback) _____lambda17__iprop_item_property_activate, self);
 		}
 		_g_object_unref0 (item);
 		_g_object_unref0 (prop);
@@ -492,16 +492,16 @@
 
 
 void property_manager_update_property (PropertyManager* self, IBusProperty* prop) {
-	IBusProperty* _tmp0_;
-	IBusPropList* _tmp1_;
+	IBusProperty* _tmp0_ = NULL;
+	IBusPropList* _tmp1_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (prop != NULL);
 	_tmp0_ = prop;
 	_vala_assert (_tmp0_ != NULL, "prop != null");
 	_tmp1_ = self->priv->m_props;
 	if (_tmp1_ != NULL) {
-		IBusPropList* _tmp2_;
-		IBusProperty* _tmp3_;
+		IBusPropList* _tmp2_ = NULL;
+		IBusProperty* _tmp3_ = NULL;
 		_tmp2_ = self->priv->m_props;
 		_tmp3_ = prop;
 		ibus_prop_list_update_property (_tmp2_, _tmp3_);
@@ -734,9 +734,9 @@
 
 PropImageMenuItem* prop_image_menu_item_construct (GType object_type, IBusProperty* property) {
 	PropImageMenuItem * self = NULL;
-	IBusProperty* _tmp0_;
-	IBusProperty* _tmp1_;
-	IBusProperty* _tmp2_;
+	IBusProperty* _tmp0_ = NULL;
+	IBusProperty* _tmp1_ = NULL;
+	IBusProperty* _tmp2_ = NULL;
 	g_return_val_if_fail (property != NULL, NULL);
 	self = (PropImageMenuItem*) g_object_new (object_type, NULL);
 	_tmp0_ = property;
@@ -758,63 +758,74 @@
 
 static void prop_image_menu_item_real_update_property (IPropItem* base, IBusProperty* property) {
 	PropImageMenuItem * self;
-	IBusProperty* _tmp0_;
-	IBusProperty* _tmp1_;
-	IBusText* _tmp2_ = NULL;
-	IBusProperty* _tmp3_;
-	IBusProperty* _tmp4_;
-	const gchar* _tmp5_ = NULL;
-	IBusProperty* _tmp6_;
-	IBusProperty* _tmp7_;
-	gboolean _tmp8_ = FALSE;
-	IBusProperty* _tmp9_;
-	IBusProperty* _tmp10_;
-	gboolean _tmp11_ = FALSE;
-	IBusProperty* _tmp12_;
-	IBusProperty* _tmp13_;
-	IBusText* _tmp14_ = NULL;
-	IBusProperty* _tmp15_;
-	IBusProperty* _tmp16_;
-	IBusPropState _tmp17_ = 0;
+	IBusProperty* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	IBusProperty* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	IBusProperty* _tmp4_ = NULL;
+	IBusProperty* _tmp5_ = NULL;
+	IBusText* _tmp6_ = NULL;
+	IBusProperty* _tmp7_ = NULL;
+	IBusProperty* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	IBusProperty* _tmp10_ = NULL;
+	IBusProperty* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
+	IBusProperty* _tmp13_ = NULL;
+	IBusProperty* _tmp14_ = NULL;
+	gboolean _tmp15_ = FALSE;
+	IBusProperty* _tmp16_ = NULL;
+	IBusProperty* _tmp17_ = NULL;
+	IBusText* _tmp18_ = NULL;
+	IBusProperty* _tmp19_ = NULL;
+	IBusProperty* _tmp20_ = NULL;
+	IBusPropState _tmp21_ = 0;
 	self = (PropImageMenuItem*) base;
 	g_return_if_fail (property != NULL);
 	_tmp0_ = self->priv->m_property;
-	_tmp1_ = property;
-	_tmp2_ = ibus_property_get_label (_tmp1_);
-	ibus_property_set_label (_tmp0_, _tmp2_);
-	_tmp3_ = self->priv->m_property;
-	_tmp4_ = property;
-	_tmp5_ = ibus_property_get_icon (_tmp4_);
-	ibus_property_set_icon (_tmp3_, _tmp5_);
-	_tmp6_ = self->priv->m_property;
-	_tmp7_ = property;
-	_tmp8_ = ibus_property_get_visible (_tmp7_);
-	ibus_property_set_visible (_tmp6_, _tmp8_);
-	_tmp9_ = self->priv->m_property;
-	_tmp10_ = property;
-	_tmp11_ = ibus_property_get_sensitive (_tmp10_);
-	ibus_property_set_sensitive (_tmp9_, _tmp11_);
-	_tmp12_ = self->priv->m_property;
-	_tmp13_ = property;
-	_tmp14_ = ibus_property_get_tooltip (_tmp13_);
-	ibus_property_set_tooltip (_tmp12_, _tmp14_);
-	_tmp15_ = self->priv->m_property;
-	_tmp16_ = property;
-	_tmp17_ = ibus_property_get_state (_tmp16_);
-	ibus_property_set_state (_tmp15_, _tmp17_);
+	_tmp1_ = ibus_property_get_key (_tmp0_);
+	_tmp2_ = property;
+	_tmp3_ = ibus_property_get_key (_tmp2_);
+	if (g_strcmp0 (_tmp1_, _tmp3_) != 0) {
+		return;
+	}
+	_tmp4_ = self->priv->m_property;
+	_tmp5_ = property;
+	_tmp6_ = ibus_property_get_label (_tmp5_);
+	ibus_property_set_label (_tmp4_, _tmp6_);
+	_tmp7_ = self->priv->m_property;
+	_tmp8_ = property;
+	_tmp9_ = ibus_property_get_icon (_tmp8_);
+	ibus_property_set_icon (_tmp7_, _tmp9_);
+	_tmp10_ = self->priv->m_property;
+	_tmp11_ = property;
+	_tmp12_ = ibus_property_get_visible (_tmp11_);
+	ibus_property_set_visible (_tmp10_, _tmp12_);
+	_tmp13_ = self->priv->m_property;
+	_tmp14_ = property;
+	_tmp15_ = ibus_property_get_sensitive (_tmp14_);
+	ibus_property_set_sensitive (_tmp13_, _tmp15_);
+	_tmp16_ = self->priv->m_property;
+	_tmp17_ = property;
+	_tmp18_ = ibus_property_get_tooltip (_tmp17_);
+	ibus_property_set_tooltip (_tmp16_, _tmp18_);
+	_tmp19_ = self->priv->m_property;
+	_tmp20_ = property;
+	_tmp21_ = ibus_property_get_state (_tmp20_);
+	ibus_property_set_state (_tmp19_, _tmp21_);
 	prop_image_menu_item_sync (self);
 }
 
 
 static void prop_image_menu_item_sync (PropImageMenuItem* self) {
-	IBusProperty* _tmp0_;
+	IBusProperty* _tmp0_ = NULL;
 	IBusText* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-	IBusProperty* _tmp3_;
+	IBusProperty* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-	IBusProperty* _tmp7_;
+	IBusProperty* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-	IBusProperty* _tmp9_;
+	IBusProperty* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_property;
@@ -824,7 +835,7 @@
 	_tmp3_ = self->priv->m_property;
 	_tmp4_ = ibus_property_get_icon (_tmp3_);
 	if (g_strcmp0 (_tmp4_, "") != 0) {
-		IBusProperty* _tmp5_;
+		IBusProperty* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
 		_tmp5_ = self->priv->m_property;
 		_tmp6_ = ibus_property_get_icon (_tmp5_);
@@ -840,9 +851,9 @@
 
 
 static void prop_image_menu_item_set_icon (PropImageMenuItem* self, const gchar* icon) {
-	const gchar* _tmp0_;
-	IconWidget* _tmp1_;
-	IconWidget* _tmp2_;
+	const gchar* _tmp0_ = NULL;
+	IconWidget* _tmp1_ = NULL;
+	IconWidget* _tmp2_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (icon != NULL);
 	_tmp0_ = icon;
@@ -856,9 +867,9 @@
 
 static void prop_image_menu_item_real_activate (GtkMenuItem* base) {
 	PropImageMenuItem * self;
-	IBusProperty* _tmp0_;
+	IBusProperty* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-	IBusProperty* _tmp2_;
+	IBusProperty* _tmp2_ = NULL;
 	IBusPropState _tmp3_ = 0;
 	self = (PropImageMenuItem*) base;
 	_tmp0_ = self->priv->m_property;
@@ -912,9 +923,9 @@
 
 PropCheckMenuItem* prop_check_menu_item_construct (GType object_type, IBusProperty* property) {
 	PropCheckMenuItem * self = NULL;
-	IBusProperty* _tmp0_;
-	IBusProperty* _tmp1_;
-	IBusProperty* _tmp2_;
+	IBusProperty* _tmp0_ = NULL;
+	IBusProperty* _tmp1_ = NULL;
+	IBusProperty* _tmp2_ = NULL;
 	g_return_val_if_fail (property != NULL, NULL);
 	self = (PropCheckMenuItem*) g_object_new (object_type, NULL);
 	_tmp0_ = property;
@@ -936,63 +947,74 @@
 
 static void prop_check_menu_item_real_update_property (IPropItem* base, IBusProperty* property) {
 	PropCheckMenuItem * self;
-	IBusProperty* _tmp0_;
-	IBusProperty* _tmp1_;
-	IBusText* _tmp2_ = NULL;
-	IBusProperty* _tmp3_;
-	IBusProperty* _tmp4_;
-	const gchar* _tmp5_ = NULL;
-	IBusProperty* _tmp6_;
-	IBusProperty* _tmp7_;
-	gboolean _tmp8_ = FALSE;
-	IBusProperty* _tmp9_;
-	IBusProperty* _tmp10_;
-	gboolean _tmp11_ = FALSE;
-	IBusProperty* _tmp12_;
-	IBusProperty* _tmp13_;
-	IBusText* _tmp14_ = NULL;
-	IBusProperty* _tmp15_;
-	IBusProperty* _tmp16_;
-	IBusPropState _tmp17_ = 0;
+	IBusProperty* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	IBusProperty* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	IBusProperty* _tmp4_ = NULL;
+	IBusProperty* _tmp5_ = NULL;
+	IBusText* _tmp6_ = NULL;
+	IBusProperty* _tmp7_ = NULL;
+	IBusProperty* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	IBusProperty* _tmp10_ = NULL;
+	IBusProperty* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
+	IBusProperty* _tmp13_ = NULL;
+	IBusProperty* _tmp14_ = NULL;
+	gboolean _tmp15_ = FALSE;
+	IBusProperty* _tmp16_ = NULL;
+	IBusProperty* _tmp17_ = NULL;
+	IBusText* _tmp18_ = NULL;
+	IBusProperty* _tmp19_ = NULL;
+	IBusProperty* _tmp20_ = NULL;
+	IBusPropState _tmp21_ = 0;
 	self = (PropCheckMenuItem*) base;
 	g_return_if_fail (property != NULL);
 	_tmp0_ = self->priv->m_property;
-	_tmp1_ = property;
-	_tmp2_ = ibus_property_get_label (_tmp1_);
-	ibus_property_set_label (_tmp0_, _tmp2_);
-	_tmp3_ = self->priv->m_property;
-	_tmp4_ = property;
-	_tmp5_ = ibus_property_get_icon (_tmp4_);
-	ibus_property_set_icon (_tmp3_, _tmp5_);
-	_tmp6_ = self->priv->m_property;
-	_tmp7_ = property;
-	_tmp8_ = ibus_property_get_visible (_tmp7_);
-	ibus_property_set_visible (_tmp6_, _tmp8_);
-	_tmp9_ = self->priv->m_property;
-	_tmp10_ = property;
-	_tmp11_ = ibus_property_get_sensitive (_tmp10_);
-	ibus_property_set_sensitive (_tmp9_, _tmp11_);
-	_tmp12_ = self->priv->m_property;
-	_tmp13_ = property;
-	_tmp14_ = ibus_property_get_tooltip (_tmp13_);
-	ibus_property_set_tooltip (_tmp12_, _tmp14_);
-	_tmp15_ = self->priv->m_property;
-	_tmp16_ = property;
-	_tmp17_ = ibus_property_get_state (_tmp16_);
-	ibus_property_set_state (_tmp15_, _tmp17_);
+	_tmp1_ = ibus_property_get_key (_tmp0_);
+	_tmp2_ = property;
+	_tmp3_ = ibus_property_get_key (_tmp2_);
+	if (g_strcmp0 (_tmp1_, _tmp3_) != 0) {
+		return;
+	}
+	_tmp4_ = self->priv->m_property;
+	_tmp5_ = property;
+	_tmp6_ = ibus_property_get_label (_tmp5_);
+	ibus_property_set_label (_tmp4_, _tmp6_);
+	_tmp7_ = self->priv->m_property;
+	_tmp8_ = property;
+	_tmp9_ = ibus_property_get_icon (_tmp8_);
+	ibus_property_set_icon (_tmp7_, _tmp9_);
+	_tmp10_ = self->priv->m_property;
+	_tmp11_ = property;
+	_tmp12_ = ibus_property_get_visible (_tmp11_);
+	ibus_property_set_visible (_tmp10_, _tmp12_);
+	_tmp13_ = self->priv->m_property;
+	_tmp14_ = property;
+	_tmp15_ = ibus_property_get_sensitive (_tmp14_);
+	ibus_property_set_sensitive (_tmp13_, _tmp15_);
+	_tmp16_ = self->priv->m_property;
+	_tmp17_ = property;
+	_tmp18_ = ibus_property_get_tooltip (_tmp17_);
+	ibus_property_set_tooltip (_tmp16_, _tmp18_);
+	_tmp19_ = self->priv->m_property;
+	_tmp20_ = property;
+	_tmp21_ = ibus_property_get_state (_tmp20_);
+	ibus_property_set_state (_tmp19_, _tmp21_);
 	prop_check_menu_item_sync (self);
 }
 
 
 static void prop_check_menu_item_sync (PropCheckMenuItem* self) {
-	IBusProperty* _tmp0_;
+	IBusProperty* _tmp0_ = NULL;
 	IBusText* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-	IBusProperty* _tmp3_;
+	IBusProperty* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-	IBusProperty* _tmp5_;
+	IBusProperty* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-	IBusProperty* _tmp7_;
+	IBusProperty* _tmp7_ = NULL;
 	IBusPropState _tmp8_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_property;
@@ -1015,11 +1037,11 @@
 	PropCheckMenuItem * self;
 	IBusPropState _tmp0_ = 0;
 	gboolean _tmp1_ = FALSE;
-	IBusPropState _tmp2_;
-	IBusPropState new_state;
-	IBusProperty* _tmp3_;
+	IBusPropState new_state = 0;
+	IBusPropState _tmp2_ = 0;
+	IBusProperty* _tmp3_ = NULL;
 	IBusPropState _tmp4_ = 0;
-	IBusPropState _tmp5_;
+	IBusPropState _tmp5_ = 0;
 	self = (PropCheckMenuItem*) base;
 	_tmp1_ = gtk_check_menu_item_get_active ((GtkCheckMenuItem*) self);
 	if (_tmp1_) {
@@ -1033,11 +1055,11 @@
 	_tmp4_ = ibus_property_get_state (_tmp3_);
 	_tmp5_ = new_state;
 	if (_tmp4_ != _tmp5_) {
-		IBusProperty* _tmp6_;
-		IBusPropState _tmp7_;
-		IBusProperty* _tmp8_;
+		IBusProperty* _tmp6_ = NULL;
+		IBusPropState _tmp7_ = 0;
+		IBusProperty* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
-		IBusProperty* _tmp10_;
+		IBusProperty* _tmp10_ = NULL;
 		IBusPropState _tmp11_ = 0;
 		_tmp6_ = self->priv->m_property;
 		_tmp7_ = new_state;
@@ -1094,14 +1116,14 @@
 
 PropRadioMenuItem* prop_radio_menu_item_construct (GType object_type, IBusProperty* property, PropRadioMenuItem* group_source) {
 	PropRadioMenuItem * self = NULL;
-	IBusProperty* _tmp0_;
-	PropRadioMenuItem* _tmp1_;
+	IBusProperty* _tmp0_ = NULL;
+	PropRadioMenuItem* _tmp1_ = NULL;
 	g_return_val_if_fail (property != NULL, NULL);
 	_tmp0_ = property;
 	self = (PropRadioMenuItem*) prop_check_menu_item_construct (object_type, _tmp0_);
 	_tmp1_ = group_source;
 	if (_tmp1_ != NULL) {
-		PropRadioMenuItem* _tmp2_;
+		PropRadioMenuItem* _tmp2_ = NULL;
 		GSList* _tmp3_ = NULL;
 		_tmp2_ = group_source;
 		_tmp3_ = gtk_radio_menu_item_get_group ((GtkRadioMenuItem*) _tmp2_);
@@ -1139,9 +1161,9 @@
 
 PropSeparatorMenuItem* prop_separator_menu_item_construct (GType object_type, IBusProperty* property) {
 	PropSeparatorMenuItem * self = NULL;
-	IBusProperty* _tmp0_;
-	IBusProperty* _tmp1_;
-	IBusProperty* _tmp2_;
+	IBusProperty* _tmp0_ = NULL;
+	IBusProperty* _tmp1_ = NULL;
+	IBusProperty* _tmp2_ = NULL;
 	g_return_val_if_fail (property != NULL, NULL);
 	self = (PropSeparatorMenuItem*) g_object_new (object_type, NULL);
 	_tmp0_ = property;
diff -Nru ibus-1.5.4/ui/gtk3/property.vala ibus-1.5.5/ui/gtk3/property.vala
--- ibus-1.5.4/ui/gtk3/property.vala	2013-09-20 12:15:51.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/property.vala	2014-01-14 12:59:14.000000000 +0900
@@ -2,7 +2,7 @@
  *
  * ibus - The Input Bus
  *
- * Copyright(c) 2011 Peng Huang 
+ * Copyright(c) 2011-2013 Peng Huang 
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -111,6 +111,9 @@
     }
 
     public void update_property(IBus.Property property) {
+        if (m_property.get_key() != property.get_key())
+            return;
+
         m_property.set_label(property.get_label());
         m_property.set_icon(property.get_icon());
         m_property.set_visible(property.get_visible());
@@ -148,6 +151,9 @@
     }
 
     public void update_property(IBus.Property property) {
+        if (m_property.get_key() != property.get_key())
+            return;
+
         m_property.set_label(property.get_label());
         m_property.set_icon(property.get_icon());
         m_property.set_visible(property.get_visible());
diff -Nru ibus-1.5.4/ui/gtk3/propertypanel.c ibus-1.5.5/ui/gtk3/propertypanel.c
--- ibus-1.5.4/ui/gtk3/propertypanel.c	1970-01-01 09:00:00.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/propertypanel.c	2014-01-14 13:03:40.000000000 +0900
@@ -0,0 +1,2486 @@
+/* propertypanel.c generated by valac 0.22.0, the Vala compiler
+ * generated from propertypanel.vala, do not modify */
+
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2013 Red Hat, Inc.
+ * Copyright(c) 2013 Peng Huang 
+ * Copyright(c) 2013 Takao Fujiwara 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+
+#define TYPE_PANEL_SHOW (panel_show_get_type ())
+
+#define TYPE_PROPERTY_PANEL (property_panel_get_type ())
+#define PROPERTY_PANEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROPERTY_PANEL, PropertyPanel))
+#define PROPERTY_PANEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROPERTY_PANEL, PropertyPanelClass))
+#define IS_PROPERTY_PANEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROPERTY_PANEL))
+#define IS_PROPERTY_PANEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROPERTY_PANEL))
+#define PROPERTY_PANEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROPERTY_PANEL, PropertyPanelClass))
+
+typedef struct _PropertyPanel PropertyPanel;
+typedef struct _PropertyPanelClass PropertyPanelClass;
+typedef struct _PropertyPanelPrivate PropertyPanelPrivate;
+
+#define TYPE_IPROP_TOOL_ITEM (iprop_tool_item_get_type ())
+#define IPROP_TOOL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IPROP_TOOL_ITEM, IPropToolItem))
+#define IS_IPROP_TOOL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IPROP_TOOL_ITEM))
+#define IPROP_TOOL_ITEM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_IPROP_TOOL_ITEM, IPropToolItemIface))
+
+typedef struct _IPropToolItem IPropToolItem;
+typedef struct _IPropToolItemIface IPropToolItemIface;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define TYPE_HANDLE (handle_get_type ())
+#define HANDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HANDLE, Handle))
+#define HANDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_HANDLE, HandleClass))
+#define IS_HANDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_HANDLE))
+#define IS_HANDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_HANDLE))
+#define HANDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_HANDLE, HandleClass))
+
+typedef struct _Handle Handle;
+typedef struct _HandleClass HandleClass;
+
+#define TYPE_PROP_TOOL_BUTTON (prop_tool_button_get_type ())
+#define PROP_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROP_TOOL_BUTTON, PropToolButton))
+#define PROP_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROP_TOOL_BUTTON, PropToolButtonClass))
+#define IS_PROP_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROP_TOOL_BUTTON))
+#define IS_PROP_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROP_TOOL_BUTTON))
+#define PROP_TOOL_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROP_TOOL_BUTTON, PropToolButtonClass))
+
+typedef struct _PropToolButton PropToolButton;
+typedef struct _PropToolButtonClass PropToolButtonClass;
+
+#define TYPE_PROP_TOGGLE_TOOL_BUTTON (prop_toggle_tool_button_get_type ())
+#define PROP_TOGGLE_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROP_TOGGLE_TOOL_BUTTON, PropToggleToolButton))
+#define PROP_TOGGLE_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROP_TOGGLE_TOOL_BUTTON, PropToggleToolButtonClass))
+#define IS_PROP_TOGGLE_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROP_TOGGLE_TOOL_BUTTON))
+#define IS_PROP_TOGGLE_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROP_TOGGLE_TOOL_BUTTON))
+#define PROP_TOGGLE_TOOL_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROP_TOGGLE_TOOL_BUTTON, PropToggleToolButtonClass))
+
+typedef struct _PropToggleToolButton PropToggleToolButton;
+typedef struct _PropToggleToolButtonClass PropToggleToolButtonClass;
+
+#define TYPE_PROP_MENU_TOOL_BUTTON (prop_menu_tool_button_get_type ())
+#define PROP_MENU_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROP_MENU_TOOL_BUTTON, PropMenuToolButton))
+#define PROP_MENU_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROP_MENU_TOOL_BUTTON, PropMenuToolButtonClass))
+#define IS_PROP_MENU_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROP_MENU_TOOL_BUTTON))
+#define IS_PROP_MENU_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROP_MENU_TOOL_BUTTON))
+#define PROP_MENU_TOOL_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROP_MENU_TOOL_BUTTON, PropMenuToolButtonClass))
+
+typedef struct _PropMenuToolButton PropMenuToolButton;
+typedef struct _PropMenuToolButtonClass PropMenuToolButtonClass;
+
+#define TYPE_PROP_SEPARATOR_TOOL_ITEM (prop_separator_tool_item_get_type ())
+#define PROP_SEPARATOR_TOOL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROP_SEPARATOR_TOOL_ITEM, PropSeparatorToolItem))
+#define PROP_SEPARATOR_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROP_SEPARATOR_TOOL_ITEM, PropSeparatorToolItemClass))
+#define IS_PROP_SEPARATOR_TOOL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROP_SEPARATOR_TOOL_ITEM))
+#define IS_PROP_SEPARATOR_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROP_SEPARATOR_TOOL_ITEM))
+#define PROP_SEPARATOR_TOOL_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROP_SEPARATOR_TOOL_ITEM, PropSeparatorToolItemClass))
+
+typedef struct _PropSeparatorToolItem PropSeparatorToolItem;
+typedef struct _PropSeparatorToolItemClass PropSeparatorToolItemClass;
+
+#define TYPE_PROP_MENU (prop_menu_get_type ())
+#define PROP_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROP_MENU, PropMenu))
+#define PROP_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROP_MENU, PropMenuClass))
+#define IS_PROP_MENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROP_MENU))
+#define IS_PROP_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROP_MENU))
+#define PROP_MENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROP_MENU, PropMenuClass))
+
+typedef struct _PropMenu PropMenu;
+typedef struct _PropMenuClass PropMenuClass;
+typedef struct _PropMenuPrivate PropMenuPrivate;
+
+#define TYPE_IPROP_ITEM (iprop_item_get_type ())
+#define IPROP_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IPROP_ITEM, IPropItem))
+#define IS_IPROP_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IPROP_ITEM))
+#define IPROP_ITEM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_IPROP_ITEM, IPropItemIface))
+
+typedef struct _IPropItem IPropItem;
+typedef struct _IPropItemIface IPropItemIface;
+
+#define TYPE_PROP_CHECK_MENU_ITEM (prop_check_menu_item_get_type ())
+#define PROP_CHECK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROP_CHECK_MENU_ITEM, PropCheckMenuItem))
+#define PROP_CHECK_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROP_CHECK_MENU_ITEM, PropCheckMenuItemClass))
+#define IS_PROP_CHECK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROP_CHECK_MENU_ITEM))
+#define IS_PROP_CHECK_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROP_CHECK_MENU_ITEM))
+#define PROP_CHECK_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROP_CHECK_MENU_ITEM, PropCheckMenuItemClass))
+
+typedef struct _PropCheckMenuItem PropCheckMenuItem;
+typedef struct _PropCheckMenuItemClass PropCheckMenuItemClass;
+
+#define TYPE_PROP_RADIO_MENU_ITEM (prop_radio_menu_item_get_type ())
+#define PROP_RADIO_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROP_RADIO_MENU_ITEM, PropRadioMenuItem))
+#define PROP_RADIO_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROP_RADIO_MENU_ITEM, PropRadioMenuItemClass))
+#define IS_PROP_RADIO_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROP_RADIO_MENU_ITEM))
+#define IS_PROP_RADIO_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROP_RADIO_MENU_ITEM))
+#define PROP_RADIO_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROP_RADIO_MENU_ITEM, PropRadioMenuItemClass))
+
+typedef struct _PropRadioMenuItem PropRadioMenuItem;
+typedef struct _PropRadioMenuItemClass PropRadioMenuItemClass;
+
+#define TYPE_PROP_IMAGE_MENU_ITEM (prop_image_menu_item_get_type ())
+#define PROP_IMAGE_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROP_IMAGE_MENU_ITEM, PropImageMenuItem))
+#define PROP_IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROP_IMAGE_MENU_ITEM, PropImageMenuItemClass))
+#define IS_PROP_IMAGE_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROP_IMAGE_MENU_ITEM))
+#define IS_PROP_IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROP_IMAGE_MENU_ITEM))
+#define PROP_IMAGE_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROP_IMAGE_MENU_ITEM, PropImageMenuItemClass))
+
+typedef struct _PropImageMenuItem PropImageMenuItem;
+typedef struct _PropImageMenuItemClass PropImageMenuItemClass;
+
+#define TYPE_PROP_SEPARATOR_MENU_ITEM (prop_separator_menu_item_get_type ())
+#define PROP_SEPARATOR_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROP_SEPARATOR_MENU_ITEM, PropSeparatorMenuItem))
+#define PROP_SEPARATOR_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROP_SEPARATOR_MENU_ITEM, PropSeparatorMenuItemClass))
+#define IS_PROP_SEPARATOR_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROP_SEPARATOR_MENU_ITEM))
+#define IS_PROP_SEPARATOR_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROP_SEPARATOR_MENU_ITEM))
+#define PROP_SEPARATOR_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROP_SEPARATOR_MENU_ITEM, PropSeparatorMenuItemClass))
+
+typedef struct _PropSeparatorMenuItem PropSeparatorMenuItem;
+typedef struct _PropSeparatorMenuItemClass PropSeparatorMenuItemClass;
+typedef struct _PropToolButtonPrivate PropToolButtonPrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+#define TYPE_ICON_WIDGET (icon_widget_get_type ())
+#define ICON_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ICON_WIDGET, IconWidget))
+#define ICON_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ICON_WIDGET, IconWidgetClass))
+#define IS_ICON_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ICON_WIDGET))
+#define IS_ICON_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ICON_WIDGET))
+#define ICON_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ICON_WIDGET, IconWidgetClass))
+
+typedef struct _IconWidget IconWidget;
+typedef struct _IconWidgetClass IconWidgetClass;
+typedef struct _PropToggleToolButtonPrivate PropToggleToolButtonPrivate;
+typedef struct _PropMenuToolButtonPrivate PropMenuToolButtonPrivate;
+typedef struct _PropSeparatorToolItemPrivate PropSeparatorToolItemPrivate;
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+typedef enum  {
+	PANEL_SHOW_DO_NOT_SHOW,
+	PANEL_SHOW_AUTO_HIDE,
+	PANEL_SHOW_ALWAYS
+} PanelShow;
+
+struct _PropertyPanel {
+	GtkBox parent_instance;
+	PropertyPanelPrivate * priv;
+};
+
+struct _PropertyPanelClass {
+	GtkBoxClass parent_class;
+};
+
+struct _IPropToolItemIface {
+	GTypeInterface parent_iface;
+	void (*update_property) (IPropToolItem* self, IBusProperty* prop);
+};
+
+struct _PropertyPanelPrivate {
+	GtkWindow* m_toplevel;
+	IBusPropList* m_props;
+	IPropToolItem** m_items;
+	gint m_items_length1;
+	gint _m_items_size_;
+	GdkRectangle m_cursor_location;
+	gint m_show;
+	guint m_auto_hide_timeout;
+	guint m_auto_hide_timeout_id;
+};
+
+struct _PropMenu {
+	GtkMenu parent_instance;
+	PropMenuPrivate * priv;
+};
+
+struct _PropMenuClass {
+	GtkMenuClass parent_class;
+};
+
+struct _IPropItemIface {
+	GTypeInterface parent_iface;
+	void (*update_property) (IPropItem* self, IBusProperty* prop);
+};
+
+struct _PropMenuPrivate {
+	GtkWidget* m_parent_button;
+	IPropItem** m_items;
+	gint m_items_length1;
+	gint _m_items_size_;
+};
+
+struct _PropToolButton {
+	GtkToolButton parent_instance;
+	PropToolButtonPrivate * priv;
+};
+
+struct _PropToolButtonClass {
+	GtkToolButtonClass parent_class;
+};
+
+struct _PropToolButtonPrivate {
+	IBusProperty* m_prop;
+};
+
+struct _PropToggleToolButton {
+	GtkToggleToolButton parent_instance;
+	PropToggleToolButtonPrivate * priv;
+};
+
+struct _PropToggleToolButtonClass {
+	GtkToggleToolButtonClass parent_class;
+};
+
+struct _PropToggleToolButtonPrivate {
+	IBusProperty* m_prop;
+};
+
+struct _PropMenuToolButton {
+	PropToggleToolButton parent_instance;
+	PropMenuToolButtonPrivate * priv;
+};
+
+struct _PropMenuToolButtonClass {
+	PropToggleToolButtonClass parent_class;
+};
+
+struct _PropMenuToolButtonPrivate {
+	PropMenu* m_menu;
+};
+
+struct _PropSeparatorToolItem {
+	GtkSeparatorToolItem parent_instance;
+	PropSeparatorToolItemPrivate * priv;
+};
+
+struct _PropSeparatorToolItemClass {
+	GtkSeparatorToolItemClass parent_class;
+};
+
+
+static gpointer property_panel_parent_class = NULL;
+static gpointer prop_menu_parent_class = NULL;
+static IPropToolItemIface* prop_menu_iprop_tool_item_parent_iface = NULL;
+static gpointer prop_tool_button_parent_class = NULL;
+static IPropToolItemIface* prop_tool_button_iprop_tool_item_parent_iface = NULL;
+static gpointer prop_toggle_tool_button_parent_class = NULL;
+static IPropToolItemIface* prop_toggle_tool_button_iprop_tool_item_parent_iface = NULL;
+static gpointer prop_menu_tool_button_parent_class = NULL;
+static IPropToolItemIface* prop_menu_tool_button_iprop_tool_item_parent_iface = NULL;
+static gpointer prop_separator_tool_item_parent_class = NULL;
+static IPropToolItemIface* prop_separator_tool_item_iprop_tool_item_parent_iface = NULL;
+
+GType panel_show_get_type (void) G_GNUC_CONST;
+GType property_panel_get_type (void) G_GNUC_CONST;
+GType iprop_tool_item_get_type (void) G_GNUC_CONST;
+#define PROPERTY_PANEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROPERTY_PANEL, PropertyPanelPrivate))
+enum  {
+	PROPERTY_PANEL_DUMMY_PROPERTY
+};
+PropertyPanel* property_panel_new (void);
+PropertyPanel* property_panel_construct (GType object_type);
+GType handle_get_type (void) G_GNUC_CONST;
+Handle* handle_new (void);
+Handle* handle_construct (GType object_type);
+void property_panel_set_properties (PropertyPanel* self, IBusPropList* props);
+static void property_panel_create_menu_items (PropertyPanel* self);
+void property_panel_update_property (PropertyPanel* self, IBusProperty* prop);
+void iprop_tool_item_update_property (IPropToolItem* self, IBusProperty* prop);
+static void property_panel_show_with_auto_hide_timer (PropertyPanel* self);
+void property_panel_set_cursor_location (PropertyPanel* self, gint x, gint y, gint width, gint height);
+static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t* s1, const cairo_rectangle_int_t* s2);
+static void property_panel_hide_if_necessary (PropertyPanel* self);
+static void property_panel_adjust_window_position (PropertyPanel* self);
+void property_panel_set_preedit_text (PropertyPanel* self, IBusText* text, guint cursor);
+void property_panel_set_auxiliary_text (PropertyPanel* self, IBusText* text);
+void property_panel_set_lookup_table (PropertyPanel* self, IBusLookupTable* table);
+void property_panel_show (PropertyPanel* self);
+void property_panel_hide (PropertyPanel* self);
+void property_panel_focus_in (PropertyPanel* self);
+void property_panel_set_show (PropertyPanel* self, gint _show);
+void property_panel_set_auto_hide_timeout (PropertyPanel* self, guint timeout);
+static void property_panel_real_get_preferred_width (GtkWidget* base, gint* minimum_width, gint* natural_width);
+static void property_panel_real_get_preferred_height (GtkWidget* base, gint* minimum_width, gint* natural_width);
+PropToolButton* prop_tool_button_new (IBusProperty* prop);
+PropToolButton* prop_tool_button_construct (GType object_type, IBusProperty* prop);
+GType prop_tool_button_get_type (void) G_GNUC_CONST;
+PropToggleToolButton* prop_toggle_tool_button_new (IBusProperty* prop);
+PropToggleToolButton* prop_toggle_tool_button_construct (GType object_type, IBusProperty* prop);
+GType prop_toggle_tool_button_get_type (void) G_GNUC_CONST;
+PropMenuToolButton* prop_menu_tool_button_new (IBusProperty* prop);
+PropMenuToolButton* prop_menu_tool_button_construct (GType object_type, IBusProperty* prop);
+GType prop_menu_tool_button_get_type (void) G_GNUC_CONST;
+PropSeparatorToolItem* prop_separator_tool_item_new (IBusProperty* prop);
+PropSeparatorToolItem* prop_separator_tool_item_construct (GType object_type, IBusProperty* prop);
+GType prop_separator_tool_item_get_type (void) G_GNUC_CONST;
+static void _vala_array_add25 (IPropToolItem*** array, int* length, int* size, IPropToolItem* value);
+static void ____lambda21_ (PropertyPanel* self, IPropToolItem* w, const gchar* k, gint s);
+static void _____lambda21__iprop_tool_item_property_activate (IPropToolItem* _sender, const gchar* key, gint state, gpointer self);
+static void property_panel_move (PropertyPanel* self, gint x, gint y);
+static gboolean __lambda22_ (PropertyPanel* self);
+static gboolean ___lambda22__gsource_func (gpointer self);
+static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void property_panel_finalize (GObject* obj);
+GType prop_menu_get_type (void) G_GNUC_CONST;
+GType iprop_item_get_type (void) G_GNUC_CONST;
+#define PROP_MENU_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROP_MENU, PropMenuPrivate))
+enum  {
+	PROP_MENU_DUMMY_PROPERTY
+};
+PropMenu* prop_menu_new (IBusProperty* prop);
+PropMenu* prop_menu_construct (GType object_type, IBusProperty* prop);
+static void prop_menu_create_items (PropMenu* self, IBusPropList* props);
+static void prop_menu_real_update_property (IPropToolItem* base, IBusProperty* prop);
+void iprop_item_update_property (IPropItem* self, IBusProperty* prop);
+void prop_menu_popup (PropMenu* self, guint button, guint32 activate_time, GtkWidget* widget);
+static void prop_menu_menu_position (PropMenu* self, GtkMenu* menu, gint* x, gint* y, gboolean* push_in);
+static void _prop_menu_menu_position_gtk_menu_position_func (GtkMenu* menu, gint* x, gint* y, gboolean* push_in, gpointer self);
+static void prop_menu_real_destroy (GtkWidget* base);
+GType prop_check_menu_item_get_type (void) G_GNUC_CONST;
+GType prop_radio_menu_item_get_type (void) G_GNUC_CONST;
+PropImageMenuItem* prop_image_menu_item_new (IBusProperty* property);
+PropImageMenuItem* prop_image_menu_item_construct (GType object_type, IBusProperty* property);
+GType prop_image_menu_item_get_type (void) G_GNUC_CONST;
+PropCheckMenuItem* prop_check_menu_item_new (IBusProperty* property);
+PropCheckMenuItem* prop_check_menu_item_construct (GType object_type, IBusProperty* property);
+PropRadioMenuItem* prop_radio_menu_item_new (IBusProperty* property, PropRadioMenuItem* group_source);
+PropRadioMenuItem* prop_radio_menu_item_construct (GType object_type, IBusProperty* property, PropRadioMenuItem* group_source);
+PropSeparatorMenuItem* prop_separator_menu_item_new (IBusProperty* property);
+PropSeparatorMenuItem* prop_separator_menu_item_construct (GType object_type, IBusProperty* property);
+GType prop_separator_menu_item_get_type (void) G_GNUC_CONST;
+static void ____lambda18_ (PropMenu* self, IPropItem* w, const gchar* k, gint s);
+static void _____lambda18__iprop_item_property_activate (IPropItem* _sender, const gchar* key, gint state, gpointer self);
+static void _vala_array_add26 (IPropItem*** array, int* length, int* size, IPropItem* value);
+static void prop_menu_finalize (GObject* obj);
+#define PROP_TOOL_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROP_TOOL_BUTTON, PropToolButtonPrivate))
+enum  {
+	PROP_TOOL_BUTTON_DUMMY_PROPERTY
+};
+static void prop_tool_button_sync (PropToolButton* self);
+static void prop_tool_button_real_update_property (IPropToolItem* base, IBusProperty* prop);
+void prop_tool_button_set_icon_name (PropToolButton* self, const gchar* icon_name);
+static void prop_tool_button_real_clicked (GtkToolButton* base);
+GType icon_widget_get_type (void) G_GNUC_CONST;
+IconWidget* icon_widget_new (const gchar* icon_name_or_path, GtkIconSize size);
+IconWidget* icon_widget_construct (GType object_type, const gchar* icon_name_or_path, GtkIconSize size);
+static void prop_tool_button_finalize (GObject* obj);
+#define PROP_TOGGLE_TOOL_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROP_TOGGLE_TOOL_BUTTON, PropToggleToolButtonPrivate))
+enum  {
+	PROP_TOGGLE_TOOL_BUTTON_DUMMY_PROPERTY
+};
+static void prop_toggle_tool_button_sync (PropToggleToolButton* self);
+void prop_toggle_tool_button_set_property (PropToggleToolButton* self, IBusProperty* prop);
+static void prop_toggle_tool_button_real_update_property (IPropToolItem* base, IBusProperty* prop);
+void prop_toggle_tool_button_set_icon_name (PropToggleToolButton* self, const gchar* icon_name);
+static void prop_toggle_tool_button_real_toggled (GtkToggleToolButton* base);
+static void prop_toggle_tool_button_finalize (GObject* obj);
+#define PROP_MENU_TOOL_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROP_MENU_TOOL_BUTTON, PropMenuToolButtonPrivate))
+enum  {
+	PROP_MENU_TOOL_BUTTON_DUMMY_PROPERTY
+};
+static void __lambda19_ (PropMenuToolButton* self, GtkMenuShell* m);
+static void ___lambda19__gtk_menu_shell_deactivate (GtkMenuShell* _sender, gpointer self);
+static void __lambda20_ (PropMenuToolButton* self, IPropToolItem* w, const gchar* k, gint s);
+static void ___lambda20__iprop_tool_item_property_activate (IPropToolItem* _sender, const gchar* key, gint state, gpointer self);
+static void prop_menu_tool_button_real_update_property (IPropToolItem* base, IBusProperty* prop);
+static void prop_menu_tool_button_real_toggled (GtkToggleToolButton* base);
+static void prop_menu_tool_button_real_destroy (GtkWidget* base);
+static void prop_menu_tool_button_finalize (GObject* obj);
+enum  {
+	PROP_SEPARATOR_TOOL_ITEM_DUMMY_PROPERTY
+};
+static void prop_separator_tool_item_real_update_property (IPropToolItem* base, IBusProperty* prop);
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+
+
+GType panel_show_get_type (void) {
+	static volatile gsize panel_show_type_id__volatile = 0;
+	if (g_once_init_enter (&panel_show_type_id__volatile)) {
+		static const GEnumValue values[] = {{PANEL_SHOW_DO_NOT_SHOW, "PANEL_SHOW_DO_NOT_SHOW", "do-not-show"}, {PANEL_SHOW_AUTO_HIDE, "PANEL_SHOW_AUTO_HIDE", "auto-hide"}, {PANEL_SHOW_ALWAYS, "PANEL_SHOW_ALWAYS", "always"}, {0, NULL, NULL}};
+		GType panel_show_type_id;
+		panel_show_type_id = g_enum_register_static ("PanelShow", values);
+		g_once_init_leave (&panel_show_type_id__volatile, panel_show_type_id);
+	}
+	return panel_show_type_id__volatile;
+}
+
+
+PropertyPanel* property_panel_construct (GType object_type) {
+	PropertyPanel * self = NULL;
+	GtkWindow* _tmp0_ = NULL;
+	GtkWindow* _tmp1_ = NULL;
+	Handle* handle = NULL;
+	Handle* _tmp2_ = NULL;
+	GtkWindow* _tmp3_ = NULL;
+	self = (PropertyPanel*) g_object_new (object_type, "orientation", GTK_ORIENTATION_HORIZONTAL, "spacing", 0, NULL);
+	gtk_widget_set_visible ((GtkWidget*) self, TRUE);
+	_tmp0_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_POPUP);
+	g_object_ref_sink (_tmp0_);
+	_g_object_unref0 (self->priv->m_toplevel);
+	self->priv->m_toplevel = _tmp0_;
+	_tmp1_ = self->priv->m_toplevel;
+	gtk_widget_add_events ((GtkWidget*) _tmp1_, (gint) GDK_BUTTON_PRESS_MASK);
+	_tmp2_ = handle_new ();
+	g_object_ref_sink (_tmp2_);
+	handle = _tmp2_;
+	gtk_widget_set_visible ((GtkWidget*) handle, TRUE);
+	gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) handle, FALSE, FALSE, (guint) 0);
+	_tmp3_ = self->priv->m_toplevel;
+	gtk_container_add ((GtkContainer*) _tmp3_, (GtkWidget*) self);
+	_g_object_unref0 (handle);
+	return self;
+}
+
+
+PropertyPanel* property_panel_new (void) {
+	return property_panel_construct (TYPE_PROPERTY_PANEL);
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+	return self ? g_object_ref (self) : NULL;
+}
+
+
+void property_panel_set_properties (PropertyPanel* self, IBusPropList* props) {
+	IPropToolItem** _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
+	IPropToolItem** _tmp3_ = NULL;
+	IBusPropList* _tmp4_ = NULL;
+	IBusPropList* _tmp5_ = NULL;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (props != NULL);
+	_tmp0_ = self->priv->m_items;
+	_tmp0__length1 = self->priv->m_items_length1;
+	{
+		IPropToolItem** item_collection = NULL;
+		gint item_collection_length1 = 0;
+		gint _item_collection_size_ = 0;
+		gint item_it = 0;
+		item_collection = _tmp0_;
+		item_collection_length1 = _tmp0__length1;
+		for (item_it = 0; item_it < _tmp0__length1; item_it = item_it + 1) {
+			IPropToolItem* _tmp1_ = NULL;
+			IPropToolItem* item = NULL;
+			_tmp1_ = _g_object_ref0 (item_collection[item_it]);
+			item = _tmp1_;
+			{
+				IPropToolItem* _tmp2_ = NULL;
+				_tmp2_ = item;
+				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, GTK_TYPE_WIDGET) ? ((GtkWidget*) _tmp2_) : NULL);
+				_g_object_unref0 (item);
+			}
+		}
+	}
+	_tmp3_ = g_new0 (IPropToolItem*, 0 + 1);
+	self->priv->m_items = (_vala_array_free (self->priv->m_items, self->priv->m_items_length1, (GDestroyNotify) g_object_unref), NULL);
+	self->priv->m_items = _tmp3_;
+	self->priv->m_items_length1 = 0;
+	self->priv->_m_items_size_ = self->priv->m_items_length1;
+	_tmp4_ = props;
+	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_g_object_unref0 (self->priv->m_props);
+	self->priv->m_props = _tmp5_;
+	property_panel_create_menu_items (self);
+}
+
+
+void property_panel_update_property (PropertyPanel* self, IBusProperty* prop) {
+	IBusProperty* _tmp0_ = NULL;
+	IBusProperty* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	IBusPropList* _tmp3_ = NULL;
+	IPropToolItem** _tmp6_ = NULL;
+	gint _tmp6__length1 = 0;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (prop != NULL);
+	_tmp0_ = prop;
+	_vala_assert (_tmp0_ != NULL, "prop != null");
+	_tmp1_ = prop;
+	_tmp2_ = ibus_property_get_key (_tmp1_);
+	g_debug ("propertypanel.vala:71: update_property(prop.key = %s)\n", _tmp2_);
+	_tmp3_ = self->priv->m_props;
+	if (_tmp3_ != NULL) {
+		IBusPropList* _tmp4_ = NULL;
+		IBusProperty* _tmp5_ = NULL;
+		_tmp4_ = self->priv->m_props;
+		_tmp5_ = prop;
+		ibus_prop_list_update_property (_tmp4_, _tmp5_);
+	}
+	_tmp6_ = self->priv->m_items;
+	_tmp6__length1 = self->priv->m_items_length1;
+	{
+		IPropToolItem** item_collection = NULL;
+		gint item_collection_length1 = 0;
+		gint _item_collection_size_ = 0;
+		gint item_it = 0;
+		item_collection = _tmp6_;
+		item_collection_length1 = _tmp6__length1;
+		for (item_it = 0; item_it < _tmp6__length1; item_it = item_it + 1) {
+			IPropToolItem* _tmp7_ = NULL;
+			IPropToolItem* item = NULL;
+			_tmp7_ = _g_object_ref0 (item_collection[item_it]);
+			item = _tmp7_;
+			{
+				IPropToolItem* _tmp8_ = NULL;
+				IBusProperty* _tmp9_ = NULL;
+				_tmp8_ = item;
+				_tmp9_ = prop;
+				iprop_tool_item_update_property (_tmp8_, _tmp9_);
+				_g_object_unref0 (item);
+			}
+		}
+	}
+	property_panel_show_with_auto_hide_timer (self);
+}
+
+
+static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t* s1, const cairo_rectangle_int_t* s2) {
+	if (s1 == s2) {
+		return TRUE;
+	}
+	if (s1 == NULL) {
+		return FALSE;
+	}
+	if (s2 == NULL) {
+		return FALSE;
+	}
+	if (s1->x != s2->x) {
+		return FALSE;
+	}
+	if (s1->y != s2->y) {
+		return FALSE;
+	}
+	if (s1->width != s2->width) {
+		return FALSE;
+	}
+	if (s1->height != s2->height) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+
+void property_panel_set_cursor_location (PropertyPanel* self, gint x, gint y, gint width, gint height) {
+	GdkRectangle location = {0};
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
+	GdkRectangle _tmp4_ = {0};
+	GdkRectangle _tmp5_ = {0};
+	GdkRectangle _tmp6_ = {0};
+	gint _tmp7_ = 0;
+	gint _tmp8_ = 0;
+	gint _tmp9_ = 0;
+	gint _tmp10_ = 0;
+	gint _tmp11_ = 0;
+	GdkRectangle _tmp19_ = {0};
+	g_return_if_fail (self != NULL);
+	_tmp0_ = x;
+	_tmp1_ = y;
+	_tmp2_ = width;
+	_tmp3_ = height;
+	memset (&_tmp4_, 0, sizeof (GdkRectangle));
+	_tmp4_.x = _tmp0_;
+	_tmp4_.y = _tmp1_;
+	_tmp4_.width = _tmp2_;
+	_tmp4_.height = _tmp3_;
+	location = _tmp4_;
+	_tmp5_ = self->priv->m_cursor_location;
+	_tmp6_ = location;
+	if (_cairo_rectangle_int_equal (&_tmp5_, &_tmp6_) == TRUE) {
+		return;
+	}
+	_tmp7_ = x;
+	_tmp8_ = y;
+	_tmp9_ = width;
+	_tmp10_ = height;
+	g_debug ("propertypanel.vala:108: set_cursor_location(x = %d, y = %d, width = %d" \
+", height = %d)\n", _tmp7_, _tmp8_, _tmp9_, _tmp10_);
+	_tmp11_ = self->priv->m_show;
+	if (_tmp11_ == ((gint) PANEL_SHOW_AUTO_HIDE)) {
+		gboolean _tmp12_ = FALSE;
+		GdkRectangle _tmp13_ = {0};
+		gint _tmp14_ = 0;
+		gboolean _tmp17_ = FALSE;
+		_tmp13_ = self->priv->m_cursor_location;
+		_tmp14_ = _tmp13_.x;
+		if (_tmp14_ != (-1)) {
+			_tmp12_ = TRUE;
+		} else {
+			GdkRectangle _tmp15_ = {0};
+			gint _tmp16_ = 0;
+			_tmp15_ = self->priv->m_cursor_location;
+			_tmp16_ = _tmp15_.y;
+			_tmp12_ = _tmp16_ != (-1);
+		}
+		_tmp17_ = _tmp12_;
+		if (_tmp17_) {
+			GdkRectangle _tmp18_ = {0};
+			_tmp18_ = location;
+			self->priv->m_cursor_location = _tmp18_;
+			property_panel_hide_if_necessary (self);
+			property_panel_adjust_window_position (self);
+			return;
+		}
+	}
+	_tmp19_ = location;
+	self->priv->m_cursor_location = _tmp19_;
+	property_panel_adjust_window_position (self);
+	property_panel_show_with_auto_hide_timer (self);
+}
+
+
+void property_panel_set_preedit_text (PropertyPanel* self, IBusText* text, guint cursor) {
+	gboolean _tmp0_ = FALSE;
+	IBusText* _tmp1_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	guint _tmp4_ = 0U;
+	g_return_if_fail (self != NULL);
+	_tmp1_ = text;
+	if (_tmp1_ == NULL) {
+		guint _tmp2_ = 0U;
+		_tmp2_ = cursor;
+		_tmp0_ = _tmp2_ == ((guint) 0);
+	} else {
+		_tmp0_ = FALSE;
+	}
+	_tmp3_ = _tmp0_;
+	if (_tmp3_) {
+		return;
+	}
+	_tmp4_ = cursor;
+	g_debug ("propertypanel.vala:132: set_preedit_text(text, cursor = %u)\n", _tmp4_);
+	property_panel_hide_if_necessary (self);
+}
+
+
+void property_panel_set_auxiliary_text (PropertyPanel* self, IBusText* text) {
+	IBusText* _tmp0_ = NULL;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = text;
+	if (_tmp0_ == NULL) {
+		return;
+	}
+	g_debug ("propertypanel.vala:144: set_auxiliary_text(text)\n");
+	property_panel_hide_if_necessary (self);
+}
+
+
+void property_panel_set_lookup_table (PropertyPanel* self, IBusLookupTable* table) {
+	IBusLookupTable* _tmp0_ = NULL;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = table;
+	if (_tmp0_ == NULL) {
+		return;
+	}
+	g_debug ("propertypanel.vala:153: set_lookup_table(table)\n");
+	property_panel_hide_if_necessary (self);
+}
+
+
+void property_panel_show (PropertyPanel* self) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+	gboolean _tmp3_ = FALSE;
+	g_return_if_fail (self != NULL);
+	_tmp1_ = self->priv->m_show;
+	if (_tmp1_ == ((gint) PANEL_SHOW_DO_NOT_SHOW)) {
+		_tmp0_ = TRUE;
+	} else {
+		IPropToolItem** _tmp2_ = NULL;
+		gint _tmp2__length1 = 0;
+		_tmp2_ = self->priv->m_items;
+		_tmp2__length1 = self->priv->m_items_length1;
+		_tmp0_ = _tmp2__length1 == 0;
+	}
+	_tmp3_ = _tmp0_;
+	if (_tmp3_) {
+		GtkWindow* _tmp4_ = NULL;
+		_tmp4_ = self->priv->m_toplevel;
+		gtk_widget_hide ((GtkWidget*) _tmp4_);
+		return;
+	} else {
+		gint _tmp5_ = 0;
+		_tmp5_ = self->priv->m_show;
+		if (_tmp5_ == ((gint) PANEL_SHOW_ALWAYS)) {
+			GtkWindow* _tmp6_ = NULL;
+			_tmp6_ = self->priv->m_toplevel;
+			gtk_widget_show_all ((GtkWidget*) _tmp6_);
+			return;
+		}
+	}
+}
+
+
+void property_panel_hide (PropertyPanel* self) {
+	GtkWindow* _tmp0_ = NULL;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = self->priv->m_toplevel;
+	gtk_widget_hide ((GtkWidget*) _tmp0_);
+}
+
+
+void property_panel_focus_in (PropertyPanel* self) {
+	GdkRectangle _tmp0_ = {0};
+	g_return_if_fail (self != NULL);
+	g_debug ("propertypanel.vala:176: focus_in()\n");
+	property_panel_hide_if_necessary (self);
+	_tmp0_.x = -1;
+	_tmp0_.y = -1;
+	_tmp0_.width = 0;
+	_tmp0_.height = 0;
+	self->priv->m_cursor_location = _tmp0_;
+}
+
+
+void property_panel_set_show (PropertyPanel* self, gint _show) {
+	gint _tmp0_ = 0;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = _show;
+	self->priv->m_show = _tmp0_;
+	property_panel_show (self);
+}
+
+
+void property_panel_set_auto_hide_timeout (PropertyPanel* self, guint timeout) {
+	guint _tmp0_ = 0U;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = timeout;
+	self->priv->m_auto_hide_timeout = _tmp0_;
+}
+
+
+static void property_panel_real_get_preferred_width (GtkWidget* base, gint* minimum_width, gint* natural_width) {
+	PropertyPanel * self;
+	gint _vala_minimum_width = 0;
+	gint _vala_natural_width = 0;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	GtkWindow* _tmp2_ = NULL;
+	self = (PropertyPanel*) base;
+	GTK_WIDGET_CLASS (property_panel_parent_class)->get_preferred_width ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_BOX, GtkBox), &_tmp0_, &_tmp1_);
+	_vala_minimum_width = _tmp0_;
+	_vala_natural_width = _tmp1_;
+	_tmp2_ = self->priv->m_toplevel;
+	gtk_window_resize (_tmp2_, 1, 1);
+	if (minimum_width) {
+		*minimum_width = _vala_minimum_width;
+	}
+	if (natural_width) {
+		*natural_width = _vala_natural_width;
+	}
+}
+
+
+static void property_panel_real_get_preferred_height (GtkWidget* base, gint* minimum_width, gint* natural_width) {
+	PropertyPanel * self;
+	gint _vala_minimum_width = 0;
+	gint _vala_natural_width = 0;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	GtkWindow* _tmp2_ = NULL;
+	self = (PropertyPanel*) base;
+	GTK_WIDGET_CLASS (property_panel_parent_class)->get_preferred_height ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_BOX, GtkBox), &_tmp0_, &_tmp1_);
+	_vala_minimum_width = _tmp0_;
+	_vala_natural_width = _tmp1_;
+	_tmp2_ = self->priv->m_toplevel;
+	gtk_window_resize (_tmp2_, 1, 1);
+	if (minimum_width) {
+		*minimum_width = _vala_minimum_width;
+	}
+	if (natural_width) {
+		*natural_width = _vala_natural_width;
+	}
+}
+
+
+static void _vala_array_add25 (IPropToolItem*** array, int* length, int* size, IPropToolItem* value) {
+	if ((*length) == (*size)) {
+		*size = (*size) ? (2 * (*size)) : 4;
+		*array = g_renew (IPropToolItem*, *array, (*size) + 1);
+	}
+	(*array)[(*length)++] = value;
+	(*array)[*length] = NULL;
+}
+
+
+static void ____lambda21_ (PropertyPanel* self, IPropToolItem* w, const gchar* k, gint s) {
+	const gchar* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	g_return_if_fail (w != NULL);
+	g_return_if_fail (k != NULL);
+	_tmp0_ = k;
+	_tmp1_ = s;
+	g_signal_emit_by_name (self, "property-activate", _tmp0_, _tmp1_);
+}
+
+
+static void _____lambda21__iprop_tool_item_property_activate (IPropToolItem* _sender, const gchar* key, gint state, gpointer self) {
+	____lambda21_ (self, _sender, key, state);
+}
+
+
+static void property_panel_create_menu_items (PropertyPanel* self) {
+	gint i = 0;
+	g_return_if_fail (self != NULL);
+	i = 0;
+	while (TRUE) {
+		IBusProperty* prop = NULL;
+		IBusPropList* _tmp0_ = NULL;
+		gint _tmp1_ = 0;
+		IBusProperty* _tmp2_ = NULL;
+		IBusProperty* _tmp3_ = NULL;
+		IBusProperty* _tmp4_ = NULL;
+		gint _tmp5_ = 0;
+		IPropToolItem* item = NULL;
+		IBusProperty* _tmp6_ = NULL;
+		IBusPropType _tmp7_ = 0;
+		IPropToolItem* _tmp18_ = NULL;
+		_tmp0_ = self->priv->m_props;
+		_tmp1_ = i;
+		_tmp2_ = ibus_prop_list_get (_tmp0_, (guint) _tmp1_);
+		_tmp3_ = _g_object_ref0 (_tmp2_);
+		prop = _tmp3_;
+		_tmp4_ = prop;
+		if (_tmp4_ == NULL) {
+			_g_object_unref0 (prop);
+			break;
+		}
+		_tmp5_ = i;
+		i = _tmp5_ + 1;
+		item = NULL;
+		_tmp6_ = prop;
+		_tmp7_ = ibus_property_get_prop_type (_tmp6_);
+		switch (_tmp7_) {
+			case PROP_TYPE_NORMAL:
+			{
+				IBusProperty* _tmp8_ = NULL;
+				PropToolButton* _tmp9_ = NULL;
+				_tmp8_ = prop;
+				_tmp9_ = prop_tool_button_new (_tmp8_);
+				g_object_ref_sink (_tmp9_);
+				_g_object_unref0 (item);
+				item = (IPropToolItem*) _tmp9_;
+				break;
+			}
+			case PROP_TYPE_TOGGLE:
+			{
+				IBusProperty* _tmp10_ = NULL;
+				PropToggleToolButton* _tmp11_ = NULL;
+				_tmp10_ = prop;
+				_tmp11_ = prop_toggle_tool_button_new (_tmp10_);
+				g_object_ref_sink (_tmp11_);
+				_g_object_unref0 (item);
+				item = (IPropToolItem*) _tmp11_;
+				break;
+			}
+			case PROP_TYPE_MENU:
+			{
+				IBusProperty* _tmp12_ = NULL;
+				PropMenuToolButton* _tmp13_ = NULL;
+				_tmp12_ = prop;
+				_tmp13_ = prop_menu_tool_button_new (_tmp12_);
+				g_object_ref_sink (_tmp13_);
+				_g_object_unref0 (item);
+				item = (IPropToolItem*) _tmp13_;
+				break;
+			}
+			case PROP_TYPE_SEPARATOR:
+			{
+				IBusProperty* _tmp14_ = NULL;
+				PropSeparatorToolItem* _tmp15_ = NULL;
+				_tmp14_ = prop;
+				_tmp15_ = prop_separator_tool_item_new (_tmp14_);
+				g_object_ref_sink (_tmp15_);
+				_g_object_unref0 (item);
+				item = (IPropToolItem*) _tmp15_;
+				break;
+			}
+			default:
+			{
+				IBusProperty* _tmp16_ = NULL;
+				IBusPropType _tmp17_ = 0;
+				_tmp16_ = prop;
+				_tmp17_ = ibus_property_get_prop_type (_tmp16_);
+				g_warning ("propertypanel.vala:235: unknown property type %d", (gint) _tmp17_);
+				break;
+			}
+		}
+		_tmp18_ = item;
+		if (_tmp18_ != NULL) {
+			IPropToolItem* _tmp19_ = NULL;
+			IPropToolItem** _tmp20_ = NULL;
+			gint _tmp20__length1 = 0;
+			IPropToolItem* _tmp21_ = NULL;
+			IPropToolItem* _tmp22_ = NULL;
+			IPropToolItem* _tmp23_ = NULL;
+			_tmp19_ = item;
+			gtk_box_pack_start ((GtkBox*) self, G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, GTK_TYPE_WIDGET) ? ((GtkWidget*) _tmp19_) : NULL, FALSE, FALSE, (guint) 0);
+			_tmp20_ = self->priv->m_items;
+			_tmp20__length1 = self->priv->m_items_length1;
+			_tmp21_ = item;
+			_tmp22_ = _g_object_ref0 (_tmp21_);
+			_vala_array_add25 (&self->priv->m_items, &self->priv->m_items_length1, &self->priv->_m_items_size_, _tmp22_);
+			_tmp23_ = item;
+			g_signal_connect_object (_tmp23_, "property-activate", (GCallback) _____lambda21__iprop_tool_item_property_activate, self, 0);
+		}
+		_g_object_unref0 (item);
+		_g_object_unref0 (prop);
+	}
+}
+
+
+static void property_panel_move (PropertyPanel* self, gint x, gint y) {
+	GtkWindow* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = self->priv->m_toplevel;
+	_tmp1_ = x;
+	_tmp2_ = y;
+	gtk_window_move (_tmp0_, _tmp1_, _tmp2_);
+}
+
+
+static void property_panel_adjust_window_position (PropertyPanel* self) {
+	GdkPoint cursor_right_bottom = {0};
+	GdkRectangle _tmp0_ = {0};
+	gint _tmp1_ = 0;
+	GdkRectangle _tmp2_ = {0};
+	gint _tmp3_ = 0;
+	GdkRectangle _tmp4_ = {0};
+	gint _tmp5_ = 0;
+	GdkRectangle _tmp6_ = {0};
+	gint _tmp7_ = 0;
+	GdkPoint _tmp8_ = {0};
+	GtkAllocation allocation = {0};
+	GtkWindow* _tmp9_ = NULL;
+	GtkAllocation _tmp10_ = {0};
+	GdkPoint window_right_bottom = {0};
+	GdkPoint _tmp11_ = {0};
+	gint _tmp12_ = 0;
+	GtkAllocation _tmp13_ = {0};
+	gint _tmp14_ = 0;
+	GdkPoint _tmp15_ = {0};
+	gint _tmp16_ = 0;
+	GtkAllocation _tmp17_ = {0};
+	gint _tmp18_ = 0;
+	GdkPoint _tmp19_ = {0};
+	GdkWindow* root = NULL;
+	GdkWindow* _tmp20_ = NULL;
+	GdkWindow* _tmp21_ = NULL;
+	gint root_width = 0;
+	GdkWindow* _tmp22_ = NULL;
+	gint _tmp23_ = 0;
+	gint root_height = 0;
+	GdkWindow* _tmp24_ = NULL;
+	gint _tmp25_ = 0;
+	gint x = 0;
+	gint y = 0;
+	GdkPoint _tmp26_ = {0};
+	gint _tmp27_ = 0;
+	gint _tmp28_ = 0;
+	GdkPoint _tmp34_ = {0};
+	gint _tmp35_ = 0;
+	gint _tmp36_ = 0;
+	gint _tmp43_ = 0;
+	gint _tmp44_ = 0;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = self->priv->m_cursor_location;
+	_tmp1_ = _tmp0_.x;
+	_tmp2_ = self->priv->m_cursor_location;
+	_tmp3_ = _tmp2_.width;
+	_tmp4_ = self->priv->m_cursor_location;
+	_tmp5_ = _tmp4_.y;
+	_tmp6_ = self->priv->m_cursor_location;
+	_tmp7_ = _tmp6_.height;
+	_tmp8_.x = _tmp1_ + _tmp3_;
+	_tmp8_.y = _tmp5_ + _tmp7_;
+	cursor_right_bottom = _tmp8_;
+	_tmp9_ = self->priv->m_toplevel;
+	gtk_widget_get_allocation ((GtkWidget*) _tmp9_, &_tmp10_);
+	allocation = _tmp10_;
+	_tmp11_ = cursor_right_bottom;
+	_tmp12_ = _tmp11_.x;
+	_tmp13_ = allocation;
+	_tmp14_ = _tmp13_.width;
+	_tmp15_ = cursor_right_bottom;
+	_tmp16_ = _tmp15_.y;
+	_tmp17_ = allocation;
+	_tmp18_ = _tmp17_.height;
+	_tmp19_.x = _tmp12_ + _tmp14_;
+	_tmp19_.y = _tmp16_ + _tmp18_;
+	window_right_bottom = _tmp19_;
+	_tmp20_ = gdk_get_default_root_window ();
+	_tmp21_ = _g_object_ref0 (_tmp20_);
+	root = _tmp21_;
+	_tmp22_ = root;
+	_tmp23_ = gdk_window_get_width (_tmp22_);
+	root_width = _tmp23_;
+	_tmp24_ = root;
+	_tmp25_ = gdk_window_get_height (_tmp24_);
+	root_height = _tmp25_;
+	_tmp26_ = window_right_bottom;
+	_tmp27_ = _tmp26_.x;
+	_tmp28_ = root_width;
+	if (_tmp27_ > _tmp28_) {
+		gint _tmp29_ = 0;
+		GtkAllocation _tmp30_ = {0};
+		gint _tmp31_ = 0;
+		_tmp29_ = root_width;
+		_tmp30_ = allocation;
+		_tmp31_ = _tmp30_.width;
+		x = _tmp29_ - _tmp31_;
+	} else {
+		GdkPoint _tmp32_ = {0};
+		gint _tmp33_ = 0;
+		_tmp32_ = cursor_right_bottom;
+		_tmp33_ = _tmp32_.x;
+		x = _tmp33_;
+	}
+	_tmp34_ = window_right_bottom;
+	_tmp35_ = _tmp34_.y;
+	_tmp36_ = root_height;
+	if (_tmp35_ > _tmp36_) {
+		GdkRectangle _tmp37_ = {0};
+		gint _tmp38_ = 0;
+		GtkAllocation _tmp39_ = {0};
+		gint _tmp40_ = 0;
+		_tmp37_ = self->priv->m_cursor_location;
+		_tmp38_ = _tmp37_.y;
+		_tmp39_ = allocation;
+		_tmp40_ = _tmp39_.height;
+		y = _tmp38_ - _tmp40_;
+	} else {
+		GdkPoint _tmp41_ = {0};
+		gint _tmp42_ = 0;
+		_tmp41_ = cursor_right_bottom;
+		_tmp42_ = _tmp41_.y;
+		y = _tmp42_;
+	}
+	_tmp43_ = x;
+	_tmp44_ = y;
+	property_panel_move (self, _tmp43_, _tmp44_);
+	_g_object_unref0 (root);
+}
+
+
+static gboolean __lambda22_ (PropertyPanel* self) {
+	gboolean result = FALSE;
+	GtkWindow* _tmp0_ = NULL;
+	_tmp0_ = self->priv->m_toplevel;
+	gtk_widget_hide ((GtkWidget*) _tmp0_);
+	self->priv->m_auto_hide_timeout_id = (guint) 0;
+	result = FALSE;
+	return result;
+}
+
+
+static gboolean ___lambda22__gsource_func (gpointer self) {
+	gboolean result;
+	result = __lambda22_ (self);
+	return result;
+}
+
+
+static void property_panel_show_with_auto_hide_timer (PropertyPanel* self) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+	gboolean _tmp3_ = FALSE;
+	guint _tmp4_ = 0U;
+	GtkWindow* _tmp6_ = NULL;
+	guint _tmp7_ = 0U;
+	guint _tmp8_ = 0U;
+	g_return_if_fail (self != NULL);
+	_tmp1_ = self->priv->m_show;
+	if (_tmp1_ != ((gint) PANEL_SHOW_AUTO_HIDE)) {
+		_tmp0_ = TRUE;
+	} else {
+		IPropToolItem** _tmp2_ = NULL;
+		gint _tmp2__length1 = 0;
+		_tmp2_ = self->priv->m_items;
+		_tmp2__length1 = self->priv->m_items_length1;
+		_tmp0_ = _tmp2__length1 == 0;
+	}
+	_tmp3_ = _tmp0_;
+	if (_tmp3_) {
+		return;
+	}
+	_tmp4_ = self->priv->m_auto_hide_timeout_id;
+	if (_tmp4_ != ((guint) 0)) {
+		guint _tmp5_ = 0U;
+		_tmp5_ = self->priv->m_auto_hide_timeout_id;
+		g_source_remove (_tmp5_);
+	}
+	_tmp6_ = self->priv->m_toplevel;
+	gtk_widget_show_all ((GtkWidget*) _tmp6_);
+	_tmp7_ = self->priv->m_auto_hide_timeout;
+	_tmp8_ = g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, _tmp7_, ___lambda22__gsource_func, g_object_ref (self), g_object_unref);
+	self->priv->m_auto_hide_timeout_id = _tmp8_;
+}
+
+
+static void property_panel_hide_if_necessary (PropertyPanel* self) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+	gboolean _tmp3_ = FALSE;
+	g_return_if_fail (self != NULL);
+	_tmp1_ = self->priv->m_show;
+	if (_tmp1_ == ((gint) PANEL_SHOW_AUTO_HIDE)) {
+		guint _tmp2_ = 0U;
+		_tmp2_ = self->priv->m_auto_hide_timeout_id;
+		_tmp0_ = _tmp2_ != ((guint) 0);
+	} else {
+		_tmp0_ = FALSE;
+	}
+	_tmp3_ = _tmp0_;
+	if (_tmp3_) {
+		guint _tmp4_ = 0U;
+		GtkWindow* _tmp5_ = NULL;
+		_tmp4_ = self->priv->m_auto_hide_timeout_id;
+		g_source_remove (_tmp4_);
+		self->priv->m_auto_hide_timeout_id = (guint) 0;
+		_tmp5_ = self->priv->m_toplevel;
+		gtk_widget_hide ((GtkWidget*) _tmp5_);
+	}
+}
+
+
+static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+	typedef void (*GMarshalFunc_VOID__STRING_INT) (gpointer data1, const char* arg_1, gint arg_2, gpointer data2);
+	register GMarshalFunc_VOID__STRING_INT callback;
+	register GCClosure * cc;
+	register gpointer data1;
+	register gpointer data2;
+	cc = (GCClosure *) closure;
+	g_return_if_fail (n_param_values == 3);
+	if (G_CCLOSURE_SWAP_DATA (closure)) {
+		data1 = closure->data;
+		data2 = param_values->data[0].v_pointer;
+	} else {
+		data1 = param_values->data[0].v_pointer;
+		data2 = closure->data;
+	}
+	callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback);
+	callback (data1, g_value_get_string (param_values + 1), g_value_get_int (param_values + 2), data2);
+}
+
+
+static void property_panel_class_init (PropertyPanelClass * klass) {
+	property_panel_parent_class = g_type_class_peek_parent (klass);
+	g_type_class_add_private (klass, sizeof (PropertyPanelPrivate));
+	GTK_WIDGET_CLASS (klass)->get_preferred_width = property_panel_real_get_preferred_width;
+	GTK_WIDGET_CLASS (klass)->get_preferred_height = property_panel_real_get_preferred_height;
+	G_OBJECT_CLASS (klass)->finalize = property_panel_finalize;
+	g_signal_new ("property_activate", TYPE_PROPERTY_PANEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_INT, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
+}
+
+
+static void property_panel_instance_init (PropertyPanel * self) {
+	GdkRectangle _tmp0_ = {0};
+	self->priv = PROPERTY_PANEL_GET_PRIVATE (self);
+	memset (&_tmp0_, 0, sizeof (GdkRectangle));
+	_tmp0_.x = -1;
+	_tmp0_.y = -1;
+	_tmp0_.width = 0;
+	_tmp0_.height = 0;
+	self->priv->m_cursor_location = _tmp0_;
+	self->priv->m_show = (gint) PANEL_SHOW_AUTO_HIDE;
+	self->priv->m_auto_hide_timeout = (guint) 10000;
+	self->priv->m_auto_hide_timeout_id = (guint) 0;
+}
+
+
+static void property_panel_finalize (GObject* obj) {
+	PropertyPanel * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROPERTY_PANEL, PropertyPanel);
+	_g_object_unref0 (self->priv->m_toplevel);
+	_g_object_unref0 (self->priv->m_props);
+	self->priv->m_items = (_vala_array_free (self->priv->m_items, self->priv->m_items_length1, (GDestroyNotify) g_object_unref), NULL);
+	G_OBJECT_CLASS (property_panel_parent_class)->finalize (obj);
+}
+
+
+GType property_panel_get_type (void) {
+	static volatile gsize property_panel_type_id__volatile = 0;
+	if (g_once_init_enter (&property_panel_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PropertyPanelClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) property_panel_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PropertyPanel), 0, (GInstanceInitFunc) property_panel_instance_init, NULL };
+		GType property_panel_type_id;
+		property_panel_type_id = g_type_register_static (GTK_TYPE_BOX, "PropertyPanel", &g_define_type_info, 0);
+		g_once_init_leave (&property_panel_type_id__volatile, property_panel_type_id);
+	}
+	return property_panel_type_id__volatile;
+}
+
+
+void iprop_tool_item_update_property (IPropToolItem* self, IBusProperty* prop) {
+	g_return_if_fail (self != NULL);
+	IPROP_TOOL_ITEM_GET_INTERFACE (self)->update_property (self, prop);
+}
+
+
+static void iprop_tool_item_base_init (IPropToolItemIface * iface) {
+	static gboolean initialized = FALSE;
+	if (!initialized) {
+		initialized = TRUE;
+		g_signal_new ("property_activate", TYPE_IPROP_TOOL_ITEM, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_INT, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
+	}
+}
+
+
+GType iprop_tool_item_get_type (void) {
+	static volatile gsize iprop_tool_item_type_id__volatile = 0;
+	if (g_once_init_enter (&iprop_tool_item_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (IPropToolItemIface), (GBaseInitFunc) iprop_tool_item_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
+		GType iprop_tool_item_type_id;
+		iprop_tool_item_type_id = g_type_register_static (G_TYPE_INTERFACE, "IPropToolItem", &g_define_type_info, 0);
+		g_type_interface_add_prerequisite (iprop_tool_item_type_id, G_TYPE_OBJECT);
+		g_once_init_leave (&iprop_tool_item_type_id__volatile, iprop_tool_item_type_id);
+	}
+	return iprop_tool_item_type_id__volatile;
+}
+
+
+PropMenu* prop_menu_construct (GType object_type, IBusProperty* prop) {
+	PropMenu * self = NULL;
+	IBusProperty* _tmp0_ = NULL;
+	IBusPropList* _tmp1_ = NULL;
+	IBusProperty* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	g_return_val_if_fail (prop != NULL, NULL);
+	self = (PropMenu*) g_object_new (object_type, NULL);
+	gtk_menu_shell_set_take_focus ((GtkMenuShell*) self, FALSE);
+	_tmp0_ = prop;
+	_tmp1_ = ibus_property_get_sub_props (_tmp0_);
+	prop_menu_create_items (self, _tmp1_);
+	gtk_widget_show_all ((GtkWidget*) self);
+	_tmp2_ = prop;
+	_tmp3_ = ibus_property_get_sensitive (_tmp2_);
+	gtk_widget_set_sensitive ((GtkWidget*) self, _tmp3_);
+	return self;
+}
+
+
+PropMenu* prop_menu_new (IBusProperty* prop) {
+	return prop_menu_construct (TYPE_PROP_MENU, prop);
+}
+
+
+static void prop_menu_real_update_property (IPropToolItem* base, IBusProperty* prop) {
+	PropMenu * self;
+	IPropItem** _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
+	self = (PropMenu*) base;
+	g_return_if_fail (prop != NULL);
+	_tmp0_ = self->priv->m_items;
+	_tmp0__length1 = self->priv->m_items_length1;
+	{
+		IPropItem** item_collection = NULL;
+		gint item_collection_length1 = 0;
+		gint _item_collection_size_ = 0;
+		gint item_it = 0;
+		item_collection = _tmp0_;
+		item_collection_length1 = _tmp0__length1;
+		for (item_it = 0; item_it < _tmp0__length1; item_it = item_it + 1) {
+			IPropItem* _tmp1_ = NULL;
+			IPropItem* item = NULL;
+			_tmp1_ = _g_object_ref0 (item_collection[item_it]);
+			item = _tmp1_;
+			{
+				IPropItem* _tmp2_ = NULL;
+				IBusProperty* _tmp3_ = NULL;
+				_tmp2_ = item;
+				_tmp3_ = prop;
+				iprop_item_update_property (_tmp2_, _tmp3_);
+				_g_object_unref0 (item);
+			}
+		}
+	}
+}
+
+
+static void _prop_menu_menu_position_gtk_menu_position_func (GtkMenu* menu, gint* x, gint* y, gboolean* push_in, gpointer self) {
+	prop_menu_menu_position (self, menu, x, y, push_in);
+}
+
+
+void prop_menu_popup (PropMenu* self, guint button, guint32 activate_time, GtkWidget* widget) {
+	GtkWidget* _tmp0_ = NULL;
+	GtkWidget* _tmp1_ = NULL;
+	guint _tmp2_ = 0U;
+	guint32 _tmp3_ = 0U;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (widget != NULL);
+	_tmp0_ = widget;
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_g_object_unref0 (self->priv->m_parent_button);
+	self->priv->m_parent_button = _tmp1_;
+	_tmp2_ = button;
+	_tmp3_ = activate_time;
+	gtk_menu_popup (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_MENU, GtkMenu), NULL, NULL, _prop_menu_menu_position_gtk_menu_position_func, self, _tmp2_, _tmp3_);
+}
+
+
+static void prop_menu_real_destroy (GtkWidget* base) {
+	PropMenu * self;
+	IPropItem** _tmp0_ = NULL;
+	self = (PropMenu*) base;
+	_g_object_unref0 (self->priv->m_parent_button);
+	self->priv->m_parent_button = NULL;
+	_tmp0_ = g_new0 (IPropItem*, 0 + 1);
+	self->priv->m_items = (_vala_array_free (self->priv->m_items, self->priv->m_items_length1, (GDestroyNotify) g_object_unref), NULL);
+	self->priv->m_items = _tmp0_;
+	self->priv->m_items_length1 = 0;
+	self->priv->_m_items_size_ = self->priv->m_items_length1;
+	GTK_WIDGET_CLASS (prop_menu_parent_class)->destroy ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_MENU, GtkMenu));
+}
+
+
+static void ____lambda18_ (PropMenu* self, IPropItem* w, const gchar* k, gint s) {
+	const gchar* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	g_return_if_fail (w != NULL);
+	g_return_if_fail (k != NULL);
+	_tmp0_ = k;
+	_tmp1_ = s;
+	g_signal_emit_by_name ((IPropToolItem*) self, "property-activate", _tmp0_, _tmp1_);
+}
+
+
+static void _____lambda18__iprop_item_property_activate (IPropItem* _sender, const gchar* key, gint state, gpointer self) {
+	____lambda18_ (self, _sender, key, state);
+}
+
+
+static void _vala_array_add26 (IPropItem*** array, int* length, int* size, IPropItem* value) {
+	if ((*length) == (*size)) {
+		*size = (*size) ? (2 * (*size)) : 4;
+		*array = g_renew (IPropItem*, *array, (*size) + 1);
+	}
+	(*array)[(*length)++] = value;
+	(*array)[*length] = NULL;
+}
+
+
+static void prop_menu_create_items (PropMenu* self, IBusPropList* props) {
+	gint i = 0;
+	PropRadioMenuItem* last_radio = NULL;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (props != NULL);
+	i = 0;
+	last_radio = NULL;
+	while (TRUE) {
+		IBusProperty* prop = NULL;
+		IBusPropList* _tmp0_ = NULL;
+		gint _tmp1_ = 0;
+		IBusProperty* _tmp2_ = NULL;
+		IBusProperty* _tmp3_ = NULL;
+		IBusProperty* _tmp4_ = NULL;
+		gint _tmp5_ = 0;
+		IPropItem* item = NULL;
+		IBusProperty* _tmp6_ = NULL;
+		IBusPropType _tmp7_ = 0;
+		IBusProperty* _tmp29_ = NULL;
+		IBusPropType _tmp30_ = 0;
+		IPropItem* _tmp31_ = NULL;
+		_tmp0_ = props;
+		_tmp1_ = i;
+		_tmp2_ = ibus_prop_list_get (_tmp0_, (guint) _tmp1_);
+		_tmp3_ = _g_object_ref0 (_tmp2_);
+		prop = _tmp3_;
+		_tmp4_ = prop;
+		if (_tmp4_ == NULL) {
+			_g_object_unref0 (prop);
+			break;
+		}
+		_tmp5_ = i;
+		i = _tmp5_ + 1;
+		item = NULL;
+		_tmp6_ = prop;
+		_tmp7_ = ibus_property_get_prop_type (_tmp6_);
+		switch (_tmp7_) {
+			case PROP_TYPE_NORMAL:
+			{
+				IBusProperty* _tmp8_ = NULL;
+				PropImageMenuItem* _tmp9_ = NULL;
+				_tmp8_ = prop;
+				_tmp9_ = prop_image_menu_item_new (_tmp8_);
+				g_object_ref_sink (_tmp9_);
+				_g_object_unref0 (item);
+				item = (IPropItem*) _tmp9_;
+				break;
+			}
+			case PROP_TYPE_TOGGLE:
+			{
+				IBusProperty* _tmp10_ = NULL;
+				PropCheckMenuItem* _tmp11_ = NULL;
+				_tmp10_ = prop;
+				_tmp11_ = prop_check_menu_item_new (_tmp10_);
+				g_object_ref_sink (_tmp11_);
+				_g_object_unref0 (item);
+				item = (IPropItem*) _tmp11_;
+				break;
+			}
+			case PROP_TYPE_RADIO:
+			{
+				IBusProperty* _tmp12_ = NULL;
+				PropRadioMenuItem* _tmp13_ = NULL;
+				PropRadioMenuItem* _tmp14_ = NULL;
+				PropRadioMenuItem* _tmp15_ = NULL;
+				IPropItem* _tmp16_ = NULL;
+				_tmp12_ = prop;
+				_tmp13_ = last_radio;
+				_tmp14_ = prop_radio_menu_item_new (_tmp12_, _tmp13_);
+				g_object_ref_sink (_tmp14_);
+				_g_object_unref0 (last_radio);
+				last_radio = _tmp14_;
+				_tmp15_ = last_radio;
+				_tmp16_ = _g_object_ref0 ((IPropItem*) _tmp15_);
+				_g_object_unref0 (item);
+				item = _tmp16_;
+				break;
+			}
+			case PROP_TYPE_MENU:
+			{
+				{
+					PropImageMenuItem* menuitem = NULL;
+					IBusProperty* _tmp17_ = NULL;
+					PropImageMenuItem* _tmp18_ = NULL;
+					PropImageMenuItem* _tmp19_ = NULL;
+					IBusProperty* _tmp20_ = NULL;
+					PropMenu* _tmp21_ = NULL;
+					PropMenu* _tmp22_ = NULL;
+					PropImageMenuItem* _tmp23_ = NULL;
+					IPropItem* _tmp24_ = NULL;
+					_tmp17_ = prop;
+					_tmp18_ = prop_image_menu_item_new (_tmp17_);
+					g_object_ref_sink (_tmp18_);
+					menuitem = _tmp18_;
+					_tmp19_ = menuitem;
+					_tmp20_ = prop;
+					_tmp21_ = prop_menu_new (_tmp20_);
+					g_object_ref_sink (_tmp21_);
+					_tmp22_ = _tmp21_;
+					gtk_menu_item_set_submenu ((GtkMenuItem*) _tmp19_, (GtkWidget*) _tmp22_);
+					_g_object_unref0 (_tmp22_);
+					_tmp23_ = menuitem;
+					_tmp24_ = _g_object_ref0 ((IPropItem*) _tmp23_);
+					_g_object_unref0 (item);
+					item = _tmp24_;
+					_g_object_unref0 (menuitem);
+				}
+				break;
+			}
+			case PROP_TYPE_SEPARATOR:
+			{
+				IBusProperty* _tmp25_ = NULL;
+				PropSeparatorMenuItem* _tmp26_ = NULL;
+				_tmp25_ = prop;
+				_tmp26_ = prop_separator_menu_item_new (_tmp25_);
+				g_object_ref_sink (_tmp26_);
+				_g_object_unref0 (item);
+				item = (IPropItem*) _tmp26_;
+				break;
+			}
+			default:
+			{
+				IBusProperty* _tmp27_ = NULL;
+				IBusPropType _tmp28_ = 0;
+				_tmp27_ = prop;
+				_tmp28_ = ibus_property_get_prop_type (_tmp27_);
+				g_warning ("propertypanel.vala:382: Unknown property type: %d", (gint) _tmp28_);
+				break;
+			}
+		}
+		_tmp29_ = prop;
+		_tmp30_ = ibus_property_get_prop_type (_tmp29_);
+		if (_tmp30_ != PROP_TYPE_RADIO) {
+			_g_object_unref0 (last_radio);
+			last_radio = NULL;
+		}
+		_tmp31_ = item;
+		if (_tmp31_ != NULL) {
+			IPropItem* _tmp32_ = NULL;
+			IPropItem* _tmp33_ = NULL;
+			IPropItem** _tmp34_ = NULL;
+			gint _tmp34__length1 = 0;
+			IPropItem* _tmp35_ = NULL;
+			IPropItem* _tmp36_ = NULL;
+			_tmp32_ = item;
+			gtk_menu_shell_append ((GtkMenuShell*) self, (GtkWidget*) (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, GTK_TYPE_MENU_ITEM) ? ((GtkMenuItem*) _tmp32_) : NULL));
+			_tmp33_ = item;
+			g_signal_connect_object (_tmp33_, "property-activate", (GCallback) _____lambda18__iprop_item_property_activate, self, 0);
+			_tmp34_ = self->priv->m_items;
+			_tmp34__length1 = self->priv->m_items_length1;
+			_tmp35_ = item;
+			_tmp36_ = _g_object_ref0 (_tmp35_);
+			_vala_array_add26 (&self->priv->m_items, &self->priv->m_items_length1, &self->priv->_m_items_size_, _tmp36_);
+		}
+		_g_object_unref0 (item);
+		_g_object_unref0 (prop);
+	}
+	_g_object_unref0 (last_radio);
+}
+
+
+static void prop_menu_menu_position (PropMenu* self, GtkMenu* menu, gint* x, gint* y, gboolean* push_in) {
+	gint _vala_x = 0;
+	gint _vala_y = 0;
+	gboolean _vala_push_in = FALSE;
+	GtkWidget* button = NULL;
+	GtkWidget* _tmp0_ = NULL;
+	GtkWidget* _tmp1_ = NULL;
+	GdkScreen* screen = NULL;
+	GtkWidget* _tmp2_ = NULL;
+	GdkScreen* _tmp3_ = NULL;
+	GdkScreen* _tmp4_ = NULL;
+	gint monitor = 0;
+	GdkScreen* _tmp5_ = NULL;
+	GtkWidget* _tmp6_ = NULL;
+	GdkWindow* _tmp7_ = NULL;
+	gint _tmp8_ = 0;
+	GdkRectangle monitor_location = {0};
+	GdkScreen* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
+	GdkRectangle _tmp11_ = {0};
+	GtkWidget* _tmp12_ = NULL;
+	GdkWindow* _tmp13_ = NULL;
+	gint _tmp14_ = 0;
+	gint _tmp15_ = 0;
+	GtkAllocation button_allocation = {0};
+	GtkWidget* _tmp16_ = NULL;
+	GtkAllocation _tmp17_ = {0};
+	gint _tmp18_ = 0;
+	GtkAllocation _tmp19_ = {0};
+	gint _tmp20_ = 0;
+	gint _tmp21_ = 0;
+	GtkAllocation _tmp22_ = {0};
+	gint _tmp23_ = 0;
+	gint menu_width = 0;
+	gint menu_height = 0;
+	GtkMenu* _tmp24_ = NULL;
+	gint _tmp25_ = 0;
+	gint _tmp26_ = 0;
+	gint _tmp27_ = 0;
+	gint _tmp28_ = 0;
+	GdkRectangle _tmp29_ = {0};
+	gint _tmp30_ = 0;
+	gint _tmp44_ = 0;
+	GtkAllocation _tmp45_ = {0};
+	gint _tmp46_ = 0;
+	gint _tmp47_ = 0;
+	GdkRectangle _tmp48_ = {0};
+	gint _tmp49_ = 0;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (menu != NULL);
+	_tmp0_ = self->priv->m_parent_button;
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+	button = _tmp1_;
+	_tmp2_ = button;
+	_tmp3_ = gtk_widget_get_screen (_tmp2_);
+	_tmp4_ = _g_object_ref0 (_tmp3_);
+	screen = _tmp4_;
+	_tmp5_ = screen;
+	_tmp6_ = button;
+	_tmp7_ = gtk_widget_get_window (_tmp6_);
+	_tmp8_ = gdk_screen_get_monitor_at_window (_tmp5_, _tmp7_);
+	monitor = _tmp8_;
+	_tmp9_ = screen;
+	_tmp10_ = monitor;
+	gdk_screen_get_monitor_geometry (_tmp9_, _tmp10_, &_tmp11_);
+	monitor_location = _tmp11_;
+	_tmp12_ = button;
+	_tmp13_ = gtk_widget_get_window (_tmp12_);
+	gdk_window_get_origin (_tmp13_, &_tmp14_, &_tmp15_);
+	_vala_x = _tmp14_;
+	_vala_y = _tmp15_;
+	_tmp16_ = button;
+	gtk_widget_get_allocation (_tmp16_, &_tmp17_);
+	button_allocation = _tmp17_;
+	_tmp18_ = _vala_x;
+	_tmp19_ = button_allocation;
+	_tmp20_ = _tmp19_.x;
+	_vala_x = _tmp18_ + _tmp20_;
+	_tmp21_ = _vala_y;
+	_tmp22_ = button_allocation;
+	_tmp23_ = _tmp22_.y;
+	_vala_y = _tmp21_ + _tmp23_;
+	_tmp24_ = menu;
+	gtk_widget_get_size_request ((GtkWidget*) _tmp24_, &_tmp25_, &_tmp26_);
+	menu_width = _tmp25_;
+	menu_height = _tmp26_;
+	_tmp27_ = _vala_x;
+	_tmp28_ = menu_width;
+	_tmp29_ = monitor_location;
+	_tmp30_ = _tmp29_.width;
+	if ((_tmp27_ + _tmp28_) >= _tmp30_) {
+		gint _tmp31_ = 0;
+		gint _tmp32_ = 0;
+		GtkAllocation _tmp33_ = {0};
+		gint _tmp34_ = 0;
+		_tmp31_ = _vala_x;
+		_tmp32_ = menu_width;
+		_tmp33_ = button_allocation;
+		_tmp34_ = _tmp33_.width;
+		_vala_x = _tmp31_ - (_tmp32_ - _tmp34_);
+	} else {
+		gint _tmp35_ = 0;
+		gint _tmp36_ = 0;
+		_tmp35_ = _vala_x;
+		_tmp36_ = menu_width;
+		if ((_tmp35_ - _tmp36_) <= 0) {
+		} else {
+			gint _tmp37_ = 0;
+			GdkRectangle _tmp38_ = {0};
+			gint _tmp39_ = 0;
+			_tmp37_ = _vala_x;
+			_tmp38_ = monitor_location;
+			_tmp39_ = _tmp38_.width;
+			if (_tmp37_ <= ((_tmp39_ * 3) / 4)) {
+			} else {
+				gint _tmp40_ = 0;
+				gint _tmp41_ = 0;
+				GtkAllocation _tmp42_ = {0};
+				gint _tmp43_ = 0;
+				_tmp40_ = _vala_x;
+				_tmp41_ = menu_width;
+				_tmp42_ = button_allocation;
+				_tmp43_ = _tmp42_.width;
+				_vala_x = _tmp40_ - (_tmp41_ - _tmp43_);
+			}
+		}
+	}
+	_tmp44_ = _vala_y;
+	_tmp45_ = button_allocation;
+	_tmp46_ = _tmp45_.height;
+	_tmp47_ = menu_width;
+	_tmp48_ = monitor_location;
+	_tmp49_ = _tmp48_.height;
+	if (((_tmp44_ + _tmp46_) + _tmp47_) >= _tmp49_) {
+		gint _tmp50_ = 0;
+		gint _tmp51_ = 0;
+		_tmp50_ = _vala_y;
+		_tmp51_ = menu_height;
+		_vala_y = _tmp50_ - _tmp51_;
+	} else {
+		gint _tmp52_ = 0;
+		gint _tmp53_ = 0;
+		_tmp52_ = _vala_y;
+		_tmp53_ = menu_height;
+		if ((_tmp52_ - _tmp53_) <= 0) {
+			gint _tmp54_ = 0;
+			GtkAllocation _tmp55_ = {0};
+			gint _tmp56_ = 0;
+			_tmp54_ = _vala_y;
+			_tmp55_ = button_allocation;
+			_tmp56_ = _tmp55_.height;
+			_vala_y = _tmp54_ + _tmp56_;
+		} else {
+			gint _tmp57_ = 0;
+			GdkRectangle _tmp58_ = {0};
+			gint _tmp59_ = 0;
+			_tmp57_ = _vala_y;
+			_tmp58_ = monitor_location;
+			_tmp59_ = _tmp58_.height;
+			if (_tmp57_ <= ((_tmp59_ * 3) / 4)) {
+				gint _tmp60_ = 0;
+				GtkAllocation _tmp61_ = {0};
+				gint _tmp62_ = 0;
+				_tmp60_ = _vala_y;
+				_tmp61_ = button_allocation;
+				_tmp62_ = _tmp61_.height;
+				_vala_y = _tmp60_ + _tmp62_;
+			} else {
+				gint _tmp63_ = 0;
+				gint _tmp64_ = 0;
+				_tmp63_ = _vala_y;
+				_tmp64_ = menu_height;
+				_vala_y = _tmp63_ - _tmp64_;
+			}
+		}
+	}
+	_vala_push_in = FALSE;
+	_g_object_unref0 (screen);
+	_g_object_unref0 (button);
+	if (x) {
+		*x = _vala_x;
+	}
+	if (y) {
+		*y = _vala_y;
+	}
+	if (push_in) {
+		*push_in = _vala_push_in;
+	}
+}
+
+
+static void prop_menu_class_init (PropMenuClass * klass) {
+	prop_menu_parent_class = g_type_class_peek_parent (klass);
+	g_type_class_add_private (klass, sizeof (PropMenuPrivate));
+	GTK_WIDGET_CLASS (klass)->destroy = prop_menu_real_destroy;
+	G_OBJECT_CLASS (klass)->finalize = prop_menu_finalize;
+}
+
+
+static void prop_menu_iprop_tool_item_interface_init (IPropToolItemIface * iface) {
+	prop_menu_iprop_tool_item_parent_iface = g_type_interface_peek_parent (iface);
+	iface->update_property = (void (*)(IPropToolItem*, IBusProperty*)) prop_menu_real_update_property;
+}
+
+
+static void prop_menu_instance_init (PropMenu * self) {
+	self->priv = PROP_MENU_GET_PRIVATE (self);
+}
+
+
+static void prop_menu_finalize (GObject* obj) {
+	PropMenu * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROP_MENU, PropMenu);
+	_g_object_unref0 (self->priv->m_parent_button);
+	self->priv->m_items = (_vala_array_free (self->priv->m_items, self->priv->m_items_length1, (GDestroyNotify) g_object_unref), NULL);
+	G_OBJECT_CLASS (prop_menu_parent_class)->finalize (obj);
+}
+
+
+GType prop_menu_get_type (void) {
+	static volatile gsize prop_menu_type_id__volatile = 0;
+	if (g_once_init_enter (&prop_menu_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PropMenuClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prop_menu_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PropMenu), 0, (GInstanceInitFunc) prop_menu_instance_init, NULL };
+		static const GInterfaceInfo iprop_tool_item_info = { (GInterfaceInitFunc) prop_menu_iprop_tool_item_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType prop_menu_type_id;
+		prop_menu_type_id = g_type_register_static (GTK_TYPE_MENU, "PropMenu", &g_define_type_info, 0);
+		g_type_add_interface_static (prop_menu_type_id, TYPE_IPROP_TOOL_ITEM, &iprop_tool_item_info);
+		g_once_init_leave (&prop_menu_type_id__volatile, prop_menu_type_id);
+	}
+	return prop_menu_type_id__volatile;
+}
+
+
+PropToolButton* prop_tool_button_construct (GType object_type, IBusProperty* prop) {
+	PropToolButton * self = NULL;
+	gchar* label = NULL;
+	IBusProperty* _tmp0_ = NULL;
+	IBusText* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	IBusProperty* _tmp4_ = NULL;
+	IBusProperty* _tmp5_ = NULL;
+	g_return_val_if_fail (prop != NULL, NULL);
+	_tmp0_ = prop;
+	_tmp1_ = ibus_property_get_symbol (_tmp0_);
+	_tmp2_ = ibus_text_get_text (_tmp1_);
+	_tmp3_ = g_strdup (_tmp2_);
+	label = _tmp3_;
+	self = (PropToolButton*) g_object_new (object_type, "label", label, NULL);
+	_tmp4_ = prop;
+	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_g_object_unref0 (self->priv->m_prop);
+	self->priv->m_prop = _tmp5_;
+	gtk_tool_item_set_homogeneous ((GtkToolItem*) self, FALSE);
+	prop_tool_button_sync (self);
+	_g_free0 (label);
+	return self;
+}
+
+
+PropToolButton* prop_tool_button_new (IBusProperty* prop) {
+	return prop_tool_button_construct (TYPE_PROP_TOOL_BUTTON, prop);
+}
+
+
+static void prop_tool_button_real_update_property (IPropToolItem* base, IBusProperty* prop) {
+	PropToolButton * self;
+	IBusProperty* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	IBusProperty* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	IBusProperty* _tmp4_ = NULL;
+	IBusProperty* _tmp5_ = NULL;
+	IBusText* _tmp6_ = NULL;
+	IBusProperty* _tmp7_ = NULL;
+	IBusProperty* _tmp8_ = NULL;
+	IBusText* _tmp9_ = NULL;
+	IBusProperty* _tmp10_ = NULL;
+	IBusProperty* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
+	IBusProperty* _tmp13_ = NULL;
+	IBusProperty* _tmp14_ = NULL;
+	const gchar* _tmp15_ = NULL;
+	IBusProperty* _tmp16_ = NULL;
+	IBusProperty* _tmp17_ = NULL;
+	IBusPropState _tmp18_ = 0;
+	IBusProperty* _tmp19_ = NULL;
+	IBusProperty* _tmp20_ = NULL;
+	gboolean _tmp21_ = FALSE;
+	self = (PropToolButton*) base;
+	g_return_if_fail (prop != NULL);
+	_tmp0_ = self->priv->m_prop;
+	_tmp1_ = ibus_property_get_key (_tmp0_);
+	_tmp2_ = prop;
+	_tmp3_ = ibus_property_get_key (_tmp2_);
+	if (g_strcmp0 (_tmp1_, _tmp3_) != 0) {
+		return;
+	}
+	_tmp4_ = self->priv->m_prop;
+	_tmp5_ = prop;
+	_tmp6_ = ibus_property_get_symbol (_tmp5_);
+	ibus_property_set_symbol (_tmp4_, _tmp6_);
+	_tmp7_ = self->priv->m_prop;
+	_tmp8_ = prop;
+	_tmp9_ = ibus_property_get_tooltip (_tmp8_);
+	ibus_property_set_tooltip (_tmp7_, _tmp9_);
+	_tmp10_ = self->priv->m_prop;
+	_tmp11_ = prop;
+	_tmp12_ = ibus_property_get_sensitive (_tmp11_);
+	ibus_property_set_sensitive (_tmp10_, _tmp12_);
+	_tmp13_ = self->priv->m_prop;
+	_tmp14_ = prop;
+	_tmp15_ = ibus_property_get_icon (_tmp14_);
+	ibus_property_set_icon (_tmp13_, _tmp15_);
+	_tmp16_ = self->priv->m_prop;
+	_tmp17_ = prop;
+	_tmp18_ = ibus_property_get_state (_tmp17_);
+	ibus_property_set_state (_tmp16_, _tmp18_);
+	_tmp19_ = self->priv->m_prop;
+	_tmp20_ = prop;
+	_tmp21_ = ibus_property_get_visible (_tmp20_);
+	ibus_property_set_visible (_tmp19_, _tmp21_);
+	prop_tool_button_sync (self);
+}
+
+
+static void prop_tool_button_sync (PropToolButton* self) {
+	IBusProperty* _tmp0_ = NULL;
+	IBusText* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	IBusProperty* _tmp3_ = NULL;
+	IBusText* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	IBusProperty* _tmp6_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	IBusProperty* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	IBusProperty* _tmp10_ = NULL;
+	gboolean _tmp11_ = FALSE;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = self->priv->m_prop;
+	_tmp1_ = ibus_property_get_symbol (_tmp0_);
+	_tmp2_ = ibus_text_get_text (_tmp1_);
+	gtk_tool_button_set_label ((GtkToolButton*) self, _tmp2_);
+	_tmp3_ = self->priv->m_prop;
+	_tmp4_ = ibus_property_get_tooltip (_tmp3_);
+	_tmp5_ = ibus_text_get_text (_tmp4_);
+	gtk_tool_item_set_tooltip_text ((GtkToolItem*) self, _tmp5_);
+	_tmp6_ = self->priv->m_prop;
+	_tmp7_ = ibus_property_get_sensitive (_tmp6_);
+	gtk_widget_set_sensitive ((GtkWidget*) self, _tmp7_);
+	_tmp8_ = self->priv->m_prop;
+	_tmp9_ = ibus_property_get_icon (_tmp8_);
+	prop_tool_button_set_icon_name (self, _tmp9_);
+	_tmp10_ = self->priv->m_prop;
+	_tmp11_ = ibus_property_get_visible (_tmp10_);
+	if (_tmp11_) {
+		gtk_widget_show ((GtkWidget*) self);
+	} else {
+		gtk_widget_hide ((GtkWidget*) self);
+	}
+}
+
+
+static void prop_tool_button_real_clicked (GtkToolButton* base) {
+	PropToolButton * self;
+	IBusProperty* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	IBusProperty* _tmp2_ = NULL;
+	IBusPropState _tmp3_ = 0;
+	self = (PropToolButton*) base;
+	_tmp0_ = self->priv->m_prop;
+	_tmp1_ = ibus_property_get_key (_tmp0_);
+	_tmp2_ = self->priv->m_prop;
+	_tmp3_ = ibus_property_get_state (_tmp2_);
+	g_signal_emit_by_name ((IPropToolItem*) self, "property-activate", _tmp1_, (gint) _tmp3_);
+}
+
+
+void prop_tool_button_set_icon_name (PropToolButton* self, const gchar* icon_name) {
+	gchar* label = NULL;
+	IBusProperty* _tmp0_ = NULL;
+	IBusText* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	IconWidget* icon_widget = NULL;
+	const gchar* _tmp4_ = NULL;
+	IconWidget* _tmp7_ = NULL;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (icon_name != NULL);
+	_tmp0_ = self->priv->m_prop;
+	_tmp1_ = ibus_property_get_symbol (_tmp0_);
+	_tmp2_ = ibus_text_get_text (_tmp1_);
+	_tmp3_ = g_strdup (_tmp2_);
+	label = _tmp3_;
+	icon_widget = NULL;
+	_tmp4_ = label;
+	if (g_strcmp0 (_tmp4_, "") == 0) {
+		const gchar* _tmp5_ = NULL;
+		IconWidget* _tmp6_ = NULL;
+		_g_free0 (label);
+		label = NULL;
+		_tmp5_ = icon_name;
+		_tmp6_ = icon_widget_new (_tmp5_, GTK_ICON_SIZE_BUTTON);
+		g_object_ref_sink (_tmp6_);
+		_g_object_unref0 (icon_widget);
+		icon_widget = _tmp6_;
+		gtk_tool_item_set_is_important ((GtkToolItem*) self, FALSE);
+	} else {
+		gtk_tool_item_set_is_important ((GtkToolItem*) self, TRUE);
+	}
+	_tmp7_ = icon_widget;
+	gtk_tool_button_set_icon_widget ((GtkToolButton*) self, (GtkWidget*) _tmp7_);
+	_g_object_unref0 (icon_widget);
+	_g_free0 (label);
+}
+
+
+static void prop_tool_button_class_init (PropToolButtonClass * klass) {
+	prop_tool_button_parent_class = g_type_class_peek_parent (klass);
+	g_type_class_add_private (klass, sizeof (PropToolButtonPrivate));
+	GTK_TOOL_BUTTON_CLASS (klass)->clicked = prop_tool_button_real_clicked;
+	G_OBJECT_CLASS (klass)->finalize = prop_tool_button_finalize;
+}
+
+
+static void prop_tool_button_iprop_tool_item_interface_init (IPropToolItemIface * iface) {
+	prop_tool_button_iprop_tool_item_parent_iface = g_type_interface_peek_parent (iface);
+	iface->update_property = (void (*)(IPropToolItem*, IBusProperty*)) prop_tool_button_real_update_property;
+}
+
+
+static void prop_tool_button_instance_init (PropToolButton * self) {
+	self->priv = PROP_TOOL_BUTTON_GET_PRIVATE (self);
+	self->priv->m_prop = NULL;
+}
+
+
+static void prop_tool_button_finalize (GObject* obj) {
+	PropToolButton * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROP_TOOL_BUTTON, PropToolButton);
+	_g_object_unref0 (self->priv->m_prop);
+	G_OBJECT_CLASS (prop_tool_button_parent_class)->finalize (obj);
+}
+
+
+GType prop_tool_button_get_type (void) {
+	static volatile gsize prop_tool_button_type_id__volatile = 0;
+	if (g_once_init_enter (&prop_tool_button_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PropToolButtonClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prop_tool_button_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PropToolButton), 0, (GInstanceInitFunc) prop_tool_button_instance_init, NULL };
+		static const GInterfaceInfo iprop_tool_item_info = { (GInterfaceInitFunc) prop_tool_button_iprop_tool_item_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType prop_tool_button_type_id;
+		prop_tool_button_type_id = g_type_register_static (GTK_TYPE_TOOL_BUTTON, "PropToolButton", &g_define_type_info, 0);
+		g_type_add_interface_static (prop_tool_button_type_id, TYPE_IPROP_TOOL_ITEM, &iprop_tool_item_info);
+		g_once_init_leave (&prop_tool_button_type_id__volatile, prop_tool_button_type_id);
+	}
+	return prop_tool_button_type_id__volatile;
+}
+
+
+PropToggleToolButton* prop_toggle_tool_button_construct (GType object_type, IBusProperty* prop) {
+	PropToggleToolButton * self = NULL;
+	IBusProperty* _tmp0_ = NULL;
+	IBusProperty* _tmp1_ = NULL;
+	g_return_val_if_fail (prop != NULL, NULL);
+	self = (PropToggleToolButton*) g_object_new (object_type, NULL);
+	_tmp0_ = prop;
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_g_object_unref0 (self->priv->m_prop);
+	self->priv->m_prop = _tmp1_;
+	gtk_tool_item_set_homogeneous ((GtkToolItem*) self, FALSE);
+	prop_toggle_tool_button_sync (self);
+	return self;
+}
+
+
+PropToggleToolButton* prop_toggle_tool_button_new (IBusProperty* prop) {
+	return prop_toggle_tool_button_construct (TYPE_PROP_TOGGLE_TOOL_BUTTON, prop);
+}
+
+
+void prop_toggle_tool_button_set_property (PropToggleToolButton* self, IBusProperty* prop) {
+	IBusProperty* _tmp0_ = NULL;
+	IBusProperty* _tmp1_ = NULL;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (prop != NULL);
+	_tmp0_ = prop;
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_g_object_unref0 (self->priv->m_prop);
+	self->priv->m_prop = _tmp1_;
+	prop_toggle_tool_button_sync (self);
+}
+
+
+static void prop_toggle_tool_button_real_update_property (IPropToolItem* base, IBusProperty* prop) {
+	PropToggleToolButton * self;
+	IBusProperty* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	IBusProperty* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	IBusProperty* _tmp4_ = NULL;
+	IBusProperty* _tmp5_ = NULL;
+	IBusText* _tmp6_ = NULL;
+	IBusProperty* _tmp7_ = NULL;
+	IBusProperty* _tmp8_ = NULL;
+	IBusText* _tmp9_ = NULL;
+	IBusProperty* _tmp10_ = NULL;
+	IBusProperty* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
+	IBusProperty* _tmp13_ = NULL;
+	IBusProperty* _tmp14_ = NULL;
+	const gchar* _tmp15_ = NULL;
+	IBusProperty* _tmp16_ = NULL;
+	IBusProperty* _tmp17_ = NULL;
+	IBusPropState _tmp18_ = 0;
+	IBusProperty* _tmp19_ = NULL;
+	IBusProperty* _tmp20_ = NULL;
+	gboolean _tmp21_ = FALSE;
+	self = (PropToggleToolButton*) base;
+	g_return_if_fail (prop != NULL);
+	_tmp0_ = self->priv->m_prop;
+	_tmp1_ = ibus_property_get_key (_tmp0_);
+	_tmp2_ = prop;
+	_tmp3_ = ibus_property_get_key (_tmp2_);
+	if (g_strcmp0 (_tmp1_, _tmp3_) != 0) {
+		return;
+	}
+	_tmp4_ = self->priv->m_prop;
+	_tmp5_ = prop;
+	_tmp6_ = ibus_property_get_symbol (_tmp5_);
+	ibus_property_set_symbol (_tmp4_, _tmp6_);
+	_tmp7_ = self->priv->m_prop;
+	_tmp8_ = prop;
+	_tmp9_ = ibus_property_get_tooltip (_tmp8_);
+	ibus_property_set_tooltip (_tmp7_, _tmp9_);
+	_tmp10_ = self->priv->m_prop;
+	_tmp11_ = prop;
+	_tmp12_ = ibus_property_get_sensitive (_tmp11_);
+	ibus_property_set_sensitive (_tmp10_, _tmp12_);
+	_tmp13_ = self->priv->m_prop;
+	_tmp14_ = prop;
+	_tmp15_ = ibus_property_get_icon (_tmp14_);
+	ibus_property_set_icon (_tmp13_, _tmp15_);
+	_tmp16_ = self->priv->m_prop;
+	_tmp17_ = prop;
+	_tmp18_ = ibus_property_get_state (_tmp17_);
+	ibus_property_set_state (_tmp16_, _tmp18_);
+	_tmp19_ = self->priv->m_prop;
+	_tmp20_ = prop;
+	_tmp21_ = ibus_property_get_visible (_tmp20_);
+	ibus_property_set_visible (_tmp19_, _tmp21_);
+	prop_toggle_tool_button_sync (self);
+}
+
+
+static void prop_toggle_tool_button_sync (PropToggleToolButton* self) {
+	IBusProperty* _tmp0_ = NULL;
+	IBusText* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	IBusProperty* _tmp3_ = NULL;
+	IBusText* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	IBusProperty* _tmp6_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	IBusProperty* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	IBusProperty* _tmp10_ = NULL;
+	IBusPropState _tmp11_ = 0;
+	IBusProperty* _tmp12_ = NULL;
+	gboolean _tmp13_ = FALSE;
+	g_return_if_fail (self != NULL);
+	_tmp0_ = self->priv->m_prop;
+	_tmp1_ = ibus_property_get_symbol (_tmp0_);
+	_tmp2_ = ibus_text_get_text (_tmp1_);
+	gtk_tool_button_set_label ((GtkToolButton*) self, _tmp2_);
+	_tmp3_ = self->priv->m_prop;
+	_tmp4_ = ibus_property_get_tooltip (_tmp3_);
+	_tmp5_ = ibus_text_get_text (_tmp4_);
+	gtk_tool_item_set_tooltip_text ((GtkToolItem*) self, _tmp5_);
+	_tmp6_ = self->priv->m_prop;
+	_tmp7_ = ibus_property_get_sensitive (_tmp6_);
+	gtk_widget_set_sensitive ((GtkWidget*) self, _tmp7_);
+	_tmp8_ = self->priv->m_prop;
+	_tmp9_ = ibus_property_get_icon (_tmp8_);
+	prop_toggle_tool_button_set_icon_name (self, _tmp9_);
+	_tmp10_ = self->priv->m_prop;
+	_tmp11_ = ibus_property_get_state (_tmp10_);
+	gtk_toggle_tool_button_set_active ((GtkToggleToolButton*) self, _tmp11_ == PROP_STATE_CHECKED);
+	_tmp12_ = self->priv->m_prop;
+	_tmp13_ = ibus_property_get_visible (_tmp12_);
+	if (_tmp13_) {
+		gtk_widget_show ((GtkWidget*) self);
+	} else {
+		gtk_widget_hide ((GtkWidget*) self);
+	}
+}
+
+
+static void prop_toggle_tool_button_real_toggled (GtkToggleToolButton* base) {
+	PropToggleToolButton * self;
+	gboolean do_emit = FALSE;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp7_ = FALSE;
+	self = (PropToggleToolButton*) base;
+	do_emit = FALSE;
+	_tmp0_ = gtk_toggle_tool_button_get_active ((GtkToggleToolButton*) self);
+	if (_tmp0_) {
+		IBusProperty* _tmp1_ = NULL;
+		IBusPropState _tmp2_ = 0;
+		IBusProperty* _tmp3_ = NULL;
+		_tmp1_ = self->priv->m_prop;
+		_tmp2_ = ibus_property_get_state (_tmp1_);
+		if (_tmp2_ != PROP_STATE_CHECKED) {
+			do_emit = TRUE;
+		}
+		_tmp3_ = self->priv->m_prop;
+		ibus_property_set_state (_tmp3_, PROP_STATE_CHECKED);
+	} else {
+		IBusProperty* _tmp4_ = NULL;
+		IBusPropState _tmp5_ = 0;
+		IBusProperty* _tmp6_ = NULL;
+		_tmp4_ = self->priv->m_prop;
+		_tmp5_ = ibus_property_get_state (_tmp4_);
+		if (_tmp5_ != PROP_STATE_UNCHECKED) {
+			do_emit = TRUE;
+		}
+		_tmp6_ = self->priv->m_prop;
+		ibus_property_set_state (_tmp6_, PROP_STATE_UNCHECKED);
+	}
+	_tmp7_ = do_emit;
+	if (_tmp7_) {
+		IBusProperty* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+		IBusProperty* _tmp10_ = NULL;
+		IBusPropState _tmp11_ = 0;
+		_tmp8_ = self->priv->m_prop;
+		_tmp9_ = ibus_property_get_key (_tmp8_);
+		_tmp10_ = self->priv->m_prop;
+		_tmp11_ = ibus_property_get_state (_tmp10_);
+		g_signal_emit_by_name ((IPropToolItem*) self, "property-activate", _tmp9_, (gint) _tmp11_);
+	}
+}
+
+
+void prop_toggle_tool_button_set_icon_name (PropToggleToolButton* self, const gchar* icon_name) {
+	gchar* label = NULL;
+	IBusProperty* _tmp0_ = NULL;
+	IBusText* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	IconWidget* icon_widget = NULL;
+	const gchar* _tmp4_ = NULL;
+	IconWidget* _tmp7_ = NULL;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (icon_name != NULL);
+	_tmp0_ = self->priv->m_prop;
+	_tmp1_ = ibus_property_get_symbol (_tmp0_);
+	_tmp2_ = ibus_text_get_text (_tmp1_);
+	_tmp3_ = g_strdup (_tmp2_);
+	label = _tmp3_;
+	icon_widget = NULL;
+	_tmp4_ = label;
+	if (g_strcmp0 (_tmp4_, "") == 0) {
+		const gchar* _tmp5_ = NULL;
+		IconWidget* _tmp6_ = NULL;
+		_g_free0 (label);
+		label = NULL;
+		_tmp5_ = icon_name;
+		_tmp6_ = icon_widget_new (_tmp5_, GTK_ICON_SIZE_BUTTON);
+		g_object_ref_sink (_tmp6_);
+		_g_object_unref0 (icon_widget);
+		icon_widget = _tmp6_;
+		gtk_tool_item_set_is_important ((GtkToolItem*) self, FALSE);
+	} else {
+		gtk_tool_item_set_is_important ((GtkToolItem*) self, TRUE);
+	}
+	_tmp7_ = icon_widget;
+	gtk_tool_button_set_icon_widget ((GtkToolButton*) self, (GtkWidget*) _tmp7_);
+	_g_object_unref0 (icon_widget);
+	_g_free0 (label);
+}
+
+
+static void prop_toggle_tool_button_class_init (PropToggleToolButtonClass * klass) {
+	prop_toggle_tool_button_parent_class = g_type_class_peek_parent (klass);
+	g_type_class_add_private (klass, sizeof (PropToggleToolButtonPrivate));
+	GTK_TOGGLE_TOOL_BUTTON_CLASS (klass)->toggled = prop_toggle_tool_button_real_toggled;
+	G_OBJECT_CLASS (klass)->finalize = prop_toggle_tool_button_finalize;
+}
+
+
+static void prop_toggle_tool_button_iprop_tool_item_interface_init (IPropToolItemIface * iface) {
+	prop_toggle_tool_button_iprop_tool_item_parent_iface = g_type_interface_peek_parent (iface);
+	iface->update_property = (void (*)(IPropToolItem*, IBusProperty*)) prop_toggle_tool_button_real_update_property;
+}
+
+
+static void prop_toggle_tool_button_instance_init (PropToggleToolButton * self) {
+	self->priv = PROP_TOGGLE_TOOL_BUTTON_GET_PRIVATE (self);
+	self->priv->m_prop = NULL;
+}
+
+
+static void prop_toggle_tool_button_finalize (GObject* obj) {
+	PropToggleToolButton * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROP_TOGGLE_TOOL_BUTTON, PropToggleToolButton);
+	_g_object_unref0 (self->priv->m_prop);
+	G_OBJECT_CLASS (prop_toggle_tool_button_parent_class)->finalize (obj);
+}
+
+
+GType prop_toggle_tool_button_get_type (void) {
+	static volatile gsize prop_toggle_tool_button_type_id__volatile = 0;
+	if (g_once_init_enter (&prop_toggle_tool_button_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PropToggleToolButtonClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prop_toggle_tool_button_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PropToggleToolButton), 0, (GInstanceInitFunc) prop_toggle_tool_button_instance_init, NULL };
+		static const GInterfaceInfo iprop_tool_item_info = { (GInterfaceInitFunc) prop_toggle_tool_button_iprop_tool_item_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType prop_toggle_tool_button_type_id;
+		prop_toggle_tool_button_type_id = g_type_register_static (GTK_TYPE_TOGGLE_TOOL_BUTTON, "PropToggleToolButton", &g_define_type_info, 0);
+		g_type_add_interface_static (prop_toggle_tool_button_type_id, TYPE_IPROP_TOOL_ITEM, &iprop_tool_item_info);
+		g_once_init_leave (&prop_toggle_tool_button_type_id__volatile, prop_toggle_tool_button_type_id);
+	}
+	return prop_toggle_tool_button_type_id__volatile;
+}
+
+
+static void __lambda19_ (PropMenuToolButton* self, GtkMenuShell* m) {
+	g_return_if_fail (m != NULL);
+	gtk_toggle_tool_button_set_active ((GtkToggleToolButton*) self, FALSE);
+}
+
+
+static void ___lambda19__gtk_menu_shell_deactivate (GtkMenuShell* _sender, gpointer self) {
+	__lambda19_ (self, _sender);
+}
+
+
+static void __lambda20_ (PropMenuToolButton* self, IPropToolItem* w, const gchar* k, gint s) {
+	const gchar* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	g_return_if_fail (w != NULL);
+	g_return_if_fail (k != NULL);
+	_tmp0_ = k;
+	_tmp1_ = s;
+	g_signal_emit_by_name ((IPropToolItem*) self, "property-activate", _tmp0_, _tmp1_);
+}
+
+
+static void ___lambda20__iprop_tool_item_property_activate (IPropToolItem* _sender, const gchar* key, gint state, gpointer self) {
+	__lambda20_ (self, _sender, key, state);
+}
+
+
+PropMenuToolButton* prop_menu_tool_button_construct (GType object_type, IBusProperty* prop) {
+	PropMenuToolButton * self = NULL;
+	IBusProperty* _tmp0_ = NULL;
+	PropMenu* _tmp1_ = NULL;
+	PropMenu* _tmp2_ = NULL;
+	PropMenu* _tmp3_ = NULL;
+	IBusProperty* _tmp4_ = NULL;
+	g_return_val_if_fail (prop != NULL, NULL);
+	self = (PropMenuToolButton*) g_object_new (object_type, NULL);
+	_tmp0_ = prop;
+	_tmp1_ = prop_menu_new (_tmp0_);
+	g_object_ref_sink (_tmp1_);
+	_g_object_unref0 (self->priv->m_menu);
+	self->priv->m_menu = _tmp1_;
+	_tmp2_ = self->priv->m_menu;
+	g_signal_connect_object ((GtkMenuShell*) _tmp2_, "deactivate", (GCallback) ___lambda19__gtk_menu_shell_deactivate, self, 0);
+	_tmp3_ = self->priv->m_menu;
+	g_signal_connect_object ((IPropToolItem*) _tmp3_, "property-activate", (GCallback) ___lambda20__iprop_tool_item_property_activate, self, 0);
+	_tmp4_ = prop;
+	prop_toggle_tool_button_set_property (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROP_TOGGLE_TOOL_BUTTON, PropToggleToolButton), _tmp4_);
+	return self;
+}
+
+
+PropMenuToolButton* prop_menu_tool_button_new (IBusProperty* prop) {
+	return prop_menu_tool_button_construct (TYPE_PROP_MENU_TOOL_BUTTON, prop);
+}
+
+
+static void prop_menu_tool_button_real_update_property (IPropToolItem* base, IBusProperty* prop) {
+	PropMenuToolButton * self;
+	IBusProperty* _tmp0_ = NULL;
+	PropMenu* _tmp1_ = NULL;
+	IBusProperty* _tmp2_ = NULL;
+	self = (PropMenuToolButton*) base;
+	g_return_if_fail (prop != NULL);
+	_tmp0_ = prop;
+	prop_menu_tool_button_iprop_tool_item_parent_iface->update_property ((IPropToolItem*) G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROP_TOGGLE_TOOL_BUTTON, PropToggleToolButton), _tmp0_);
+	_tmp1_ = self->priv->m_menu;
+	_tmp2_ = prop;
+	iprop_tool_item_update_property ((IPropToolItem*) _tmp1_, _tmp2_);
+}
+
+
+static void prop_menu_tool_button_real_toggled (GtkToggleToolButton* base) {
+	PropMenuToolButton * self;
+	gboolean _tmp0_ = FALSE;
+	self = (PropMenuToolButton*) base;
+	_tmp0_ = gtk_toggle_tool_button_get_active ((GtkToggleToolButton*) self);
+	if (_tmp0_) {
+		PropMenu* _tmp1_ = NULL;
+		guint32 _tmp2_ = 0U;
+		_tmp1_ = self->priv->m_menu;
+		_tmp2_ = gtk_get_current_event_time ();
+		prop_menu_popup (_tmp1_, (guint) 0, _tmp2_, (GtkWidget*) self);
+	}
+}
+
+
+static void prop_menu_tool_button_real_destroy (GtkWidget* base) {
+	PropMenuToolButton * self;
+	self = (PropMenuToolButton*) base;
+	_g_object_unref0 (self->priv->m_menu);
+	self->priv->m_menu = NULL;
+	GTK_WIDGET_CLASS (prop_menu_tool_button_parent_class)->destroy ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROP_TOGGLE_TOOL_BUTTON, PropToggleToolButton));
+}
+
+
+static void prop_menu_tool_button_class_init (PropMenuToolButtonClass * klass) {
+	prop_menu_tool_button_parent_class = g_type_class_peek_parent (klass);
+	g_type_class_add_private (klass, sizeof (PropMenuToolButtonPrivate));
+	GTK_TOGGLE_TOOL_BUTTON_CLASS (klass)->toggled = prop_menu_tool_button_real_toggled;
+	GTK_WIDGET_CLASS (klass)->destroy = prop_menu_tool_button_real_destroy;
+	G_OBJECT_CLASS (klass)->finalize = prop_menu_tool_button_finalize;
+}
+
+
+static void prop_menu_tool_button_iprop_tool_item_interface_init (IPropToolItemIface * iface) {
+	prop_menu_tool_button_iprop_tool_item_parent_iface = g_type_interface_peek_parent (iface);
+	iface->update_property = (void (*)(IPropToolItem*, IBusProperty*)) prop_menu_tool_button_real_update_property;
+}
+
+
+static void prop_menu_tool_button_instance_init (PropMenuToolButton * self) {
+	self->priv = PROP_MENU_TOOL_BUTTON_GET_PRIVATE (self);
+	self->priv->m_menu = NULL;
+}
+
+
+static void prop_menu_tool_button_finalize (GObject* obj) {
+	PropMenuToolButton * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROP_MENU_TOOL_BUTTON, PropMenuToolButton);
+	_g_object_unref0 (self->priv->m_menu);
+	G_OBJECT_CLASS (prop_menu_tool_button_parent_class)->finalize (obj);
+}
+
+
+GType prop_menu_tool_button_get_type (void) {
+	static volatile gsize prop_menu_tool_button_type_id__volatile = 0;
+	if (g_once_init_enter (&prop_menu_tool_button_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PropMenuToolButtonClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prop_menu_tool_button_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PropMenuToolButton), 0, (GInstanceInitFunc) prop_menu_tool_button_instance_init, NULL };
+		static const GInterfaceInfo iprop_tool_item_info = { (GInterfaceInitFunc) prop_menu_tool_button_iprop_tool_item_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType prop_menu_tool_button_type_id;
+		prop_menu_tool_button_type_id = g_type_register_static (TYPE_PROP_TOGGLE_TOOL_BUTTON, "PropMenuToolButton", &g_define_type_info, 0);
+		g_type_add_interface_static (prop_menu_tool_button_type_id, TYPE_IPROP_TOOL_ITEM, &iprop_tool_item_info);
+		g_once_init_leave (&prop_menu_tool_button_type_id__volatile, prop_menu_tool_button_type_id);
+	}
+	return prop_menu_tool_button_type_id__volatile;
+}
+
+
+PropSeparatorToolItem* prop_separator_tool_item_construct (GType object_type, IBusProperty* prop) {
+	PropSeparatorToolItem * self = NULL;
+	g_return_val_if_fail (prop != NULL, NULL);
+	self = (PropSeparatorToolItem*) g_object_new (object_type, NULL);
+	gtk_tool_item_set_homogeneous ((GtkToolItem*) self, FALSE);
+	return self;
+}
+
+
+PropSeparatorToolItem* prop_separator_tool_item_new (IBusProperty* prop) {
+	return prop_separator_tool_item_construct (TYPE_PROP_SEPARATOR_TOOL_ITEM, prop);
+}
+
+
+static void prop_separator_tool_item_real_update_property (IPropToolItem* base, IBusProperty* prop) {
+	PropSeparatorToolItem * self;
+	self = (PropSeparatorToolItem*) base;
+	g_return_if_fail (prop != NULL);
+}
+
+
+static void prop_separator_tool_item_class_init (PropSeparatorToolItemClass * klass) {
+	prop_separator_tool_item_parent_class = g_type_class_peek_parent (klass);
+}
+
+
+static void prop_separator_tool_item_iprop_tool_item_interface_init (IPropToolItemIface * iface) {
+	prop_separator_tool_item_iprop_tool_item_parent_iface = g_type_interface_peek_parent (iface);
+	iface->update_property = (void (*)(IPropToolItem*, IBusProperty*)) prop_separator_tool_item_real_update_property;
+}
+
+
+static void prop_separator_tool_item_instance_init (PropSeparatorToolItem * self) {
+}
+
+
+GType prop_separator_tool_item_get_type (void) {
+	static volatile gsize prop_separator_tool_item_type_id__volatile = 0;
+	if (g_once_init_enter (&prop_separator_tool_item_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PropSeparatorToolItemClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prop_separator_tool_item_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PropSeparatorToolItem), 0, (GInstanceInitFunc) prop_separator_tool_item_instance_init, NULL };
+		static const GInterfaceInfo iprop_tool_item_info = { (GInterfaceInitFunc) prop_separator_tool_item_iprop_tool_item_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType prop_separator_tool_item_type_id;
+		prop_separator_tool_item_type_id = g_type_register_static (GTK_TYPE_SEPARATOR_TOOL_ITEM, "PropSeparatorToolItem", &g_define_type_info, 0);
+		g_type_add_interface_static (prop_separator_tool_item_type_id, TYPE_IPROP_TOOL_ITEM, &iprop_tool_item_info);
+		g_once_init_leave (&prop_separator_tool_item_type_id__volatile, prop_separator_tool_item_type_id);
+	}
+	return prop_separator_tool_item_type_id__volatile;
+}
+
+
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
+	}
+}
+
+
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
+
diff -Nru ibus-1.5.4/ui/gtk3/propertypanel.vala ibus-1.5.5/ui/gtk3/propertypanel.vala
--- ibus-1.5.4/ui/gtk3/propertypanel.vala	1970-01-01 09:00:00.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/propertypanel.vala	2014-01-14 12:59:14.000000000 +0900
@@ -0,0 +1,627 @@
+/* vim:set et sts=4 sw=4:
+ *
+ * ibus - The Input Bus
+ *
+ * Copyright(c) 2013 Red Hat, Inc.
+ * Copyright(c) 2013 Peng Huang 
+ * Copyright(c) 2013 Takao Fujiwara 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+enum PanelShow {
+    DO_NOT_SHOW,
+    AUTO_HIDE,
+    ALWAYS
+}
+
+public class PropertyPanel : Gtk.Box {
+    private Gtk.Window m_toplevel;
+    private IBus.PropList m_props;
+    private IPropToolItem[] m_items;
+    private Gdk.Rectangle m_cursor_location = Gdk.Rectangle(){
+            x = -1, y = -1, width = 0, height = 0 };
+    private int m_show = PanelShow.AUTO_HIDE;
+    private uint m_auto_hide_timeout = 10000;
+    private uint m_auto_hide_timeout_id = 0;
+
+    public PropertyPanel() {
+        /* Chain up base class constructor */
+        GLib.Object(orientation: Gtk.Orientation.HORIZONTAL,
+                    spacing: 0);
+
+        set_visible(true);
+
+        m_toplevel = new Gtk.Window(Gtk.WindowType.POPUP);
+        m_toplevel.add_events(Gdk.EventMask.BUTTON_PRESS_MASK);
+
+        Handle handle = new Handle();
+        handle.set_visible(true);
+        pack_start(handle, false, false, 0);
+
+        m_toplevel.add(this);
+    }
+
+    public void set_properties(IBus.PropList props) {
+        foreach (var item in m_items)
+            (item as Gtk.Widget).destroy();
+        m_items = {};
+
+        m_props = props;
+
+        create_menu_items();
+    }
+
+    public void update_property(IBus.Property prop) {
+        GLib.assert(prop != null);
+
+        debug("update_property(prop.key = %s)\n", prop.get_key());
+
+        if (m_props != null)
+            m_props.update_property(prop);
+
+        /* Need to update GUI since panel buttons are not redrawn. */
+        foreach (var item in m_items)
+            item.update_property(prop);
+
+        show_with_auto_hide_timer();
+    }
+
+    public void set_cursor_location(int x, int y, int width, int height) {
+        /* FIXME: set_cursor_location() has a different behavior
+         * in embedded preedit by applications.
+         * GtkTextView applications, e.g. gedit, always call
+         * set_cursor_location() with and without preedit
+         * but VTE applications, e.g. gnome-terminal, and xterm
+         * do not call set_cursor_location() with preedit.
+         * firefox and thunderbird do not call set_cursor_location()
+         * without preedit.
+         * This may treat GtkIMContext and XIM with different ways.
+         * Maybe get_preedit_string() class method.
+         */
+
+        /* FIXME: When the cursor is at the bottom of the screen,
+         * gedit returns the right cursor position but terminal applications
+         * such as gnome-terminal, xfce4-terminal and etc, the position is
+         * not accurate and the cursor and panel could be overlapped slightly.
+         * Maybe it's a bug in vte.
+         */
+        Gdk.Rectangle location = Gdk.Rectangle(){
+            x = x, y = y, width = width, height = height };
+
+        if (m_cursor_location == location)
+            return;
+
+        debug("set_cursor_location(x = %d, y = %d, width = %d, height = %d)\n",
+              x, y, width, height);
+
+        /* Hide the panel in AUTO_HIDE mode when the cursor position is
+         * chagned on the same input context by typing keyboard or
+         * clicking mouse. (But not focus change or property change)
+         */
+        if (m_show == PanelShow.AUTO_HIDE)
+            if (m_cursor_location.x != -1 || m_cursor_location.y != -1) {
+                m_cursor_location = location;
+                hide_if_necessary();
+                adjust_window_position();
+                return;
+            }
+
+        m_cursor_location = location;
+        adjust_window_position();
+        show_with_auto_hide_timer();
+    }
+
+    public void set_preedit_text(IBus.Text? text, uint cursor) {
+        if (text == null && cursor == 0)
+            return;
+
+        debug("set_preedit_text(text, cursor = %u)\n", cursor);
+
+        /* Hide the panel in AUTO_HIDE mode when embed-preedit-text value
+         * is disabled and the preedit is changed on the same input context.
+         */
+        hide_if_necessary();
+    }
+
+    public void set_auxiliary_text(IBus.Text? text) {
+        if (text == null)
+            return;
+
+        debug("set_auxiliary_text(text)\n");
+
+        hide_if_necessary();
+    }
+
+    public void set_lookup_table(IBus.LookupTable? table) {
+        if (table == null)
+            return;
+
+        debug("set_lookup_table(table)\n");
+
+        hide_if_necessary();
+    }
+
+    public new void show() {
+        if (m_show == PanelShow.DO_NOT_SHOW || m_items.length == 0) {
+            m_toplevel.hide();
+            return;
+        }
+        else if (m_show == PanelShow.ALWAYS) {
+            m_toplevel.show_all();
+            return;
+        }
+
+        /* Do not change the state here if m_show == AUTO_HIDE. */
+    }
+
+    public new void hide() {
+        m_toplevel.hide();
+    }
+
+    public void focus_in() {
+        debug("focus_in()\n");
+
+        /* Reset m_auto_hide_timeout_id in previous focus-in */
+        hide_if_necessary();
+
+        /* Invalidate m_cursor_location before set_cursor_location()
+         * is called because the position can be same even if the input
+         * focus is changed.
+         * E.g. Two tabs on gnome-terminal can keep the cursor position.
+         */
+        m_cursor_location = { -1, -1, 0, 0 };
+
+       /* set_cursor_location() will be called later. */
+    }
+
+    public void set_show(int _show) {
+        m_show = _show;
+        show();
+    }
+
+    public void set_auto_hide_timeout(uint timeout) {
+        m_auto_hide_timeout = timeout;
+    }
+
+    public override void get_preferred_width(out int minimum_width,
+                                             out int natural_width) {
+        base.get_preferred_width(out minimum_width, out natural_width);
+        m_toplevel.resize(1, 1);
+    }
+
+    public override void get_preferred_height(out int minimum_width,
+                                              out int natural_width) {
+        base.get_preferred_height(out minimum_width, out natural_width);
+        m_toplevel.resize(1, 1);
+    }
+
+    private void create_menu_items() {
+        int i = 0;
+        while (true) {
+            IBus.Property prop = m_props.get(i);
+            if (prop == null)
+                break;
+
+            i++;
+            IPropToolItem item = null;
+            switch(prop.get_prop_type()) {
+                case IBus.PropType.NORMAL:
+                    item = new PropToolButton(prop);
+                    break;
+                case IBus.PropType.TOGGLE:
+                    item = new PropToggleToolButton(prop);
+                    break;
+                case IBus.PropType.MENU:
+                    item = new PropMenuToolButton(prop);
+                    break;
+                case IBus.PropType.SEPARATOR:
+                    item = new PropSeparatorToolItem(prop);
+                    break;
+                default:
+                    warning("unknown property type %d",
+                            (int) prop.get_prop_type());
+                    break;
+            }
+            if (item != null) {
+                pack_start(item as Gtk.Widget, false, false, 0);
+                m_items += item;
+                item.property_activate.connect((w, k, s) =>
+                                               property_activate(k, s));
+            }
+        }
+    }
+
+    private void move(int x, int y) {
+        m_toplevel.move(x, y);
+    }
+
+    private void adjust_window_position() {
+        Gdk.Point cursor_right_bottom = {
+                m_cursor_location.x + m_cursor_location.width,
+                m_cursor_location.y + m_cursor_location.height
+        };
+
+        Gtk.Allocation allocation;
+        m_toplevel.get_allocation(out allocation);
+        Gdk.Point window_right_bottom = {
+            cursor_right_bottom.x + allocation.width,
+            cursor_right_bottom.y + allocation.height
+        };
+
+        Gdk.Window root = Gdk.get_default_root_window();
+        int root_width = root.get_width();
+        int root_height = root.get_height();
+
+        int x, y;
+        if (window_right_bottom.x > root_width)
+            x = root_width - allocation.width;
+        else
+            x = cursor_right_bottom.x;
+
+        if (window_right_bottom.y > root_height)
+            y = m_cursor_location.y - allocation.height;
+        else
+            y = cursor_right_bottom.y;
+
+        move(x, y);
+    }
+
+    private void show_with_auto_hide_timer() {
+        if (m_show != PanelShow.AUTO_HIDE || m_items.length == 0)
+            return;
+
+        if (m_auto_hide_timeout_id != 0)
+            GLib.Source.remove(m_auto_hide_timeout_id);
+
+        m_toplevel.show_all();
+
+        /* Change the priority because IME typing sometimes freezes. */
+        m_auto_hide_timeout_id = GLib.Timeout.add(m_auto_hide_timeout, () => {
+            m_toplevel.hide();
+            m_auto_hide_timeout_id = 0;
+            return false;
+        },
+        GLib.Priority.DEFAULT_IDLE);
+    }
+
+    private void hide_if_necessary() {
+        if (m_show == PanelShow.AUTO_HIDE && m_auto_hide_timeout_id != 0) {
+            GLib.Source.remove(m_auto_hide_timeout_id);
+            m_auto_hide_timeout_id = 0;
+            m_toplevel.hide();
+        }
+    }
+
+    public signal void property_activate(string key, int state);
+}
+
+public interface IPropToolItem : GLib.Object {
+    public abstract void update_property(IBus.Property prop);
+    public signal void property_activate(string key, int state);
+}
+
+public class PropMenu : Gtk.Menu, IPropToolItem {
+    private Gtk.Widget m_parent_button;
+    private IPropItem[] m_items;
+
+    public PropMenu(IBus.Property prop) {
+        /* Chain up base class constructor */
+        GLib.Object();
+
+        set_take_focus(false);
+        create_items(prop.get_sub_props());
+        show_all();
+        set_sensitive(prop.get_sensitive());
+    }
+
+    public void update_property(IBus.Property prop) {
+        foreach (var item in m_items)
+            item.update_property(prop);
+    }
+
+    public new void popup(uint       button,
+                          uint32     activate_time,
+                          Gtk.Widget widget) {
+        m_parent_button = widget;
+        base.popup(null, null, menu_position, button, activate_time);
+    }
+
+    public override void destroy() {
+        m_parent_button = null;
+        m_items = {};
+        base.destroy();
+    }
+
+    private void create_items(IBus.PropList props) {
+        int i = 0;
+        PropRadioMenuItem last_radio = null;
+
+        while (true) {
+            IBus.Property prop = props.get(i);
+            if (prop == null)
+                break;
+
+            i++;
+            IPropItem item = null;
+            switch(prop.get_prop_type()) {
+                case IBus.PropType.NORMAL:
+                    item = new PropImageMenuItem(prop);
+                    break;
+                case IBus.PropType.TOGGLE:
+                    item = new PropCheckMenuItem(prop);
+                    break;
+                case IBus.PropType.RADIO:
+                    last_radio = new PropRadioMenuItem(prop, last_radio);
+                    item = last_radio;
+                    break;
+                case IBus.PropType.MENU:
+                    {
+                        var menuitem = new PropImageMenuItem(prop);
+                        menuitem.set_submenu(new PropMenu(prop));
+                        item = menuitem;
+                    }
+                    break;
+                case IBus.PropType.SEPARATOR:
+                    item = new PropSeparatorMenuItem(prop);
+                    break;
+                default:
+                    warning("Unknown property type: %d",
+                            (int) prop.get_prop_type());
+                    break;
+            }
+            if (prop.get_prop_type() != IBus.PropType.RADIO)
+                last_radio = null;
+            if (item != null) {
+                append(item as Gtk.MenuItem);
+                item.property_activate.connect((w, k, s) =>
+                                               property_activate(k, s));
+                m_items += item;
+            }
+        }
+    }
+
+    private void menu_position(Gtk.Menu menu,
+                               out int  x,
+                               out int  y,
+                               out bool push_in) {
+        var button = m_parent_button;
+        var screen = button.get_screen();
+        var monitor = screen.get_monitor_at_window(button.get_window());
+
+        Gdk.Rectangle monitor_location;
+        screen.get_monitor_geometry(monitor, out monitor_location);
+
+        button.get_window().get_origin(out x, out y);
+
+        Gtk.Allocation button_allocation;
+        button.get_allocation(out button_allocation);
+
+        x += button_allocation.x;
+        y += button_allocation.y;
+
+        int menu_width;
+        int menu_height;
+        menu.get_size_request(out menu_width, out menu_height);
+
+        if (x + menu_width >= monitor_location.width)
+            x -= menu_width - button_allocation.width;
+        else if (x - menu_width <= 0)
+            ;
+        else {
+            if (x <= monitor_location.width * 3 / 4)
+                ;
+            else
+                x -= menu_width - button_allocation.width;
+        }
+
+        if (y + button_allocation.height + menu_width
+                >= monitor_location.height)
+            y -= menu_height;
+        else if (y - menu_height <= 0)
+            y += button_allocation.height;
+        else {
+            if (y <= monitor_location.height * 3 / 4)
+                y += button_allocation.height;
+            else
+                y -= menu_height;
+        }
+
+        push_in = false;
+    }
+}
+
+public class PropToolButton : Gtk.ToolButton, IPropToolItem {
+    private IBus.Property m_prop = null;
+
+    public PropToolButton(IBus.Property prop) {
+        string label = prop.get_symbol().get_text();
+
+        /* Chain up base class constructor */
+        GLib.Object(label: label);
+
+        m_prop = prop;
+
+        set_homogeneous(false);
+        sync();
+    }
+
+    public void update_property(IBus.Property prop) {
+        if (m_prop.get_key() != prop.get_key())
+            return;
+        m_prop.set_symbol(prop.get_symbol());
+        m_prop.set_tooltip(prop.get_tooltip());
+        m_prop.set_sensitive(prop.get_sensitive());
+        m_prop.set_icon(prop.get_icon());
+        m_prop.set_state(prop.get_state());
+        m_prop.set_visible(prop.get_visible());
+        sync();
+    }
+
+    private void sync() {
+        set_label(m_prop.get_symbol().get_text());
+        set_tooltip_text(m_prop.get_tooltip().get_text());
+        set_sensitive(m_prop.get_sensitive());
+        set_icon_name(m_prop.get_icon());
+
+        if (m_prop.get_visible())
+            show();
+        else
+            hide();
+    }
+
+    public override void clicked() {
+        property_activate(m_prop.get_key(), m_prop.get_state());
+    }
+
+    public new void set_icon_name(string icon_name) {
+        string label = m_prop.get_symbol().get_text();
+        IconWidget icon_widget = null;
+
+        if (label == "") {
+            label = null;
+            icon_widget = new IconWidget(icon_name, Gtk.IconSize.BUTTON);
+            set_is_important(false);
+        } else {
+            set_is_important(true);
+        }
+
+        set_icon_widget(icon_widget);
+    }
+}
+
+public class PropToggleToolButton : Gtk.ToggleToolButton, IPropToolItem {
+    private IBus.Property m_prop = null;
+
+    public PropToggleToolButton(IBus.Property prop) {
+        /* Chain up base class constructor */
+        GLib.Object();
+
+        m_prop = prop;
+
+        set_homogeneous(false);
+        sync();
+    }
+
+    public new void set_property(IBus.Property prop) {
+        m_prop = prop;
+        sync();
+    }
+
+    public void update_property(IBus.Property prop) {
+        if (m_prop.get_key() != prop.get_key())
+            return;
+        m_prop.set_symbol(prop.get_symbol());
+        m_prop.set_tooltip(prop.get_tooltip());
+        m_prop.set_sensitive(prop.get_sensitive());
+        m_prop.set_icon(prop.get_icon());
+        m_prop.set_state(prop.get_state());
+        m_prop.set_visible(prop.get_visible());
+        sync();
+    }
+
+    private void sync() {
+        set_label(m_prop.get_symbol().get_text());
+        set_tooltip_text(m_prop.get_tooltip().get_text());
+        set_sensitive(m_prop.get_sensitive());
+        set_icon_name(m_prop.get_icon());
+        set_active(m_prop.get_state() == IBus.PropState.CHECKED);
+
+        if (m_prop.get_visible())
+            show();
+        else
+            hide();
+    }
+
+    public override void toggled() {
+        /* Do not send property-activate to engine in case the event is
+         * sent from engine. */
+
+        bool do_emit = false;
+
+        if (get_active()) {
+            if (m_prop.get_state() != IBus.PropState.CHECKED)
+                do_emit = true;
+            m_prop.set_state(IBus.PropState.CHECKED);
+        } else {
+            if (m_prop.get_state() != IBus.PropState.UNCHECKED)
+                do_emit = true;
+            m_prop.set_state(IBus.PropState.UNCHECKED);
+        }
+
+        if (do_emit)
+            property_activate(m_prop.get_key(), m_prop.get_state());
+    }
+
+    public new void set_icon_name(string icon_name) {
+        string label = m_prop.get_symbol().get_text();
+        IconWidget icon_widget = null;
+
+        if (label == "") {
+            label = null;
+            icon_widget = new IconWidget(icon_name, Gtk.IconSize.BUTTON);
+            set_is_important(false);
+        } else {
+            set_is_important(true);
+        }
+
+        set_icon_widget(icon_widget);
+    }
+}
+
+public class PropMenuToolButton : PropToggleToolButton, IPropToolItem {
+    private PropMenu m_menu = null;
+
+    public PropMenuToolButton(IBus.Property prop) {
+        /* Chain up base class constructor */
+        GLib.Object();
+
+        m_menu = new PropMenu(prop);
+        m_menu.deactivate.connect((m) =>
+                                  set_active(false));
+        m_menu.property_activate.connect((w, k, s) =>
+                                         property_activate(k, s));
+
+        base.set_property(prop);
+    }
+
+    public new void update_property(IBus.Property prop) {
+        base.update_property(prop);
+        m_menu.update_property(prop);
+    }
+
+    public override void toggled() {
+        if (get_active())
+            m_menu.popup(0, Gtk.get_current_event_time(), this);
+    }
+
+    public override void destroy() {
+        m_menu = null;
+        base.destroy();
+    }
+}
+
+public class PropSeparatorToolItem : Gtk.SeparatorToolItem, IPropToolItem {
+    public PropSeparatorToolItem(IBus.Property prop) {
+        /* Chain up base class constructor */
+        GLib.Object();
+
+        set_homogeneous(false);
+    }
+
+    public void update_property(IBus.Property prop) {
+    }
+}
diff -Nru ibus-1.5.4/ui/gtk3/separator.c ibus-1.5.5/ui/gtk3/separator.c
--- ibus-1.5.4/ui/gtk3/separator.c	2013-09-20 12:21:59.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/separator.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,4 +1,4 @@
-/* separator.c generated by valac 0.20.1, the Vala compiler
+/* separator.c generated by valac 0.22.0, the Vala compiler
  * generated from separator.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
diff -Nru ibus-1.5.4/ui/gtk3/switcher.c ibus-1.5.5/ui/gtk3/switcher.c
--- ibus-1.5.4/ui/gtk3/switcher.c	2013-09-20 12:21:59.000000000 +0900
+++ ibus-1.5.5/ui/gtk3/switcher.c	2014-01-14 13:03:40.000000000 +0900
@@ -1,4 +1,4 @@
-/* switcher.c generated by valac 0.20.1, the Vala compiler
+/* switcher.c generated by valac 0.22.0, the Vala compiler
  * generated from switcher.vala, do not modify */
 
 /* vim:set et sts=4 sw=4:
@@ -144,20 +144,20 @@
 #define KEYBINDING_MANAGER_MODIFIER_FILTER ((guint) (GDK_MODIFIER_MASK & (~(((((((((GDK_LOCK_MASK | GDK_MOD2_MASK) | GDK_BUTTON1_MASK) | GDK_BUTTON2_MASK) | GDK_BUTTON3_MASK) | GDK_BUTTON4_MASK) | GDK_BUTTON5_MASK) | GDK_SUPER_MASK) | GDK_HYPER_MASK) | GDK_META_MASK))))
 static void switcher_update_engines (Switcher* self, IBusEngineDesc** engines, int engines_length1);
 static const gchar* switcher_ibus_engine_button_get_longname (SwitcherIBusEngineButton* self);
-static gboolean ___lambda15_ (Switcher* self);
+static gboolean ___lambda16_ (Switcher* self);
 static void switcher_restore_window_position (Switcher* self, const gchar* debug_str);
-static gboolean ____lambda15__gsource_func (gpointer self);
+static gboolean ____lambda16__gsource_func (gpointer self);
 static IBusEngineDesc** _vala_array_dup5 (IBusEngineDesc** self, int length);
 static Block5Data* block5_data_ref (Block5Data* _data5_);
 static void block5_data_unref (void * _userdata_);
 static SwitcherIBusEngineButton* switcher_ibus_engine_button_new (IBusEngineDesc* engine);
 static SwitcherIBusEngineButton* switcher_ibus_engine_button_construct (GType object_type, IBusEngineDesc* engine);
-static gboolean _____lambda13_ (Block5Data* _data5_, GdkEventCrossing* e);
-static gboolean ______lambda13__gtk_widget_enter_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self);
-static gboolean _____lambda14_ (Block5Data* _data5_, GdkEventButton* e);
-static gboolean ______lambda14__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static gboolean _____lambda14_ (Block5Data* _data5_, GdkEventCrossing* e);
+static gboolean ______lambda14__gtk_widget_enter_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self);
+static gboolean _____lambda15_ (Block5Data* _data5_, GdkEventButton* e);
+static gboolean ______lambda15__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
 static void switcher_ibus_engine_button_set_longname (SwitcherIBusEngineButton* self, const gchar* value);
-static void _vala_array_add25 (SwitcherIBusEngineButton*** array, int* length, int* size, SwitcherIBusEngineButton* value);
+static void _vala_array_add27 (SwitcherIBusEngineButton*** array, int* length, int* size, SwitcherIBusEngineButton* value);
 static void switcher_next_engine (Switcher* self);
 static void switcher_previous_engine (Switcher* self);
 static void switcher_real_show (GtkWidget* base);
@@ -170,9 +170,9 @@
 	SWITCHER_IBUS_ENGINE_BUTTON_DUMMY_PROPERTY,
 	SWITCHER_IBUS_ENGINE_BUTTON_LONGNAME
 };
+GType icon_widget_get_type (void) G_GNUC_CONST;
 IconWidget* icon_widget_new (const gchar* icon_name_or_path, GtkIconSize size);
 IconWidget* icon_widget_construct (GType object_type, const gchar* icon_name_or_path, GtkIconSize size);
-GType icon_widget_get_type (void) G_GNUC_CONST;
 static gboolean switcher_ibus_engine_button_real_draw (GtkWidget* base, cairo_t* cr);
 static void switcher_ibus_engine_button_finalize (GObject* obj);
 static void _vala_switcher_ibus_engine_button_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
@@ -189,19 +189,19 @@
 
 Switcher* switcher_construct (GType object_type) {
 	Switcher * self = NULL;
-	GtkBox* _tmp0_;
-	GtkBox* vbox;
-	GtkAlignment* _tmp1_;
-	GtkAlignment* align;
-	GtkBox* _tmp2_;
-	GtkBox* _tmp3_;
-	GtkLabel* _tmp4_;
-	GtkLabel* _tmp5_;
+	GtkBox* vbox = NULL;
+	GtkBox* _tmp0_ = NULL;
+	GtkAlignment* align = NULL;
+	GtkAlignment* _tmp1_ = NULL;
+	GtkBox* _tmp2_ = NULL;
+	GtkBox* _tmp3_ = NULL;
+	GtkLabel* _tmp4_ = NULL;
+	AtkObject* obj = NULL;
+	GtkLabel* _tmp5_ = NULL;
 	AtkObject* _tmp6_ = NULL;
-	AtkObject* _tmp7_;
-	AtkObject* obj;
-	GtkLabel* _tmp8_;
-	GtkLabel* _tmp9_;
+	AtkObject* _tmp7_ = NULL;
+	GtkLabel* _tmp8_ = NULL;
+	GtkLabel* _tmp9_ = NULL;
 	self = (Switcher*) g_object_new (object_type, "type", GTK_WINDOW_POPUP, "events", GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, "window-position", GTK_WIN_POS_CENTER, "accept-focus", TRUE, "decorated", FALSE, "modal", TRUE, "focus-visible", TRUE, NULL);
 	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	g_object_ref_sink (_tmp0_);
@@ -243,7 +243,7 @@
 }
 
 
-static gboolean ___lambda15_ (Switcher* self) {
+static gboolean ___lambda16_ (Switcher* self) {
 	gboolean result = FALSE;
 	switcher_restore_window_position (self, "timeout");
 	result = FALSE;
@@ -251,62 +251,62 @@
 }
 
 
-static gboolean ____lambda15__gsource_func (gpointer self) {
+static gboolean ____lambda16__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda15_ (self);
+	result = ___lambda16_ (self);
 	return result;
 }
 
 
 gint switcher_run (Switcher* self, guint keyval, guint state, GdkEvent* event, IBusEngineDesc** engines, int engines_length1, gint index) {
 	gint result = 0;
-	GMainLoop* _tmp0_;
-	gint _tmp1_;
-	IBusEngineDesc** _tmp2_;
-	gint _tmp2__length1;
-	guint _tmp3_;
-	guint _tmp4_;
-	guint _tmp5_;
+	GMainLoop* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	IBusEngineDesc** _tmp2_ = NULL;
+	gint _tmp2__length1 = 0;
+	guint _tmp3_ = 0U;
+	guint _tmp4_ = 0U;
+	guint _tmp5_ = 0U;
 	GdkModifierType _tmp6_ = 0;
-	IBusEngineDesc** _tmp7_;
-	gint _tmp7__length1;
-	gint _tmp8_;
-	GtkLabel* _tmp9_;
-	SwitcherIBusEngineButton** _tmp10_;
-	gint _tmp10__length1;
-	gint _tmp11_;
-	SwitcherIBusEngineButton* _tmp12_;
-	const gchar* _tmp13_;
-	const gchar* _tmp14_;
-	SwitcherIBusEngineButton** _tmp15_;
-	gint _tmp15__length1;
-	gint _tmp16_;
-	SwitcherIBusEngineButton* _tmp17_;
-	GdkEvent* _tmp18_;
+	IBusEngineDesc** _tmp7_ = NULL;
+	gint _tmp7__length1 = 0;
+	gint _tmp8_ = 0;
+	GtkLabel* _tmp9_ = NULL;
+	SwitcherIBusEngineButton** _tmp10_ = NULL;
+	gint _tmp10__length1 = 0;
+	gint _tmp11_ = 0;
+	SwitcherIBusEngineButton* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	const gchar* _tmp14_ = NULL;
+	SwitcherIBusEngineButton** _tmp15_ = NULL;
+	gint _tmp15__length1 = 0;
+	gint _tmp16_ = 0;
+	SwitcherIBusEngineButton* _tmp17_ = NULL;
+	GdkDevice* device = NULL;
+	GdkEvent* _tmp18_ = NULL;
 	GdkDevice* _tmp19_ = NULL;
-	GdkDevice* _tmp20_;
-	GdkDevice* device;
-	GdkDevice* _tmp21_;
+	GdkDevice* _tmp20_ = NULL;
+	GdkDevice* _tmp21_ = NULL;
 	GdkDevice* keyboard = NULL;
 	GdkDevice* pointer = NULL;
-	GdkDevice* _tmp32_;
+	GdkDevice* _tmp32_ = NULL;
 	GdkInputSource _tmp33_ = 0;
-	guint _tmp44_;
-	guint _tmp47_;
+	guint _tmp44_ = 0U;
+	guint _tmp47_ = 0U;
 	GdkGrabStatus status = 0;
-	GdkDevice* _tmp50_;
+	GdkDevice* _tmp50_ = NULL;
 	GdkWindow* _tmp51_ = NULL;
 	GdkGrabStatus _tmp52_ = 0;
-	GdkGrabStatus _tmp53_;
-	GdkDevice* _tmp55_;
+	GdkGrabStatus _tmp53_ = 0;
+	GdkDevice* _tmp55_ = NULL;
 	GdkWindow* _tmp56_ = NULL;
 	GdkGrabStatus _tmp57_ = 0;
-	GdkGrabStatus _tmp58_;
-	GMainLoop* _tmp60_;
-	GMainLoop* _tmp61_;
-	GdkDevice* _tmp62_;
-	GdkDevice* _tmp63_;
-	gint _tmp65_;
+	GdkGrabStatus _tmp58_ = 0;
+	GMainLoop* _tmp60_ = NULL;
+	GMainLoop* _tmp61_ = NULL;
+	GdkDevice* _tmp62_ = NULL;
+	GdkDevice* _tmp63_ = NULL;
+	gint _tmp65_ = 0;
 	g_return_val_if_fail (self != NULL, 0);
 	g_return_val_if_fail (event != NULL, 0);
 	_tmp0_ = self->priv->m_loop;
@@ -347,18 +347,18 @@
 	device = _tmp20_;
 	_tmp21_ = device;
 	if (_tmp21_ == NULL) {
+		GdkDisplay* display = NULL;
 		GdkDisplay* _tmp22_ = NULL;
-		GdkDisplay* _tmp23_;
-		GdkDisplay* display;
-		GdkDisplay* _tmp24_;
+		GdkDisplay* _tmp23_ = NULL;
+		GdkDeviceManager* device_manager = NULL;
+		GdkDisplay* _tmp24_ = NULL;
 		GdkDeviceManager* _tmp25_ = NULL;
-		GdkDeviceManager* _tmp26_;
-		GdkDeviceManager* device_manager;
-		GdkDeviceManager* _tmp27_;
+		GdkDeviceManager* _tmp26_ = NULL;
+		GdkDeviceManager* _tmp27_ = NULL;
 		GList* _tmp28_ = NULL;
-		GList* _tmp29_;
-		gconstpointer _tmp30_;
-		GdkDevice* _tmp31_;
+		GList* _tmp29_ = NULL;
+		gconstpointer _tmp30_ = NULL;
+		GdkDevice* _tmp31_ = NULL;
 		_tmp22_ = gtk_widget_get_display ((GtkWidget*) self);
 		_tmp23_ = _g_object_ref0 (_tmp22_);
 		display = _tmp23_;
@@ -380,11 +380,11 @@
 	_tmp32_ = device;
 	_tmp33_ = gdk_device_get_source (_tmp32_);
 	if (_tmp33_ == GDK_SOURCE_KEYBOARD) {
-		GdkDevice* _tmp34_;
-		GdkDevice* _tmp35_;
-		GdkDevice* _tmp36_;
+		GdkDevice* _tmp34_ = NULL;
+		GdkDevice* _tmp35_ = NULL;
+		GdkDevice* _tmp36_ = NULL;
 		GdkDevice* _tmp37_ = NULL;
-		GdkDevice* _tmp38_;
+		GdkDevice* _tmp38_ = NULL;
 		_tmp34_ = device;
 		_tmp35_ = _g_object_ref0 (_tmp34_);
 		_g_object_unref0 (keyboard);
@@ -395,11 +395,11 @@
 		_g_object_unref0 (pointer);
 		pointer = _tmp38_;
 	} else {
-		GdkDevice* _tmp39_;
-		GdkDevice* _tmp40_;
-		GdkDevice* _tmp41_;
+		GdkDevice* _tmp39_ = NULL;
+		GdkDevice* _tmp40_ = NULL;
+		GdkDevice* _tmp41_ = NULL;
 		GdkDevice* _tmp42_ = NULL;
-		GdkDevice* _tmp43_;
+		GdkDevice* _tmp43_ = NULL;
 		_tmp39_ = device;
 		_tmp40_ = _g_object_ref0 (_tmp39_);
 		_g_object_unref0 (pointer);
@@ -422,10 +422,10 @@
 	gtk_widget_show_all ((GtkWidget*) self);
 	_tmp47_ = self->priv->m_popup_delay_time;
 	if (_tmp47_ > ((guint) 0)) {
-		guint _tmp48_;
+		guint _tmp48_ = 0U;
 		guint _tmp49_ = 0U;
 		_tmp48_ = self->priv->m_popup_delay_time;
-		_tmp49_ = g_timeout_add_full (G_PRIORITY_DEFAULT, _tmp48_, ____lambda15__gsource_func, g_object_ref (self), g_object_unref);
+		_tmp49_ = g_timeout_add_full (G_PRIORITY_DEFAULT, _tmp48_, ____lambda16__gsource_func, g_object_ref (self), g_object_unref);
 		self->priv->m_popup_delay_time_id = _tmp49_;
 	}
 	_tmp50_ = keyboard;
@@ -434,7 +434,7 @@
 	status = _tmp52_;
 	_tmp53_ = status;
 	if (_tmp53_ != GDK_GRAB_SUCCESS) {
-		GdkGrabStatus _tmp54_;
+		GdkGrabStatus _tmp54_ = 0;
 		_tmp54_ = status;
 		g_warning ("switcher.vala:203: Grab keyboard failed! status = %d", (gint) _tmp54_);
 	}
@@ -444,7 +444,7 @@
 	status = _tmp57_;
 	_tmp58_ = status;
 	if (_tmp58_ != GDK_GRAB_SUCCESS) {
-		GdkGrabStatus _tmp59_;
+		GdkGrabStatus _tmp59_ = 0;
 		_tmp59_ = status;
 		g_warning ("switcher.vala:213: Grab pointer failed! status = %d", (gint) _tmp59_);
 	}
@@ -482,7 +482,7 @@
 	int i;
 	result = g_new0 (IBusEngineDesc*, length + 1);
 	for (i = 0; i < length; i++) {
-		IBusEngineDesc* _tmp0_;
+		IBusEngineDesc* _tmp0_ = NULL;
 		_tmp0_ = _g_object_ref0 (self[i]);
 		result[i] = _tmp0_;
 	}
@@ -509,11 +509,11 @@
 }
 
 
-static gboolean _____lambda13_ (Block5Data* _data5_, GdkEventCrossing* e) {
+static gboolean _____lambda14_ (Block5Data* _data5_, GdkEventCrossing* e) {
 	Switcher * self;
 	gboolean result = FALSE;
-	SwitcherIBusEngineButton* _tmp0_;
-	gint _tmp1_;
+	SwitcherIBusEngineButton* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
 	self = _data5_->self;
 	g_return_val_if_fail (e != NULL, FALSE);
 	_tmp0_ = _data5_->button;
@@ -525,19 +525,19 @@
 }
 
 
-static gboolean ______lambda13__gtk_widget_enter_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self) {
+static gboolean ______lambda14__gtk_widget_enter_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self) {
 	gboolean result;
-	result = _____lambda13_ (self, event);
+	result = _____lambda14_ (self, event);
 	return result;
 }
 
 
-static gboolean _____lambda14_ (Block5Data* _data5_, GdkEventButton* e) {
+static gboolean _____lambda15_ (Block5Data* _data5_, GdkEventButton* e) {
 	Switcher * self;
 	gboolean result = FALSE;
-	gint _tmp0_;
-	guint _tmp1_;
-	GMainLoop* _tmp2_;
+	gint _tmp0_ = 0;
+	guint _tmp1_ = 0U;
+	GMainLoop* _tmp2_ = NULL;
 	self = _data5_->self;
 	g_return_val_if_fail (e != NULL, FALSE);
 	_tmp0_ = _data5_->index;
@@ -551,31 +551,31 @@
 }
 
 
-static gboolean ______lambda14__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean ______lambda15__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
-	result = _____lambda14_ (self, event);
+	result = _____lambda15_ (self, event);
 	return result;
 }
 
 
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
-	gint _tmp0_;
-	gint _tmp1_;
-	glong string_length;
-	glong _tmp2_;
-	glong _tmp5_;
+	glong string_length = 0L;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	glong _tmp2_ = 0L;
+	glong _tmp5_ = 0L;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_;
-	gboolean _tmp12_;
+	glong _tmp9_ = 0L;
+	gboolean _tmp12_ = FALSE;
 	gboolean _tmp13_ = FALSE;
-	glong _tmp14_;
-	gboolean _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	glong _tmp22_;
+	glong _tmp14_ = 0L;
+	gboolean _tmp17_ = FALSE;
+	glong _tmp18_ = 0L;
+	glong _tmp19_ = 0L;
+	glong _tmp20_ = 0L;
+	glong _tmp21_ = 0L;
+	glong _tmp22_ = 0L;
 	gchar* _tmp23_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = strlen (self);
@@ -583,24 +583,24 @@
 	string_length = (glong) _tmp1_;
 	_tmp2_ = start;
 	if (_tmp2_ < ((glong) 0)) {
-		glong _tmp3_;
-		glong _tmp4_;
+		glong _tmp3_ = 0L;
+		glong _tmp4_ = 0L;
 		_tmp3_ = string_length;
 		_tmp4_ = start;
 		start = _tmp3_ + _tmp4_;
 	}
 	_tmp5_ = end;
 	if (_tmp5_ < ((glong) 0)) {
-		glong _tmp6_;
-		glong _tmp7_;
+		glong _tmp6_ = 0L;
+		glong _tmp7_ = 0L;
 		_tmp6_ = string_length;
 		_tmp7_ = end;
 		end = _tmp6_ + _tmp7_;
 	}
 	_tmp9_ = start;
 	if (_tmp9_ >= ((glong) 0)) {
-		glong _tmp10_;
-		glong _tmp11_;
+		glong _tmp10_ = 0L;
+		glong _tmp11_ = 0L;
 		_tmp10_ = start;
 		_tmp11_ = string_length;
 		_tmp8_ = _tmp10_ <= _tmp11_;
@@ -611,8 +611,8 @@
 	g_return_val_if_fail (_tmp12_, NULL);
 	_tmp14_ = end;
 	if (_tmp14_ >= ((glong) 0)) {
-		glong _tmp15_;
-		glong _tmp16_;
+		glong _tmp15_ = 0L;
+		glong _tmp16_ = 0L;
 		_tmp15_ = end;
 		_tmp16_ = string_length;
 		_tmp13_ = _tmp15_ <= _tmp16_;
@@ -633,7 +633,7 @@
 }
 
 
-static void _vala_array_add25 (SwitcherIBusEngineButton*** array, int* length, int* size, SwitcherIBusEngineButton* value) {
+static void _vala_array_add27 (SwitcherIBusEngineButton*** array, int* length, int* size, SwitcherIBusEngineButton* value) {
 	if ((*length) == (*size)) {
 		*size = (*size) ? (2 * (*size)) : 4;
 		*array = g_renew (SwitcherIBusEngineButton*, *array, (*size) + 1);
@@ -644,38 +644,38 @@
 
 
 static void switcher_update_engines (Switcher* self, IBusEngineDesc** engines, int engines_length1) {
-	SwitcherIBusEngineButton** _tmp0_;
-	gint _tmp0__length1;
+	SwitcherIBusEngineButton** _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
 	SwitcherIBusEngineButton** _tmp3_ = NULL;
-	IBusEngineDesc** _tmp4_;
-	gint _tmp4__length1;
-	IBusEngineDesc** _tmp6_;
-	gint _tmp6__length1;
-	IBusEngineDesc** _tmp7_;
-	gint _tmp7__length1;
-	gint max_label_width;
-	GtkLabel* _tmp46_;
-	SwitcherIBusEngineButton** _tmp47_;
-	gint _tmp47__length1;
-	SwitcherIBusEngineButton* _tmp48_;
-	const gchar* _tmp49_;
-	const gchar* _tmp50_;
-	GtkLabel* _tmp51_;
+	IBusEngineDesc** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	IBusEngineDesc** _tmp6_ = NULL;
+	gint _tmp6__length1 = 0;
+	IBusEngineDesc** _tmp7_ = NULL;
+	gint _tmp7__length1 = 0;
+	gint max_label_width = 0;
+	GtkLabel* _tmp46_ = NULL;
+	SwitcherIBusEngineButton** _tmp47_ = NULL;
+	gint _tmp47__length1 = 0;
+	SwitcherIBusEngineButton* _tmp48_ = NULL;
+	const gchar* _tmp49_ = NULL;
+	const gchar* _tmp50_ = NULL;
+	GtkLabel* _tmp51_ = NULL;
+	GdkDisplay* display = NULL;
 	GdkDisplay* _tmp52_ = NULL;
-	GdkDisplay* _tmp53_;
-	GdkDisplay* display;
+	GdkDisplay* _tmp53_ = NULL;
 	GdkScreen* _tmp54_ = NULL;
-	GdkDisplay* _tmp55_;
-	GdkScreen* _tmp58_;
-	GdkScreen* _tmp59_;
-	GdkScreen* screen;
-	gint screen_width;
-	GdkScreen* _tmp60_;
+	GdkDisplay* _tmp55_ = NULL;
+	GdkScreen* screen = NULL;
+	GdkScreen* _tmp58_ = NULL;
+	GdkScreen* _tmp59_ = NULL;
+	gint screen_width = 0;
+	GdkScreen* _tmp60_ = NULL;
 	gboolean _tmp63_ = FALSE;
-	gint _tmp64_;
-	gboolean _tmp67_;
-	gint _tmp69_;
-	gint _tmp70_;
+	gint _tmp64_ = 0;
+	gboolean _tmp67_ = FALSE;
+	gint _tmp69_ = 0;
+	gint _tmp70_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_buttons;
 	_tmp0__length1 = self->priv->m_buttons_length1;
@@ -687,12 +687,12 @@
 		button_collection = _tmp0_;
 		button_collection_length1 = _tmp0__length1;
 		for (button_it = 0; button_it < _tmp0__length1; button_it = button_it + 1) {
-			SwitcherIBusEngineButton* _tmp1_;
+			SwitcherIBusEngineButton* _tmp1_ = NULL;
 			SwitcherIBusEngineButton* button = NULL;
 			_tmp1_ = _g_object_ref0 (button_collection[button_it]);
 			button = _tmp1_;
 			{
-				SwitcherIBusEngineButton* _tmp2_;
+				SwitcherIBusEngineButton* _tmp2_ = NULL;
 				_tmp2_ = button;
 				gtk_widget_destroy ((GtkWidget*) _tmp2_);
 				_g_object_unref0 (button);
@@ -725,59 +725,59 @@
 	self->priv->_m_engines_size_ = self->priv->m_engines_length1;
 	max_label_width = 0;
 	{
-		gint i;
+		gint i = 0;
 		i = 0;
 		{
-			gboolean _tmp8_;
+			gboolean _tmp8_ = FALSE;
 			_tmp8_ = TRUE;
 			while (TRUE) {
 				Block5Data* _data5_;
-				gboolean _tmp9_;
-				gint _tmp11_;
-				IBusEngineDesc** _tmp12_;
-				gint _tmp12__length1;
-				gint _tmp13_;
-				IBusEngineDesc** _tmp14_;
-				gint _tmp14__length1;
-				gint _tmp15_;
-				IBusEngineDesc* _tmp16_;
-				IBusEngineDesc* _tmp17_;
-				IBusEngineDesc* engine;
-				IBusEngineDesc* _tmp18_;
-				SwitcherIBusEngineButton* _tmp19_;
-				IBusEngineDesc* _tmp20_;
+				gboolean _tmp9_ = FALSE;
+				gint _tmp11_ = 0;
+				IBusEngineDesc** _tmp12_ = NULL;
+				gint _tmp12__length1 = 0;
+				gint _tmp13_ = 0;
+				IBusEngineDesc* engine = NULL;
+				IBusEngineDesc** _tmp14_ = NULL;
+				gint _tmp14__length1 = 0;
+				gint _tmp15_ = 0;
+				IBusEngineDesc* _tmp16_ = NULL;
+				IBusEngineDesc* _tmp17_ = NULL;
+				IBusEngineDesc* _tmp18_ = NULL;
+				SwitcherIBusEngineButton* _tmp19_ = NULL;
+				gchar* longname = NULL;
+				IBusEngineDesc* _tmp20_ = NULL;
 				const gchar* _tmp21_ = NULL;
-				gchar* _tmp22_;
-				gchar* longname;
-				SwitcherIBusEngineButton* _tmp23_;
-				SwitcherIBusEngineButton* _tmp24_;
-				SwitcherIBusEngineButton* _tmp25_;
-				SwitcherIBusEngineButton* _tmp26_;
-				const gchar* _tmp27_;
-				gint _tmp28_;
-				gint _tmp29_;
-				SwitcherIBusEngineButton* _tmp32_;
-				const gchar* _tmp33_;
-				GtkLabel* _tmp34_;
-				const gchar* _tmp35_;
+				gchar* _tmp22_ = NULL;
+				SwitcherIBusEngineButton* _tmp23_ = NULL;
+				SwitcherIBusEngineButton* _tmp24_ = NULL;
+				SwitcherIBusEngineButton* _tmp25_ = NULL;
+				SwitcherIBusEngineButton* _tmp26_ = NULL;
+				const gchar* _tmp27_ = NULL;
+				gint _tmp28_ = 0;
+				gint _tmp29_ = 0;
+				SwitcherIBusEngineButton* _tmp32_ = NULL;
+				const gchar* _tmp33_ = NULL;
+				GtkLabel* _tmp34_ = NULL;
+				const gchar* _tmp35_ = NULL;
 				gint width = 0;
-				GtkLabel* _tmp36_;
+				GtkLabel* _tmp36_ = NULL;
 				gint _tmp37_ = 0;
-				gint _tmp38_;
-				gint _tmp39_;
+				gint _tmp38_ = 0;
+				gint _tmp39_ = 0;
 				gint _tmp40_ = 0;
-				GtkBox* _tmp41_;
-				SwitcherIBusEngineButton* _tmp42_;
-				SwitcherIBusEngineButton** _tmp43_;
-				gint _tmp43__length1;
-				SwitcherIBusEngineButton* _tmp44_;
-				SwitcherIBusEngineButton* _tmp45_;
+				GtkBox* _tmp41_ = NULL;
+				SwitcherIBusEngineButton* _tmp42_ = NULL;
+				SwitcherIBusEngineButton** _tmp43_ = NULL;
+				gint _tmp43__length1 = 0;
+				SwitcherIBusEngineButton* _tmp44_ = NULL;
+				SwitcherIBusEngineButton* _tmp45_ = NULL;
 				_data5_ = g_slice_new0 (Block5Data);
 				_data5_->_ref_count_ = 1;
 				_data5_->self = g_object_ref (self);
 				_tmp9_ = _tmp8_;
 				if (!_tmp9_) {
-					gint _tmp10_;
+					gint _tmp10_ = 0;
 					_tmp10_ = i;
 					i = _tmp10_ + 1;
 				}
@@ -811,14 +811,14 @@
 				_tmp24_ = _data5_->button;
 				gtk_widget_show ((GtkWidget*) _tmp24_);
 				_tmp25_ = _data5_->button;
-				g_signal_connect_data ((GtkWidget*) _tmp25_, "enter-notify-event", (GCallback) ______lambda13__gtk_widget_enter_notify_event, block5_data_ref (_data5_), (GClosureNotify) block5_data_unref, 0);
+				g_signal_connect_data ((GtkWidget*) _tmp25_, "enter-notify-event", (GCallback) ______lambda14__gtk_widget_enter_notify_event, block5_data_ref (_data5_), (GClosureNotify) block5_data_unref, 0);
 				_tmp26_ = _data5_->button;
-				g_signal_connect_data ((GtkWidget*) _tmp26_, "button-press-event", (GCallback) ______lambda14__gtk_widget_button_press_event, block5_data_ref (_data5_), (GClosureNotify) block5_data_unref, 0);
+				g_signal_connect_data ((GtkWidget*) _tmp26_, "button-press-event", (GCallback) ______lambda15__gtk_widget_button_press_event, block5_data_ref (_data5_), (GClosureNotify) block5_data_unref, 0);
 				_tmp27_ = longname;
 				_tmp28_ = strlen (_tmp27_);
 				_tmp29_ = _tmp28_;
 				if (_tmp29_ > SWITCHER_DESC_LABEL_MAX_LEN) {
-					const gchar* _tmp30_;
+					const gchar* _tmp30_ = NULL;
 					gchar* _tmp31_ = NULL;
 					_tmp30_ = longname;
 					_tmp31_ = string_slice (_tmp30_, (glong) 0, (glong) SWITCHER_DESC_LABEL_MAX_LEN);
@@ -845,7 +845,7 @@
 				_tmp43__length1 = self->priv->m_buttons_length1;
 				_tmp44_ = _data5_->button;
 				_tmp45_ = _g_object_ref0 (_tmp44_);
-				_vala_array_add25 (&self->priv->m_buttons, &self->priv->m_buttons_length1, &self->priv->_m_buttons_size_, _tmp45_);
+				_vala_array_add27 (&self->priv->m_buttons, &self->priv->m_buttons_length1, &self->priv->_m_buttons_size_, _tmp45_);
 				_g_free0 (longname);
 				_g_object_unref0 (engine);
 				block5_data_unref (_data5_);
@@ -867,7 +867,7 @@
 	display = _tmp53_;
 	_tmp55_ = display;
 	if (_tmp55_ != NULL) {
-		GdkDisplay* _tmp56_;
+		GdkDisplay* _tmp56_ = NULL;
 		GdkScreen* _tmp57_ = NULL;
 		_tmp56_ = display;
 		_tmp57_ = gdk_display_get_default_screen (_tmp56_);
@@ -881,7 +881,7 @@
 	screen_width = 0;
 	_tmp60_ = screen;
 	if (_tmp60_ != NULL) {
-		GdkScreen* _tmp61_;
+		GdkScreen* _tmp61_ = NULL;
 		gint _tmp62_ = 0;
 		_tmp61_ = screen;
 		_tmp62_ = gdk_screen_get_width (_tmp61_);
@@ -889,8 +889,8 @@
 	}
 	_tmp64_ = screen_width;
 	if (_tmp64_ > 0) {
-		gint _tmp65_;
-		gint _tmp66_;
+		gint _tmp65_ = 0;
+		gint _tmp66_ = 0;
 		_tmp65_ = max_label_width;
 		_tmp66_ = screen_width;
 		_tmp63_ = _tmp65_ > (_tmp66_ / 4);
@@ -899,7 +899,7 @@
 	}
 	_tmp67_ = _tmp63_;
 	if (_tmp67_) {
-		gint _tmp68_;
+		gint _tmp68_ = 0;
 		_tmp68_ = screen_width;
 		max_label_width = _tmp68_ / 4;
 	}
@@ -913,20 +913,20 @@
 
 
 static void switcher_next_engine (Switcher* self) {
-	guint _tmp0_;
-	IBusEngineDesc** _tmp1_;
-	gint _tmp1__length1;
-	GtkLabel* _tmp3_;
-	SwitcherIBusEngineButton** _tmp4_;
-	gint _tmp4__length1;
-	guint _tmp5_;
-	SwitcherIBusEngineButton* _tmp6_;
-	const gchar* _tmp7_;
-	const gchar* _tmp8_;
-	SwitcherIBusEngineButton** _tmp9_;
-	gint _tmp9__length1;
-	guint _tmp10_;
-	SwitcherIBusEngineButton* _tmp11_;
+	guint _tmp0_ = 0U;
+	IBusEngineDesc** _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
+	GtkLabel* _tmp3_ = NULL;
+	SwitcherIBusEngineButton** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	guint _tmp5_ = 0U;
+	SwitcherIBusEngineButton* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	SwitcherIBusEngineButton** _tmp9_ = NULL;
+	gint _tmp9__length1 = 0;
+	guint _tmp10_ = 0U;
+	SwitcherIBusEngineButton* _tmp11_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_selected_engine;
 	_tmp1_ = self->priv->m_engines;
@@ -934,7 +934,7 @@
 	if (_tmp0_ == ((guint) (_tmp1__length1 - 1))) {
 		self->priv->m_selected_engine = (guint) 0;
 	} else {
-		guint _tmp2_;
+		guint _tmp2_ = 0U;
 		_tmp2_ = self->priv->m_selected_engine;
 		self->priv->m_selected_engine = _tmp2_ + 1;
 	}
@@ -955,28 +955,28 @@
 
 
 static void switcher_previous_engine (Switcher* self) {
-	guint _tmp0_;
-	GtkLabel* _tmp3_;
-	SwitcherIBusEngineButton** _tmp4_;
-	gint _tmp4__length1;
-	guint _tmp5_;
-	SwitcherIBusEngineButton* _tmp6_;
-	const gchar* _tmp7_;
-	const gchar* _tmp8_;
-	SwitcherIBusEngineButton** _tmp9_;
-	gint _tmp9__length1;
-	guint _tmp10_;
-	SwitcherIBusEngineButton* _tmp11_;
+	guint _tmp0_ = 0U;
+	GtkLabel* _tmp3_ = NULL;
+	SwitcherIBusEngineButton** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	guint _tmp5_ = 0U;
+	SwitcherIBusEngineButton* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	SwitcherIBusEngineButton** _tmp9_ = NULL;
+	gint _tmp9__length1 = 0;
+	guint _tmp10_ = 0U;
+	SwitcherIBusEngineButton* _tmp11_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = self->priv->m_selected_engine;
 	if (_tmp0_ == ((guint) 0)) {
-		IBusEngineDesc** _tmp1_;
-		gint _tmp1__length1;
+		IBusEngineDesc** _tmp1_ = NULL;
+		gint _tmp1__length1 = 0;
 		_tmp1_ = self->priv->m_engines;
 		_tmp1__length1 = self->priv->m_engines_length1;
 		self->priv->m_selected_engine = (guint) (_tmp1__length1 - 1);
 	} else {
-		guint _tmp2_;
+		guint _tmp2_ = 0U;
 		_tmp2_ = self->priv->m_selected_engine;
 		self->priv->m_selected_engine = _tmp2_ - 1;
 	}
@@ -997,13 +997,13 @@
 
 
 static void switcher_restore_window_position (Switcher* self, const gchar* debug_str) {
-	const gchar* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	guint _tmp3_;
-	guint _tmp4_;
-	gint _tmp5_;
-	gint _tmp6_;
+	const gchar* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	guint _tmp3_ = 0U;
+	guint _tmp4_ = 0U;
+	gint _tmp5_ = 0;
+	gint _tmp6_ = 0;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (debug_str != NULL);
 	_tmp0_ = debug_str;
@@ -1034,9 +1034,9 @@
 static gboolean switcher_real_key_press_event (GtkWidget* base, GdkEventKey* e) {
 	Switcher * self;
 	gboolean result = FALSE;
-	gboolean retval;
-	GdkEventKey* pe;
-	guint _tmp0_;
+	gboolean retval = FALSE;
+	GdkEventKey* pe = NULL;
+	guint _tmp0_ = 0U;
 	self = (Switcher*) base;
 	g_return_val_if_fail (e != NULL, FALSE);
 	retval = TRUE;
@@ -1046,22 +1046,22 @@
 		switcher_restore_window_position (self, "pressed");
 	}
 	{
-		gboolean _tmp1_;
+		gboolean _tmp1_ = FALSE;
 		_tmp1_ = TRUE;
 		while (TRUE) {
-			gboolean _tmp2_;
-			GdkEventKey* _tmp3_;
-			GdkModifierType _tmp4_;
-			guint modifiers;
+			gboolean _tmp2_ = FALSE;
+			guint modifiers = 0U;
+			GdkEventKey* _tmp3_ = NULL;
+			GdkModifierType _tmp4_ = 0;
 			gboolean _tmp5_ = FALSE;
-			guint _tmp6_;
-			guint _tmp7_;
-			gboolean _tmp10_;
-			GdkEventKey* _tmp11_;
-			guint _tmp12_;
-			guint _tmp13_;
-			GdkEventKey* _tmp16_;
-			guint _tmp17_;
+			guint _tmp6_ = 0U;
+			guint _tmp7_ = 0U;
+			gboolean _tmp10_ = FALSE;
+			GdkEventKey* _tmp11_ = NULL;
+			guint _tmp12_ = 0U;
+			guint _tmp13_ = 0U;
+			GdkEventKey* _tmp16_ = NULL;
+			guint _tmp17_ = 0U;
 			_tmp2_ = _tmp1_;
 			if (!_tmp2_) {
 				if (!FALSE) {
@@ -1075,8 +1075,8 @@
 			_tmp6_ = modifiers;
 			_tmp7_ = self->priv->m_modifiers;
 			if (_tmp6_ != _tmp7_) {
-				guint _tmp8_;
-				guint _tmp9_;
+				guint _tmp8_ = 0U;
+				guint _tmp9_ = 0U;
 				_tmp8_ = modifiers;
 				_tmp9_ = self->priv->m_modifiers;
 				_tmp5_ = _tmp8_ != (_tmp9_ | GDK_SHIFT_MASK);
@@ -1091,8 +1091,8 @@
 			_tmp12_ = (*_tmp11_).keyval;
 			_tmp13_ = self->priv->m_keyval;
 			if (_tmp12_ == _tmp13_) {
-				guint _tmp14_;
-				guint _tmp15_;
+				guint _tmp14_ = 0U;
+				guint _tmp15_ = 0U;
 				_tmp14_ = modifiers;
 				_tmp15_ = self->priv->m_modifiers;
 				if (_tmp14_ == _tmp15_) {
@@ -1129,8 +1129,8 @@
 				}
 				default:
 				{
-					GdkEventKey* _tmp18_;
-					guint _tmp19_;
+					GdkEventKey* _tmp18_ = NULL;
+					guint _tmp19_ = 0U;
 					_tmp18_ = pe;
 					_tmp19_ = (*_tmp18_).keyval;
 					g_debug ("switcher.vala:380: 0x%04x", _tmp19_);
@@ -1147,14 +1147,14 @@
 static gboolean switcher_real_key_release_event (GtkWidget* base, GdkEventKey* e) {
 	Switcher * self;
 	gboolean result = FALSE;
-	GdkEventKey* pe;
-	GdkEventKey* _tmp0_;
-	GdkModifierType _tmp1_;
+	GdkEventKey* pe = NULL;
+	GdkEventKey* _tmp0_ = NULL;
+	GdkModifierType _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-	GMainLoop* _tmp3_;
-	guint _tmp4_;
-	GMainLoop* _tmp7_;
-	guint _tmp8_;
+	GMainLoop* _tmp3_ = NULL;
+	guint _tmp4_ = 0U;
+	GMainLoop* _tmp7_ = NULL;
+	guint _tmp8_ = 0U;
 	self = (Switcher*) base;
 	g_return_val_if_fail (e != NULL, FALSE);
 	pe = e;
@@ -1172,10 +1172,10 @@
 	}
 	_tmp4_ = self->priv->m_popup_delay_time;
 	if (_tmp4_ > ((guint) 0)) {
-		guint _tmp5_;
+		guint _tmp5_ = 0U;
 		_tmp5_ = self->priv->m_popup_delay_time_id;
 		if (_tmp5_ != ((guint) 0)) {
-			guint _tmp6_;
+			guint _tmp6_ = 0U;
 			_tmp6_ = self->priv->m_popup_delay_time_id;
 			g_source_remove (_tmp6_);
 			self->priv->m_popup_delay_time_id = (guint) 0;
@@ -1191,7 +1191,7 @@
 
 
 void switcher_set_popup_delay_time (Switcher* self, guint popup_delay_time) {
-	guint _tmp0_;
+	guint _tmp0_ = 0U;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = popup_delay_time;
 	self->priv->m_popup_delay_time = _tmp0_;
@@ -1200,11 +1200,11 @@
 
 static SwitcherIBusEngineButton* switcher_ibus_engine_button_construct (GType object_type, IBusEngineDesc* engine) {
 	SwitcherIBusEngineButton * self = NULL;
-	IBusEngineDesc* _tmp0_;
+	IBusEngineDesc* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-	GtkAlignment* _tmp2_;
-	GtkAlignment* align;
-	GtkAlignment* _tmp3_;
+	GtkAlignment* align = NULL;
+	GtkAlignment* _tmp2_ = NULL;
+	GtkAlignment* _tmp3_ = NULL;
 	g_return_val_if_fail (engine != NULL, NULL);
 	self = (SwitcherIBusEngineButton*) g_object_new (object_type, NULL);
 	_tmp0_ = engine;
@@ -1216,12 +1216,12 @@
 	_tmp3_ = align;
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) _tmp3_);
 	if (!SWITCHER_USE_SYMBOL_ICON) {
-		IBusEngineDesc* _tmp4_;
+		IconWidget* icon = NULL;
+		IBusEngineDesc* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-		IconWidget* _tmp6_;
-		IconWidget* icon;
-		GtkAlignment* _tmp7_;
-		IconWidget* _tmp8_;
+		IconWidget* _tmp6_ = NULL;
+		GtkAlignment* _tmp7_ = NULL;
+		IconWidget* _tmp8_ = NULL;
 		_tmp4_ = engine;
 		_tmp5_ = ibus_engine_desc_get_icon (_tmp4_);
 		_tmp6_ = icon_widget_new (_tmp5_, GTK_ICON_SIZE_DIALOG);
@@ -1232,36 +1232,36 @@
 		gtk_container_add ((GtkContainer*) _tmp7_, (GtkWidget*) _tmp8_);
 		_g_object_unref0 (icon);
 	} else {
-		IBusEngineDesc* _tmp9_;
+		gchar* language = NULL;
+		IBusEngineDesc* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_;
-		gchar* language;
-		IBusEngineDesc* _tmp12_;
+		gchar* _tmp11_ = NULL;
+		gchar* symbol = NULL;
+		IBusEngineDesc* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_;
-		gchar* symbol;
-		const gchar* _tmp15_;
-		gchar* _tmp16_;
-		gchar* id;
-		const gchar* _tmp17_;
-		gint _tmp18_;
-		gint _tmp19_;
-		const gchar* _tmp22_;
-		gint _tmp23_;
-		gint _tmp24_;
-		const gchar* _tmp27_;
-		GtkLabel* _tmp28_;
-		GtkLabel* label;
+		gchar* _tmp14_ = NULL;
+		gchar* id = NULL;
+		const gchar* _tmp15_ = NULL;
+		gchar* _tmp16_ = NULL;
+		const gchar* _tmp17_ = NULL;
+		gint _tmp18_ = 0;
+		gint _tmp19_ = 0;
+		const gchar* _tmp22_ = NULL;
+		gint _tmp23_ = 0;
+		gint _tmp24_ = 0;
+		GtkLabel* label = NULL;
+		const gchar* _tmp27_ = NULL;
+		GtkLabel* _tmp28_ = NULL;
+		gchar* id_font = NULL;
 		gchar* _tmp29_ = NULL;
-		gchar* id_font;
-		const gchar* _tmp30_;
-		const gchar* _tmp31_;
+		gchar* markup = NULL;
+		const gchar* _tmp30_ = NULL;
+		const gchar* _tmp31_ = NULL;
 		gchar* _tmp32_ = NULL;
-		gchar* markup;
-		GtkLabel* _tmp33_;
-		const gchar* _tmp34_;
-		GtkAlignment* _tmp35_;
-		GtkLabel* _tmp36_;
+		GtkLabel* _tmp33_ = NULL;
+		const gchar* _tmp34_ = NULL;
+		GtkAlignment* _tmp35_ = NULL;
+		GtkLabel* _tmp36_ = NULL;
 		_tmp9_ = engine;
 		_tmp10_ = ibus_engine_desc_get_language (_tmp9_);
 		_tmp11_ = g_strdup (_tmp10_);
@@ -1277,7 +1277,7 @@
 		_tmp18_ = strlen (_tmp17_);
 		_tmp19_ = _tmp18_;
 		if (_tmp19_ > 2) {
-			const gchar* _tmp20_;
+			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
 			_tmp20_ = id;
 			_tmp21_ = string_slice (_tmp20_, (glong) 0, (glong) 2);
@@ -1288,8 +1288,8 @@
 		_tmp23_ = strlen (_tmp22_);
 		_tmp24_ = _tmp23_;
 		if (_tmp24_ != 0) {
-			const gchar* _tmp25_;
-			gchar* _tmp26_;
+			const gchar* _tmp25_ = NULL;
+			gchar* _tmp26_ = NULL;
 			_tmp25_ = symbol;
 			_tmp26_ = g_strdup (_tmp25_);
 			_g_free0 (id);
@@ -1331,9 +1331,9 @@
 static gboolean switcher_ibus_engine_button_real_draw (GtkWidget* base, cairo_t* cr) {
 	SwitcherIBusEngineButton * self;
 	gboolean result = FALSE;
-	cairo_t* _tmp0_;
+	cairo_t* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_;
+	gboolean _tmp2_ = FALSE;
 	self = (SwitcherIBusEngineButton*) base;
 	g_return_val_if_fail (cr != NULL, FALSE);
 	_tmp0_ = cr;
@@ -1341,13 +1341,13 @@
 	g_object_get ((GtkWidget*) self, "is-focus", &_tmp1_, NULL);
 	_tmp2_ = _tmp1_;
 	if (_tmp2_) {
-		cairo_t* _tmp3_;
-		cairo_t* _tmp4_;
+		cairo_t* _tmp3_ = NULL;
+		cairo_t* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-		cairo_t* _tmp7_;
-		cairo_t* _tmp8_;
-		cairo_t* _tmp9_;
+		cairo_t* _tmp7_ = NULL;
+		cairo_t* _tmp8_ = NULL;
+		cairo_t* _tmp9_ = NULL;
 		_tmp3_ = cr;
 		cairo_save (_tmp3_);
 		_tmp4_ = cr;
@@ -1368,7 +1368,7 @@
 
 static const gchar* switcher_ibus_engine_button_get_longname (SwitcherIBusEngineButton* self) {
 	const gchar* result;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = self->priv->_longname;
 	result = _tmp0_;
@@ -1377,8 +1377,8 @@
 
 
 static void switcher_ibus_engine_button_set_longname (SwitcherIBusEngineButton* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	_tmp1_ = g_strdup (_tmp0_);